From 9ad080a33469a6dfc49c3ba2d148ef8db8e78fd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9sar=20Revert?= Date: Wed, 19 Oct 2022 19:10:30 +0200 Subject: [PATCH 1/8] 5705: Move JsonProperty annotation to the getters --- .../src/main/resources/JavaSpring/pojo.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache index e5f9c6136c59..c531ef3c6204 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache @@ -43,7 +43,6 @@ public class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}{{^parent}} {{/isContainer}} {{/isEnum}} {{#jackson}} - @JsonProperty("{{baseName}}") {{#withXml}} @JacksonXmlProperty({{#isXmlAttribute}}isAttribute = true, {{/isXmlAttribute}}{{#xmlNamespace}}namespace="{{.}}", {{/xmlNamespace}}localName = "{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}") {{/withXml}} @@ -140,6 +139,7 @@ public class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}{{^parent}} {{/maximum}} * @return {{name}} */ + @JsonProperty("{{baseName}}") {{#vendorExtensions.x-extra-annotation}} {{{vendorExtensions.x-extra-annotation}}} {{/vendorExtensions.x-extra-annotation}} From 7c088e841d773dbc8b83dd60e11b15d607326035 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9sar=20Revert?= Date: Thu, 20 Oct 2022 16:41:22 +0200 Subject: [PATCH 2/8] Regenerate samples --- .../java/org/openapitools/model/Category.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../main/java/org/openapitools/model/Tag.java | 4 +- .../java/org/openapitools/model/User.java | 16 ++--- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../java/org/openapitools/model/Category.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../main/java/org/openapitools/model/Tag.java | 4 +- .../java/org/openapitools/model/User.java | 16 ++--- .../java/org/openapitools/model/Category.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../main/java/org/openapitools/model/Tag.java | 4 +- .../java/org/openapitools/model/User.java | 16 ++--- .../java/org/openapitools/model/Category.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../main/java/org/openapitools/model/Tag.java | 4 +- .../java/org/openapitools/model/User.java | 16 ++--- .../java/org/openapitools/model/Category.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../main/java/org/openapitools/model/Tag.java | 4 +- .../java/org/openapitools/model/User.java | 16 ++--- .../java/org/openapitools/model/Category.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../main/java/org/openapitools/model/Tag.java | 4 +- .../java/org/openapitools/model/User.java | 16 ++--- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 22 +++---- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../java/org/openapitools/model/Animal.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../java/org/openapitools/model/BigCat.java | 2 +- .../org/openapitools/model/BigCatAllOf.java | 2 +- .../openapitools/model/Capitalization.java | 12 ++-- .../main/java/org/openapitools/model/Cat.java | 2 +- .../java/org/openapitools/model/CatAllOf.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../org/openapitools/model/ClassModel.java | 2 +- .../java/org/openapitools/model/Client.java | 2 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../java/org/openapitools/model/DogAllOf.java | 2 +- .../org/openapitools/model/EnumArrays.java | 4 +- .../java/org/openapitools/model/EnumTest.java | 10 ++-- .../java/org/openapitools/model/File.java | 2 +- .../model/FileSchemaTestClass.java | 4 +- .../org/openapitools/model/FormatTest.java | 28 ++++----- .../openapitools/model/HasOnlyReadOnly.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +-- ...ropertiesAndAdditionalPropertiesClass.java | 6 +- .../openapitools/model/Model200Response.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../org/openapitools/model/ModelList.java | 2 +- .../org/openapitools/model/ModelReturn.java | 2 +- .../java/org/openapitools/model/Name.java | 8 +-- .../org/openapitools/model/NumberOnly.java | 2 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../openapitools/model/OuterComposite.java | 6 +- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../org/openapitools/model/ReadOnlyFirst.java | 4 +- .../openapitools/model/SpecialModelName.java | 2 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../openapitools/model/TypeHolderDefault.java | 10 ++-- .../openapitools/model/TypeHolderExample.java | 12 ++-- .../java/org/openapitools/model/User.java | 16 ++--- .../java/org/openapitools/model/XmlItem.java | 58 +++++++++---------- .../java/org/openapitools/model/Category.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../main/java/org/openapitools/model/Tag.java | 4 +- .../java/org/openapitools/model/User.java | 16 ++--- .../java/org/openapitools/model/Category.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../main/java/org/openapitools/model/Tag.java | 4 +- .../java/org/openapitools/model/User.java | 16 ++--- .../java/org/openapitools/model/Category.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../main/java/org/openapitools/model/Tag.java | 4 +- .../java/org/openapitools/model/User.java | 16 ++--- .../java/org/openapitools/model/Category.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../main/java/org/openapitools/model/Tag.java | 4 +- .../java/org/openapitools/model/User.java | 16 ++--- .../org/openapitools/model/Addressable.java | 4 +- .../main/java/org/openapitools/model/Bar.java | 8 +-- .../org/openapitools/model/BarCreate.java | 6 +- .../java/org/openapitools/model/Entity.java | 10 ++-- .../org/openapitools/model/EntityRef.java | 14 ++--- .../org/openapitools/model/Extensible.java | 6 +- .../main/java/org/openapitools/model/Foo.java | 4 +- .../java/org/openapitools/model/FooRef.java | 2 +- .../java/org/openapitools/model/Pasta.java | 2 +- .../java/org/openapitools/model/Pizza.java | 2 +- .../org/openapitools/model/PizzaSpeziale.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../main/java/org/openapitools/model/Tag.java | 4 +- .../java/org/openapitools/model/User.java | 16 ++--- .../java/org/openapitools/model/Category.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../main/java/org/openapitools/model/Tag.java | 4 +- .../java/org/openapitools/model/User.java | 16 ++--- .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 22 +++---- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../java/org/openapitools/model/Animal.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../java/org/openapitools/model/BigCat.java | 2 +- .../org/openapitools/model/BigCatAllOf.java | 2 +- .../openapitools/model/Capitalization.java | 12 ++-- .../main/java/org/openapitools/model/Cat.java | 2 +- .../java/org/openapitools/model/CatAllOf.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../org/openapitools/model/ClassModel.java | 2 +- .../java/org/openapitools/model/Client.java | 2 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../java/org/openapitools/model/DogAllOf.java | 2 +- .../org/openapitools/model/EnumArrays.java | 4 +- .../java/org/openapitools/model/EnumTest.java | 10 ++-- .../java/org/openapitools/model/File.java | 2 +- .../model/FileSchemaTestClass.java | 4 +- .../org/openapitools/model/FormatTest.java | 28 ++++----- .../openapitools/model/HasOnlyReadOnly.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +-- ...ropertiesAndAdditionalPropertiesClass.java | 6 +- .../openapitools/model/Model200Response.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../org/openapitools/model/ModelList.java | 2 +- .../org/openapitools/model/ModelReturn.java | 2 +- .../java/org/openapitools/model/Name.java | 8 +-- .../org/openapitools/model/NumberOnly.java | 2 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../openapitools/model/OuterComposite.java | 6 +- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../org/openapitools/model/ReadOnlyFirst.java | 4 +- .../openapitools/model/SpecialModelName.java | 2 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../openapitools/model/TypeHolderDefault.java | 10 ++-- .../openapitools/model/TypeHolderExample.java | 12 ++-- .../java/org/openapitools/model/User.java | 16 ++--- .../java/org/openapitools/model/XmlItem.java | 58 +++++++++---------- .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 22 +++---- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../java/org/openapitools/model/Animal.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../java/org/openapitools/model/BigCat.java | 2 +- .../org/openapitools/model/BigCatAllOf.java | 2 +- .../openapitools/model/Capitalization.java | 12 ++-- .../main/java/org/openapitools/model/Cat.java | 2 +- .../java/org/openapitools/model/CatAllOf.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../org/openapitools/model/ClassModel.java | 2 +- .../java/org/openapitools/model/Client.java | 2 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../java/org/openapitools/model/DogAllOf.java | 2 +- .../org/openapitools/model/EnumArrays.java | 4 +- .../java/org/openapitools/model/EnumTest.java | 10 ++-- .../java/org/openapitools/model/File.java | 2 +- .../model/FileSchemaTestClass.java | 4 +- .../org/openapitools/model/FormatTest.java | 28 ++++----- .../openapitools/model/HasOnlyReadOnly.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +-- ...ropertiesAndAdditionalPropertiesClass.java | 6 +- .../openapitools/model/Model200Response.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../org/openapitools/model/ModelList.java | 2 +- .../org/openapitools/model/ModelReturn.java | 2 +- .../java/org/openapitools/model/Name.java | 8 +-- .../org/openapitools/model/NumberOnly.java | 2 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../openapitools/model/OuterComposite.java | 6 +- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../org/openapitools/model/ReadOnlyFirst.java | 4 +- .../openapitools/model/SpecialModelName.java | 2 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../openapitools/model/TypeHolderDefault.java | 10 ++-- .../openapitools/model/TypeHolderExample.java | 12 ++-- .../java/org/openapitools/model/User.java | 16 ++--- .../java/org/openapitools/model/XmlItem.java | 58 +++++++++---------- .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 22 +++---- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../java/org/openapitools/model/Animal.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../java/org/openapitools/model/BigCat.java | 2 +- .../org/openapitools/model/BigCatAllOf.java | 2 +- .../openapitools/model/Capitalization.java | 12 ++-- .../main/java/org/openapitools/model/Cat.java | 2 +- .../java/org/openapitools/model/CatAllOf.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../org/openapitools/model/ClassModel.java | 2 +- .../java/org/openapitools/model/Client.java | 2 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../java/org/openapitools/model/DogAllOf.java | 2 +- .../org/openapitools/model/EnumArrays.java | 4 +- .../java/org/openapitools/model/EnumTest.java | 10 ++-- .../java/org/openapitools/model/File.java | 2 +- .../model/FileSchemaTestClass.java | 4 +- .../org/openapitools/model/FormatTest.java | 28 ++++----- .../openapitools/model/HasOnlyReadOnly.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +-- ...ropertiesAndAdditionalPropertiesClass.java | 6 +- .../openapitools/model/Model200Response.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../org/openapitools/model/ModelList.java | 2 +- .../org/openapitools/model/ModelReturn.java | 2 +- .../java/org/openapitools/model/Name.java | 8 +-- .../org/openapitools/model/NumberOnly.java | 2 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../openapitools/model/OuterComposite.java | 6 +- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../org/openapitools/model/ReadOnlyFirst.java | 4 +- .../openapitools/model/SpecialModelName.java | 2 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../openapitools/model/TypeHolderDefault.java | 10 ++-- .../openapitools/model/TypeHolderExample.java | 12 ++-- .../java/org/openapitools/model/User.java | 16 ++--- .../java/org/openapitools/model/XmlItem.java | 58 +++++++++---------- .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 22 +++---- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../java/org/openapitools/model/Animal.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../java/org/openapitools/model/BigCat.java | 2 +- .../org/openapitools/model/BigCatAllOf.java | 2 +- .../openapitools/model/Capitalization.java | 12 ++-- .../main/java/org/openapitools/model/Cat.java | 2 +- .../java/org/openapitools/model/CatAllOf.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../org/openapitools/model/ClassModel.java | 2 +- .../java/org/openapitools/model/Client.java | 2 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../java/org/openapitools/model/DogAllOf.java | 2 +- .../org/openapitools/model/EnumArrays.java | 4 +- .../java/org/openapitools/model/EnumTest.java | 10 ++-- .../java/org/openapitools/model/File.java | 2 +- .../model/FileSchemaTestClass.java | 4 +- .../org/openapitools/model/FormatTest.java | 28 ++++----- .../openapitools/model/HasOnlyReadOnly.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +-- ...ropertiesAndAdditionalPropertiesClass.java | 6 +- .../openapitools/model/Model200Response.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../org/openapitools/model/ModelList.java | 2 +- .../org/openapitools/model/ModelReturn.java | 2 +- .../java/org/openapitools/model/Name.java | 8 +-- .../org/openapitools/model/NumberOnly.java | 2 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../openapitools/model/OuterComposite.java | 6 +- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../org/openapitools/model/ReadOnlyFirst.java | 4 +- .../openapitools/model/SpecialModelName.java | 2 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../openapitools/model/TypeHolderDefault.java | 10 ++-- .../openapitools/model/TypeHolderExample.java | 12 ++-- .../java/org/openapitools/model/User.java | 16 ++--- .../java/org/openapitools/model/XmlItem.java | 58 +++++++++---------- .../java/org/openapitools/model/Category.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../main/java/org/openapitools/model/Tag.java | 4 +- .../java/org/openapitools/model/User.java | 16 ++--- .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 22 +++---- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../java/org/openapitools/model/Animal.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../java/org/openapitools/model/BigCat.java | 2 +- .../org/openapitools/model/BigCatAllOf.java | 2 +- .../openapitools/model/Capitalization.java | 12 ++-- .../main/java/org/openapitools/model/Cat.java | 2 +- .../java/org/openapitools/model/CatAllOf.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../org/openapitools/model/ClassModel.java | 2 +- .../java/org/openapitools/model/Client.java | 2 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../java/org/openapitools/model/DogAllOf.java | 2 +- .../org/openapitools/model/EnumArrays.java | 4 +- .../java/org/openapitools/model/EnumTest.java | 10 ++-- .../java/org/openapitools/model/File.java | 2 +- .../model/FileSchemaTestClass.java | 4 +- .../org/openapitools/model/FormatTest.java | 28 ++++----- .../openapitools/model/HasOnlyReadOnly.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +-- ...ropertiesAndAdditionalPropertiesClass.java | 6 +- .../openapitools/model/Model200Response.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../org/openapitools/model/ModelList.java | 2 +- .../org/openapitools/model/ModelReturn.java | 2 +- .../java/org/openapitools/model/Name.java | 8 +-- .../org/openapitools/model/NumberOnly.java | 2 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../openapitools/model/OuterComposite.java | 6 +- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../org/openapitools/model/ReadOnlyFirst.java | 4 +- .../openapitools/model/SpecialModelName.java | 2 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../openapitools/model/TypeHolderDefault.java | 10 ++-- .../openapitools/model/TypeHolderExample.java | 12 ++-- .../java/org/openapitools/model/User.java | 16 ++--- .../java/org/openapitools/model/XmlItem.java | 58 +++++++++---------- .../java/org/openapitools/model/Category.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../main/java/org/openapitools/model/Tag.java | 4 +- .../java/org/openapitools/model/User.java | 16 ++--- .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 22 +++---- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../java/org/openapitools/model/Animal.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../java/org/openapitools/model/BigCat.java | 2 +- .../org/openapitools/model/BigCatAllOf.java | 2 +- .../openapitools/model/Capitalization.java | 12 ++-- .../main/java/org/openapitools/model/Cat.java | 2 +- .../java/org/openapitools/model/CatAllOf.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../org/openapitools/model/ClassModel.java | 2 +- .../java/org/openapitools/model/Client.java | 2 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../java/org/openapitools/model/DogAllOf.java | 2 +- .../org/openapitools/model/EnumArrays.java | 4 +- .../java/org/openapitools/model/EnumTest.java | 10 ++-- .../java/org/openapitools/model/File.java | 2 +- .../model/FileSchemaTestClass.java | 4 +- .../org/openapitools/model/FormatTest.java | 28 ++++----- .../openapitools/model/HasOnlyReadOnly.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +-- ...ropertiesAndAdditionalPropertiesClass.java | 6 +- .../openapitools/model/Model200Response.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../org/openapitools/model/ModelList.java | 2 +- .../org/openapitools/model/ModelReturn.java | 2 +- .../java/org/openapitools/model/Name.java | 8 +-- .../org/openapitools/model/NumberOnly.java | 2 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../openapitools/model/OuterComposite.java | 6 +- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../org/openapitools/model/ReadOnlyFirst.java | 4 +- .../openapitools/model/SpecialModelName.java | 2 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../openapitools/model/TypeHolderDefault.java | 10 ++-- .../openapitools/model/TypeHolderExample.java | 12 ++-- .../java/org/openapitools/model/User.java | 16 ++--- .../java/org/openapitools/model/XmlItem.java | 58 +++++++++---------- .../model/ObjectWithUniqueItems.java | 12 ++-- .../java/org/openapitools/model/Category.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../main/java/org/openapitools/model/Tag.java | 4 +- .../java/org/openapitools/model/User.java | 16 ++--- .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 22 +++---- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../java/org/openapitools/model/Animal.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../java/org/openapitools/model/BigCat.java | 2 +- .../org/openapitools/model/BigCatAllOf.java | 2 +- .../openapitools/model/Capitalization.java | 12 ++-- .../main/java/org/openapitools/model/Cat.java | 2 +- .../java/org/openapitools/model/CatAllOf.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../org/openapitools/model/ClassModel.java | 2 +- .../java/org/openapitools/model/Client.java | 2 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../java/org/openapitools/model/DogAllOf.java | 2 +- .../org/openapitools/model/EnumArrays.java | 4 +- .../java/org/openapitools/model/EnumTest.java | 10 ++-- .../java/org/openapitools/model/File.java | 2 +- .../model/FileSchemaTestClass.java | 4 +- .../org/openapitools/model/FormatTest.java | 28 ++++----- .../openapitools/model/HasOnlyReadOnly.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +-- ...ropertiesAndAdditionalPropertiesClass.java | 6 +- .../openapitools/model/Model200Response.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../org/openapitools/model/ModelList.java | 2 +- .../org/openapitools/model/ModelReturn.java | 2 +- .../java/org/openapitools/model/Name.java | 8 +-- .../org/openapitools/model/NumberOnly.java | 2 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../openapitools/model/OuterComposite.java | 6 +- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../org/openapitools/model/ReadOnlyFirst.java | 4 +- .../openapitools/model/SpecialModelName.java | 2 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../openapitools/model/TypeHolderDefault.java | 10 ++-- .../openapitools/model/TypeHolderExample.java | 12 ++-- .../java/org/openapitools/model/User.java | 16 ++--- .../java/org/openapitools/model/XmlItem.java | 58 +++++++++---------- .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 22 +++---- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../java/org/openapitools/model/Animal.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../java/org/openapitools/model/BigCat.java | 2 +- .../org/openapitools/model/BigCatAllOf.java | 2 +- .../openapitools/model/Capitalization.java | 12 ++-- .../main/java/org/openapitools/model/Cat.java | 2 +- .../java/org/openapitools/model/CatAllOf.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../org/openapitools/model/ClassModel.java | 2 +- .../java/org/openapitools/model/Client.java | 2 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../java/org/openapitools/model/DogAllOf.java | 2 +- .../org/openapitools/model/EnumArrays.java | 4 +- .../java/org/openapitools/model/EnumTest.java | 10 ++-- .../java/org/openapitools/model/File.java | 2 +- .../model/FileSchemaTestClass.java | 4 +- .../org/openapitools/model/FormatTest.java | 28 ++++----- .../openapitools/model/HasOnlyReadOnly.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +-- ...ropertiesAndAdditionalPropertiesClass.java | 6 +- .../openapitools/model/Model200Response.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../org/openapitools/model/ModelList.java | 2 +- .../org/openapitools/model/ModelReturn.java | 2 +- .../java/org/openapitools/model/Name.java | 8 +-- .../org/openapitools/model/NumberOnly.java | 2 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../openapitools/model/OuterComposite.java | 6 +- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../org/openapitools/model/ReadOnlyFirst.java | 4 +- .../openapitools/model/SpecialModelName.java | 2 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../openapitools/model/TypeHolderDefault.java | 10 ++-- .../openapitools/model/TypeHolderExample.java | 12 ++-- .../java/org/openapitools/model/User.java | 16 ++--- .../java/org/openapitools/model/XmlItem.java | 58 +++++++++---------- .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 22 +++---- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../java/org/openapitools/model/Animal.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../java/org/openapitools/model/BigCat.java | 2 +- .../org/openapitools/model/BigCatAllOf.java | 2 +- .../openapitools/model/Capitalization.java | 12 ++-- .../main/java/org/openapitools/model/Cat.java | 2 +- .../java/org/openapitools/model/CatAllOf.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../org/openapitools/model/ClassModel.java | 2 +- .../java/org/openapitools/model/Client.java | 2 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../java/org/openapitools/model/DogAllOf.java | 2 +- .../org/openapitools/model/EnumArrays.java | 4 +- .../java/org/openapitools/model/EnumTest.java | 10 ++-- .../java/org/openapitools/model/File.java | 2 +- .../model/FileSchemaTestClass.java | 4 +- .../org/openapitools/model/FormatTest.java | 28 ++++----- .../openapitools/model/HasOnlyReadOnly.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +-- ...ropertiesAndAdditionalPropertiesClass.java | 6 +- .../openapitools/model/Model200Response.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../org/openapitools/model/ModelList.java | 2 +- .../org/openapitools/model/ModelReturn.java | 2 +- .../java/org/openapitools/model/Name.java | 8 +-- .../org/openapitools/model/NumberOnly.java | 2 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../openapitools/model/OuterComposite.java | 6 +- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../org/openapitools/model/ReadOnlyFirst.java | 4 +- .../openapitools/model/SpecialModelName.java | 2 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../openapitools/model/TypeHolderDefault.java | 10 ++-- .../openapitools/model/TypeHolderExample.java | 12 ++-- .../java/org/openapitools/model/User.java | 16 ++--- .../java/org/openapitools/model/XmlItem.java | 58 +++++++++---------- .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 22 +++---- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../java/org/openapitools/model/Animal.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../java/org/openapitools/model/BigCat.java | 2 +- .../org/openapitools/model/BigCatAllOf.java | 2 +- .../openapitools/model/Capitalization.java | 12 ++-- .../main/java/org/openapitools/model/Cat.java | 2 +- .../java/org/openapitools/model/CatAllOf.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../org/openapitools/model/ClassModel.java | 2 +- .../java/org/openapitools/model/Client.java | 2 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../java/org/openapitools/model/DogAllOf.java | 2 +- .../org/openapitools/model/EnumArrays.java | 4 +- .../java/org/openapitools/model/EnumTest.java | 10 ++-- .../java/org/openapitools/model/File.java | 2 +- .../model/FileSchemaTestClass.java | 4 +- .../org/openapitools/model/FormatTest.java | 28 ++++----- .../openapitools/model/HasOnlyReadOnly.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +-- ...ropertiesAndAdditionalPropertiesClass.java | 6 +- .../openapitools/model/Model200Response.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../org/openapitools/model/ModelList.java | 2 +- .../org/openapitools/model/ModelReturn.java | 2 +- .../java/org/openapitools/model/Name.java | 8 +-- .../org/openapitools/model/NumberOnly.java | 2 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../openapitools/model/OuterComposite.java | 6 +- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../org/openapitools/model/ReadOnlyFirst.java | 4 +- .../openapitools/model/SpecialModelName.java | 2 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../openapitools/model/TypeHolderDefault.java | 10 ++-- .../openapitools/model/TypeHolderExample.java | 12 ++-- .../java/org/openapitools/model/User.java | 16 ++--- .../java/org/openapitools/model/XmlItem.java | 58 +++++++++---------- .../java/org/openapitools/model/Category.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../main/java/org/openapitools/model/Tag.java | 4 +- .../java/org/openapitools/model/User.java | 16 ++--- .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 22 +++---- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../java/org/openapitools/model/Animal.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../java/org/openapitools/model/BigCat.java | 2 +- .../org/openapitools/model/BigCatAllOf.java | 2 +- .../openapitools/model/Capitalization.java | 12 ++-- .../main/java/org/openapitools/model/Cat.java | 2 +- .../java/org/openapitools/model/CatAllOf.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../org/openapitools/model/ClassModel.java | 2 +- .../java/org/openapitools/model/Client.java | 2 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../java/org/openapitools/model/DogAllOf.java | 2 +- .../org/openapitools/model/EnumArrays.java | 4 +- .../java/org/openapitools/model/EnumTest.java | 10 ++-- .../java/org/openapitools/model/File.java | 2 +- .../model/FileSchemaTestClass.java | 4 +- .../org/openapitools/model/FormatTest.java | 28 ++++----- .../openapitools/model/HasOnlyReadOnly.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +-- ...ropertiesAndAdditionalPropertiesClass.java | 6 +- .../openapitools/model/Model200Response.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../org/openapitools/model/ModelList.java | 2 +- .../org/openapitools/model/ModelReturn.java | 2 +- .../java/org/openapitools/model/Name.java | 8 +-- .../org/openapitools/model/NumberOnly.java | 2 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../openapitools/model/OuterComposite.java | 6 +- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../org/openapitools/model/ReadOnlyFirst.java | 4 +- .../openapitools/model/SpecialModelName.java | 2 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../openapitools/model/TypeHolderDefault.java | 10 ++-- .../openapitools/model/TypeHolderExample.java | 12 ++-- .../java/org/openapitools/model/User.java | 16 ++--- .../java/org/openapitools/model/XmlItem.java | 58 +++++++++---------- .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 22 +++---- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../java/org/openapitools/model/Animal.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../java/org/openapitools/model/BigCat.java | 2 +- .../org/openapitools/model/BigCatAllOf.java | 2 +- .../openapitools/model/Capitalization.java | 12 ++-- .../main/java/org/openapitools/model/Cat.java | 2 +- .../java/org/openapitools/model/CatAllOf.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../org/openapitools/model/ClassModel.java | 2 +- .../java/org/openapitools/model/Client.java | 2 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../java/org/openapitools/model/DogAllOf.java | 2 +- .../org/openapitools/model/EnumArrays.java | 4 +- .../java/org/openapitools/model/EnumTest.java | 10 ++-- .../java/org/openapitools/model/File.java | 2 +- .../model/FileSchemaTestClass.java | 4 +- .../org/openapitools/model/FormatTest.java | 28 ++++----- .../openapitools/model/HasOnlyReadOnly.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +-- ...ropertiesAndAdditionalPropertiesClass.java | 6 +- .../openapitools/model/Model200Response.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../org/openapitools/model/ModelList.java | 2 +- .../org/openapitools/model/ModelReturn.java | 2 +- .../java/org/openapitools/model/Name.java | 8 +-- .../org/openapitools/model/NumberOnly.java | 2 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../openapitools/model/OuterComposite.java | 6 +- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../org/openapitools/model/ReadOnlyFirst.java | 4 +- .../openapitools/model/SpecialModelName.java | 2 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../openapitools/model/TypeHolderDefault.java | 10 ++-- .../openapitools/model/TypeHolderExample.java | 12 ++-- .../java/org/openapitools/model/User.java | 16 ++--- .../java/org/openapitools/model/XmlItem.java | 58 +++++++++---------- .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 22 +++---- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../java/org/openapitools/model/Animal.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../openapitools/model/Capitalization.java | 12 ++-- .../main/java/org/openapitools/model/Cat.java | 2 +- .../java/org/openapitools/model/CatAllOf.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../org/openapitools/model/ClassModel.java | 2 +- .../java/org/openapitools/model/Client.java | 2 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../java/org/openapitools/model/DogAllOf.java | 2 +- .../org/openapitools/model/EnumArrays.java | 4 +- .../java/org/openapitools/model/EnumTest.java | 10 ++-- .../java/org/openapitools/model/File.java | 2 +- .../model/FileSchemaTestClass.java | 4 +- .../org/openapitools/model/FormatTest.java | 28 ++++----- .../openapitools/model/HasOnlyReadOnly.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +-- ...ropertiesAndAdditionalPropertiesClass.java | 6 +- .../openapitools/model/Model200Response.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../org/openapitools/model/ModelList.java | 2 +- .../org/openapitools/model/ModelReturn.java | 2 +- .../java/org/openapitools/model/Name.java | 8 +-- .../org/openapitools/model/NumberOnly.java | 2 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../openapitools/model/OuterComposite.java | 6 +- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../org/openapitools/model/ReadOnlyFirst.java | 4 +- .../openapitools/model/SpecialModelName.java | 2 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../openapitools/model/TypeHolderDefault.java | 10 ++-- .../openapitools/model/TypeHolderExample.java | 12 ++-- .../java/org/openapitools/model/User.java | 16 ++--- .../java/org/openapitools/model/XmlItem.java | 58 +++++++++---------- .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 22 +++---- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../java/org/openapitools/model/Animal.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../openapitools/model/Capitalization.java | 12 ++-- .../main/java/org/openapitools/model/Cat.java | 2 +- .../java/org/openapitools/model/CatAllOf.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../org/openapitools/model/ClassModel.java | 2 +- .../java/org/openapitools/model/Client.java | 2 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../java/org/openapitools/model/DogAllOf.java | 2 +- .../org/openapitools/model/EnumArrays.java | 4 +- .../java/org/openapitools/model/EnumTest.java | 10 ++-- .../java/org/openapitools/model/File.java | 2 +- .../model/FileSchemaTestClass.java | 4 +- .../org/openapitools/model/FormatTest.java | 28 ++++----- .../openapitools/model/HasOnlyReadOnly.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +-- ...ropertiesAndAdditionalPropertiesClass.java | 6 +- .../openapitools/model/Model200Response.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../org/openapitools/model/ModelList.java | 2 +- .../org/openapitools/model/ModelReturn.java | 2 +- .../java/org/openapitools/model/Name.java | 8 +-- .../org/openapitools/model/NumberOnly.java | 2 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../openapitools/model/OuterComposite.java | 6 +- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../org/openapitools/model/ReadOnlyFirst.java | 4 +- .../openapitools/model/SpecialModelName.java | 2 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../openapitools/model/TypeHolderDefault.java | 10 ++-- .../openapitools/model/TypeHolderExample.java | 12 ++-- .../java/org/openapitools/model/User.java | 16 ++--- .../java/org/openapitools/model/XmlItem.java | 58 +++++++++---------- .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 22 +++---- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../java/org/openapitools/model/Animal.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../openapitools/model/Capitalization.java | 12 ++-- .../main/java/org/openapitools/model/Cat.java | 2 +- .../java/org/openapitools/model/CatAllOf.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../org/openapitools/model/ClassModel.java | 2 +- .../java/org/openapitools/model/Client.java | 2 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../java/org/openapitools/model/DogAllOf.java | 2 +- .../org/openapitools/model/EnumArrays.java | 4 +- .../java/org/openapitools/model/EnumTest.java | 10 ++-- .../java/org/openapitools/model/File.java | 2 +- .../model/FileSchemaTestClass.java | 4 +- .../org/openapitools/model/FormatTest.java | 28 ++++----- .../openapitools/model/HasOnlyReadOnly.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +-- ...ropertiesAndAdditionalPropertiesClass.java | 6 +- .../openapitools/model/Model200Response.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../org/openapitools/model/ModelList.java | 2 +- .../org/openapitools/model/ModelReturn.java | 2 +- .../java/org/openapitools/model/Name.java | 8 +-- .../org/openapitools/model/NumberOnly.java | 2 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../openapitools/model/OuterComposite.java | 6 +- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../org/openapitools/model/ReadOnlyFirst.java | 4 +- .../openapitools/model/SpecialModelName.java | 2 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../openapitools/model/TypeHolderDefault.java | 10 ++-- .../openapitools/model/TypeHolderExample.java | 12 ++-- .../java/org/openapitools/model/User.java | 16 ++--- .../java/org/openapitools/model/XmlItem.java | 58 +++++++++---------- .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 22 +++---- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../java/org/openapitools/model/Animal.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../openapitools/model/Capitalization.java | 12 ++-- .../main/java/org/openapitools/model/Cat.java | 2 +- .../java/org/openapitools/model/CatAllOf.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../org/openapitools/model/ClassModel.java | 2 +- .../java/org/openapitools/model/Client.java | 2 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../java/org/openapitools/model/DogAllOf.java | 2 +- .../org/openapitools/model/EnumArrays.java | 4 +- .../java/org/openapitools/model/EnumTest.java | 10 ++-- .../java/org/openapitools/model/File.java | 2 +- .../model/FileSchemaTestClass.java | 4 +- .../org/openapitools/model/FormatTest.java | 28 ++++----- .../openapitools/model/HasOnlyReadOnly.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +-- ...ropertiesAndAdditionalPropertiesClass.java | 6 +- .../openapitools/model/Model200Response.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../org/openapitools/model/ModelList.java | 2 +- .../org/openapitools/model/ModelReturn.java | 2 +- .../java/org/openapitools/model/Name.java | 8 +-- .../org/openapitools/model/NumberOnly.java | 2 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../openapitools/model/OuterComposite.java | 6 +- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../org/openapitools/model/ReadOnlyFirst.java | 4 +- .../openapitools/model/SpecialModelName.java | 2 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../openapitools/model/TypeHolderDefault.java | 10 ++-- .../openapitools/model/TypeHolderExample.java | 12 ++-- .../java/org/openapitools/model/User.java | 16 ++--- .../java/org/openapitools/model/XmlItem.java | 58 +++++++++---------- .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 22 +++---- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../java/org/openapitools/model/Animal.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../java/org/openapitools/model/BigCat.java | 2 +- .../org/openapitools/model/BigCatAllOf.java | 2 +- .../openapitools/model/Capitalization.java | 12 ++-- .../main/java/org/openapitools/model/Cat.java | 2 +- .../java/org/openapitools/model/CatAllOf.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../org/openapitools/model/ClassModel.java | 2 +- .../java/org/openapitools/model/Client.java | 2 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../java/org/openapitools/model/DogAllOf.java | 2 +- .../org/openapitools/model/EnumArrays.java | 4 +- .../java/org/openapitools/model/EnumTest.java | 10 ++-- .../java/org/openapitools/model/File.java | 2 +- .../model/FileSchemaTestClass.java | 4 +- .../org/openapitools/model/FormatTest.java | 28 ++++----- .../openapitools/model/HasOnlyReadOnly.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +-- ...ropertiesAndAdditionalPropertiesClass.java | 6 +- .../openapitools/model/Model200Response.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../org/openapitools/model/ModelList.java | 2 +- .../org/openapitools/model/ModelReturn.java | 2 +- .../java/org/openapitools/model/Name.java | 8 +-- .../org/openapitools/model/NumberOnly.java | 2 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../openapitools/model/OuterComposite.java | 6 +- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../org/openapitools/model/ReadOnlyFirst.java | 4 +- .../openapitools/model/SpecialModelName.java | 2 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../openapitools/model/TypeHolderDefault.java | 10 ++-- .../openapitools/model/TypeHolderExample.java | 12 ++-- .../java/org/openapitools/model/User.java | 16 ++--- .../java/org/openapitools/model/XmlItem.java | 58 +++++++++---------- .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 22 +++---- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../openapitools/virtualan/model/Animal.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../virtualan/model/ArrayOfNumberOnly.java | 2 +- .../virtualan/model/ArrayTest.java | 6 +- .../openapitools/virtualan/model/BigCat.java | 2 +- .../virtualan/model/BigCatAllOf.java | 2 +- .../virtualan/model/Capitalization.java | 12 ++-- .../org/openapitools/virtualan/model/Cat.java | 2 +- .../virtualan/model/CatAllOf.java | 2 +- .../virtualan/model/Category.java | 4 +- .../virtualan/model/ClassModel.java | 2 +- .../openapitools/virtualan/model/Client.java | 2 +- .../org/openapitools/virtualan/model/Dog.java | 2 +- .../virtualan/model/DogAllOf.java | 2 +- .../virtualan/model/EnumArrays.java | 4 +- .../virtualan/model/EnumTest.java | 10 ++-- .../openapitools/virtualan/model/File.java | 2 +- .../virtualan/model/FileSchemaTestClass.java | 4 +- .../virtualan/model/FormatTest.java | 28 ++++----- .../virtualan/model/HasOnlyReadOnly.java | 4 +- .../openapitools/virtualan/model/MapTest.java | 8 +-- ...ropertiesAndAdditionalPropertiesClass.java | 6 +- .../virtualan/model/Model200Response.java | 4 +- .../virtualan/model/ModelApiResponse.java | 6 +- .../virtualan/model/ModelList.java | 2 +- .../virtualan/model/ModelReturn.java | 2 +- .../openapitools/virtualan/model/Name.java | 8 +-- .../virtualan/model/NumberOnly.java | 2 +- .../openapitools/virtualan/model/Order.java | 12 ++-- .../virtualan/model/OuterComposite.java | 6 +- .../org/openapitools/virtualan/model/Pet.java | 12 ++-- .../virtualan/model/ReadOnlyFirst.java | 4 +- .../virtualan/model/SpecialModelName.java | 2 +- .../org/openapitools/virtualan/model/Tag.java | 4 +- .../virtualan/model/TypeHolderDefault.java | 10 ++-- .../virtualan/model/TypeHolderExample.java | 12 ++-- .../openapitools/virtualan/model/User.java | 16 ++--- .../openapitools/virtualan/model/XmlItem.java | 58 +++++++++---------- .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 22 +++---- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../java/org/openapitools/model/Animal.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../java/org/openapitools/model/BigCat.java | 2 +- .../org/openapitools/model/BigCatAllOf.java | 2 +- .../openapitools/model/Capitalization.java | 12 ++-- .../main/java/org/openapitools/model/Cat.java | 2 +- .../java/org/openapitools/model/CatAllOf.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../org/openapitools/model/ClassModel.java | 2 +- .../java/org/openapitools/model/Client.java | 2 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../java/org/openapitools/model/DogAllOf.java | 2 +- .../org/openapitools/model/EnumArrays.java | 4 +- .../java/org/openapitools/model/EnumTest.java | 10 ++-- .../java/org/openapitools/model/File.java | 2 +- .../model/FileSchemaTestClass.java | 4 +- .../org/openapitools/model/FormatTest.java | 28 ++++----- .../openapitools/model/HasOnlyReadOnly.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +-- ...ropertiesAndAdditionalPropertiesClass.java | 6 +- .../openapitools/model/Model200Response.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../org/openapitools/model/ModelList.java | 2 +- .../org/openapitools/model/ModelReturn.java | 2 +- .../java/org/openapitools/model/Name.java | 8 +-- .../org/openapitools/model/NumberOnly.java | 2 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../openapitools/model/OuterComposite.java | 6 +- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../org/openapitools/model/ReadOnlyFirst.java | 4 +- .../openapitools/model/SpecialModelName.java | 2 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../openapitools/model/TypeHolderDefault.java | 10 ++-- .../openapitools/model/TypeHolderExample.java | 12 ++-- .../java/org/openapitools/model/User.java | 16 ++--- .../java/org/openapitools/model/XmlItem.java | 58 +++++++++---------- 1022 files changed, 3552 insertions(+), 3552 deletions(-) diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Category.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Category.java index 9f5ef4d9f1ad..54981cbb60a9 100644 --- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Category.java +++ b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Category.java @@ -23,10 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Category id(Long id) { @@ -38,6 +36,7 @@ public Category id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -57,6 +56,7 @@ public Category name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/ModelApiResponse.java index 52fb11fd3cf7..2c232dc89527 100644 --- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -25,13 +25,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -43,6 +40,7 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ + @JsonProperty("code") @ApiModelProperty(value = "") public Integer getCode() { @@ -62,6 +60,7 @@ public ModelApiResponse type(String type) { * Get type * @return type */ + @JsonProperty("type") @ApiModelProperty(value = "") public String getType() { @@ -81,6 +80,7 @@ public ModelApiResponse message(String message) { * Get message * @return message */ + @JsonProperty("message") @ApiModelProperty(value = "") public String getMessage() { diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Order.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Order.java index 66d9df6dfd95..71a0b505c7f4 100644 --- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Order.java +++ b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Order.java @@ -26,16 +26,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -76,10 +72,8 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -91,6 +85,7 @@ public Order id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -110,6 +105,7 @@ public Order petId(Long petId) { * Get petId * @return petId */ + @JsonProperty("petId") @ApiModelProperty(value = "") public Long getPetId() { @@ -129,6 +125,7 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ + @JsonProperty("quantity") @ApiModelProperty(value = "") public Integer getQuantity() { @@ -148,6 +145,7 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ + @JsonProperty("shipDate") @Valid @ApiModelProperty(value = "") public OffsetDateTime getShipDate() { @@ -167,6 +165,7 @@ public Order status(StatusEnum status) { * Order Status * @return status */ + @JsonProperty("status") @ApiModelProperty(value = "Order Status") public StatusEnum getStatus() { @@ -186,6 +185,7 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ + @JsonProperty("complete") @ApiModelProperty(value = "") public Boolean getComplete() { diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java index 1962262aea94..3041d644634e 100644 --- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java +++ b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java @@ -28,20 +28,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private List photoUrls = new ArrayList<>(); - @JsonProperty("tags") @Valid private List tags = null; @@ -82,7 +77,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; public Pet id(Long id) { @@ -94,6 +88,7 @@ public Pet id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -113,6 +108,7 @@ public Pet category(Category category) { * Get category * @return category */ + @JsonProperty("category") @Valid @ApiModelProperty(value = "") public Category getCategory() { @@ -132,6 +128,7 @@ public Pet name(String name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") public String getName() { @@ -156,6 +153,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ + @JsonProperty("photoUrls") @NotNull @ApiModelProperty(required = true, value = "") public List getPhotoUrls() { @@ -183,6 +181,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ + @JsonProperty("tags") @Valid @ApiModelProperty(value = "") public List getTags() { @@ -202,6 +201,7 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ + @JsonProperty("status") @ApiModelProperty(value = "pet status in the store") public StatusEnum getStatus() { diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Tag.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Tag.java index b30aa3fd9a2c..397f28ba4b4f 100644 --- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Tag.java +++ b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Tag.java @@ -23,10 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -38,6 +36,7 @@ public Tag id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -57,6 +56,7 @@ public Tag name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/User.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/User.java index 8d71f0fcc040..42b2a02dc443 100644 --- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/User.java +++ b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/User.java @@ -23,28 +23,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -56,6 +48,7 @@ public User id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -75,6 +68,7 @@ public User username(String username) { * Get username * @return username */ + @JsonProperty("username") @ApiModelProperty(value = "") public String getUsername() { @@ -94,6 +88,7 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ + @JsonProperty("firstName") @ApiModelProperty(value = "") public String getFirstName() { @@ -113,6 +108,7 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ + @JsonProperty("lastName") @ApiModelProperty(value = "") public String getLastName() { @@ -132,6 +128,7 @@ public User email(String email) { * Get email * @return email */ + @JsonProperty("email") @ApiModelProperty(value = "") public String getEmail() { @@ -151,6 +148,7 @@ public User password(String password) { * Get password * @return password */ + @JsonProperty("password") @ApiModelProperty(value = "") public String getPassword() { @@ -170,6 +168,7 @@ public User phone(String phone) { * Get phone * @return phone */ + @JsonProperty("phone") @ApiModelProperty(value = "") public String getPhone() { @@ -189,6 +188,7 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ + @JsonProperty("userStatus") @ApiModelProperty(value = "User Status") public Integer getUserStatus() { diff --git a/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/model/Pet.java index 5523df897c1e..2fbe90843059 100644 --- a/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/model/Pet.java +++ b/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/model/Pet.java @@ -26,23 +26,17 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("@type") private String atType = "Pet"; - @JsonProperty("age") private Integer age = 4; - @JsonProperty("happy") private Boolean happy = true; - @JsonProperty("price") private BigDecimal price = new BigDecimal("32000000000"); - @JsonProperty("lastFeed") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime lastFeed = OffsetDateTime.parse("1973-12-19T11:39:57Z[UTC]", java.time.format.DateTimeFormatter.ISO_ZONED_DATE_TIME.withZone(java.time.ZoneId.systemDefault())); - @JsonProperty("dateOfBirth") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate dateOfBirth = LocalDate.parse("2021-01-01"); @@ -55,6 +49,7 @@ public Pet atType(String atType) { * Get atType * @return atType */ + @JsonProperty("@type") @NotNull @ApiModelProperty(required = true, value = "") public String getAtType() { @@ -74,6 +69,7 @@ public Pet age(Integer age) { * Get age * @return age */ + @JsonProperty("age") @ApiModelProperty(value = "") public Integer getAge() { @@ -93,6 +89,7 @@ public Pet happy(Boolean happy) { * Get happy * @return happy */ + @JsonProperty("happy") @ApiModelProperty(value = "") public Boolean getHappy() { @@ -112,6 +109,7 @@ public Pet price(BigDecimal price) { * Get price * @return price */ + @JsonProperty("price") @Valid @ApiModelProperty(value = "") public BigDecimal getPrice() { @@ -131,6 +129,7 @@ public Pet lastFeed(OffsetDateTime lastFeed) { * Get lastFeed * @return lastFeed */ + @JsonProperty("lastFeed") @Valid @ApiModelProperty(value = "") public OffsetDateTime getLastFeed() { @@ -150,6 +149,7 @@ public Pet dateOfBirth(LocalDate dateOfBirth) { * Get dateOfBirth * @return dateOfBirth */ + @JsonProperty("dateOfBirth") @Valid @ApiModelProperty(value = "") public LocalDate getDateOfBirth() { diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Category.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Category.java index 909b0aba4e34..382418682ada 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Category.java +++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Category.java @@ -23,10 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Category id(Long id) { @@ -38,6 +36,7 @@ public Category id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -57,6 +56,7 @@ public Category name(String name) { * Get name * @return name */ + @JsonProperty("name") @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/ModelApiResponse.java index 52fb11fd3cf7..2c232dc89527 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -25,13 +25,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -43,6 +40,7 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ + @JsonProperty("code") @ApiModelProperty(value = "") public Integer getCode() { @@ -62,6 +60,7 @@ public ModelApiResponse type(String type) { * Get type * @return type */ + @JsonProperty("type") @ApiModelProperty(value = "") public String getType() { @@ -81,6 +80,7 @@ public ModelApiResponse message(String message) { * Get message * @return message */ + @JsonProperty("message") @ApiModelProperty(value = "") public String getMessage() { diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Order.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Order.java index 66d9df6dfd95..71a0b505c7f4 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Order.java +++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Order.java @@ -26,16 +26,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -76,10 +72,8 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -91,6 +85,7 @@ public Order id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -110,6 +105,7 @@ public Order petId(Long petId) { * Get petId * @return petId */ + @JsonProperty("petId") @ApiModelProperty(value = "") public Long getPetId() { @@ -129,6 +125,7 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ + @JsonProperty("quantity") @ApiModelProperty(value = "") public Integer getQuantity() { @@ -148,6 +145,7 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ + @JsonProperty("shipDate") @Valid @ApiModelProperty(value = "") public OffsetDateTime getShipDate() { @@ -167,6 +165,7 @@ public Order status(StatusEnum status) { * Order Status * @return status */ + @JsonProperty("status") @ApiModelProperty(value = "Order Status") public StatusEnum getStatus() { @@ -186,6 +185,7 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ + @JsonProperty("complete") @ApiModelProperty(value = "") public Boolean getComplete() { diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Pet.java index 1962262aea94..3041d644634e 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Pet.java +++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Pet.java @@ -28,20 +28,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private List photoUrls = new ArrayList<>(); - @JsonProperty("tags") @Valid private List tags = null; @@ -82,7 +77,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; public Pet id(Long id) { @@ -94,6 +88,7 @@ public Pet id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -113,6 +108,7 @@ public Pet category(Category category) { * Get category * @return category */ + @JsonProperty("category") @Valid @ApiModelProperty(value = "") public Category getCategory() { @@ -132,6 +128,7 @@ public Pet name(String name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") public String getName() { @@ -156,6 +153,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ + @JsonProperty("photoUrls") @NotNull @ApiModelProperty(required = true, value = "") public List getPhotoUrls() { @@ -183,6 +181,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ + @JsonProperty("tags") @Valid @ApiModelProperty(value = "") public List getTags() { @@ -202,6 +201,7 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ + @JsonProperty("status") @ApiModelProperty(value = "pet status in the store") public StatusEnum getStatus() { diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Tag.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Tag.java index b30aa3fd9a2c..397f28ba4b4f 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Tag.java +++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Tag.java @@ -23,10 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -38,6 +36,7 @@ public Tag id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -57,6 +56,7 @@ public Tag name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/User.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/User.java index 8d71f0fcc040..42b2a02dc443 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/User.java +++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/User.java @@ -23,28 +23,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -56,6 +48,7 @@ public User id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -75,6 +68,7 @@ public User username(String username) { * Get username * @return username */ + @JsonProperty("username") @ApiModelProperty(value = "") public String getUsername() { @@ -94,6 +88,7 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ + @JsonProperty("firstName") @ApiModelProperty(value = "") public String getFirstName() { @@ -113,6 +108,7 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ + @JsonProperty("lastName") @ApiModelProperty(value = "") public String getLastName() { @@ -132,6 +128,7 @@ public User email(String email) { * Get email * @return email */ + @JsonProperty("email") @ApiModelProperty(value = "") public String getEmail() { @@ -151,6 +148,7 @@ public User password(String password) { * Get password * @return password */ + @JsonProperty("password") @ApiModelProperty(value = "") public String getPassword() { @@ -170,6 +168,7 @@ public User phone(String phone) { * Get phone * @return phone */ + @JsonProperty("phone") @ApiModelProperty(value = "") public String getPhone() { @@ -189,6 +188,7 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ + @JsonProperty("userStatus") @ApiModelProperty(value = "User Status") public Integer getUserStatus() { diff --git a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Category.java b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Category.java index 9f5ef4d9f1ad..54981cbb60a9 100644 --- a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Category.java +++ b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Category.java @@ -23,10 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Category id(Long id) { @@ -38,6 +36,7 @@ public Category id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -57,6 +56,7 @@ public Category name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java index 52fb11fd3cf7..2c232dc89527 100644 --- a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -25,13 +25,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -43,6 +40,7 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ + @JsonProperty("code") @ApiModelProperty(value = "") public Integer getCode() { @@ -62,6 +60,7 @@ public ModelApiResponse type(String type) { * Get type * @return type */ + @JsonProperty("type") @ApiModelProperty(value = "") public String getType() { @@ -81,6 +80,7 @@ public ModelApiResponse message(String message) { * Get message * @return message */ + @JsonProperty("message") @ApiModelProperty(value = "") public String getMessage() { diff --git a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Order.java b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Order.java index 66d9df6dfd95..71a0b505c7f4 100644 --- a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Order.java +++ b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Order.java @@ -26,16 +26,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -76,10 +72,8 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -91,6 +85,7 @@ public Order id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -110,6 +105,7 @@ public Order petId(Long petId) { * Get petId * @return petId */ + @JsonProperty("petId") @ApiModelProperty(value = "") public Long getPetId() { @@ -129,6 +125,7 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ + @JsonProperty("quantity") @ApiModelProperty(value = "") public Integer getQuantity() { @@ -148,6 +145,7 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ + @JsonProperty("shipDate") @Valid @ApiModelProperty(value = "") public OffsetDateTime getShipDate() { @@ -167,6 +165,7 @@ public Order status(StatusEnum status) { * Order Status * @return status */ + @JsonProperty("status") @ApiModelProperty(value = "Order Status") public StatusEnum getStatus() { @@ -186,6 +185,7 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ + @JsonProperty("complete") @ApiModelProperty(value = "") public Boolean getComplete() { diff --git a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java index 1962262aea94..3041d644634e 100644 --- a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java +++ b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java @@ -28,20 +28,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private List photoUrls = new ArrayList<>(); - @JsonProperty("tags") @Valid private List tags = null; @@ -82,7 +77,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; public Pet id(Long id) { @@ -94,6 +88,7 @@ public Pet id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -113,6 +108,7 @@ public Pet category(Category category) { * Get category * @return category */ + @JsonProperty("category") @Valid @ApiModelProperty(value = "") public Category getCategory() { @@ -132,6 +128,7 @@ public Pet name(String name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") public String getName() { @@ -156,6 +153,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ + @JsonProperty("photoUrls") @NotNull @ApiModelProperty(required = true, value = "") public List getPhotoUrls() { @@ -183,6 +181,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ + @JsonProperty("tags") @Valid @ApiModelProperty(value = "") public List getTags() { @@ -202,6 +201,7 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ + @JsonProperty("status") @ApiModelProperty(value = "pet status in the store") public StatusEnum getStatus() { diff --git a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Tag.java b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Tag.java index b30aa3fd9a2c..397f28ba4b4f 100644 --- a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Tag.java +++ b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Tag.java @@ -23,10 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -38,6 +36,7 @@ public Tag id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -57,6 +56,7 @@ public Tag name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/User.java b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/User.java index 8d71f0fcc040..42b2a02dc443 100644 --- a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/User.java +++ b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/User.java @@ -23,28 +23,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -56,6 +48,7 @@ public User id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -75,6 +68,7 @@ public User username(String username) { * Get username * @return username */ + @JsonProperty("username") @ApiModelProperty(value = "") public String getUsername() { @@ -94,6 +88,7 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ + @JsonProperty("firstName") @ApiModelProperty(value = "") public String getFirstName() { @@ -113,6 +108,7 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ + @JsonProperty("lastName") @ApiModelProperty(value = "") public String getLastName() { @@ -132,6 +128,7 @@ public User email(String email) { * Get email * @return email */ + @JsonProperty("email") @ApiModelProperty(value = "") public String getEmail() { @@ -151,6 +148,7 @@ public User password(String password) { * Get password * @return password */ + @JsonProperty("password") @ApiModelProperty(value = "") public String getPassword() { @@ -170,6 +168,7 @@ public User phone(String phone) { * Get phone * @return phone */ + @JsonProperty("phone") @ApiModelProperty(value = "") public String getPhone() { @@ -189,6 +188,7 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ + @JsonProperty("userStatus") @ApiModelProperty(value = "User Status") public Integer getUserStatus() { diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java index 909b0aba4e34..382418682ada 100644 --- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java +++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java @@ -23,10 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Category id(Long id) { @@ -38,6 +36,7 @@ public Category id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -57,6 +56,7 @@ public Category name(String name) { * Get name * @return name */ + @JsonProperty("name") @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java index 52fb11fd3cf7..2c232dc89527 100644 --- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -25,13 +25,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -43,6 +40,7 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ + @JsonProperty("code") @ApiModelProperty(value = "") public Integer getCode() { @@ -62,6 +60,7 @@ public ModelApiResponse type(String type) { * Get type * @return type */ + @JsonProperty("type") @ApiModelProperty(value = "") public String getType() { @@ -81,6 +80,7 @@ public ModelApiResponse message(String message) { * Get message * @return message */ + @JsonProperty("message") @ApiModelProperty(value = "") public String getMessage() { diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java index 66d9df6dfd95..71a0b505c7f4 100644 --- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java +++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java @@ -26,16 +26,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -76,10 +72,8 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -91,6 +85,7 @@ public Order id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -110,6 +105,7 @@ public Order petId(Long petId) { * Get petId * @return petId */ + @JsonProperty("petId") @ApiModelProperty(value = "") public Long getPetId() { @@ -129,6 +125,7 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ + @JsonProperty("quantity") @ApiModelProperty(value = "") public Integer getQuantity() { @@ -148,6 +145,7 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ + @JsonProperty("shipDate") @Valid @ApiModelProperty(value = "") public OffsetDateTime getShipDate() { @@ -167,6 +165,7 @@ public Order status(StatusEnum status) { * Order Status * @return status */ + @JsonProperty("status") @ApiModelProperty(value = "Order Status") public StatusEnum getStatus() { @@ -186,6 +185,7 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ + @JsonProperty("complete") @ApiModelProperty(value = "") public Boolean getComplete() { diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java index 1962262aea94..3041d644634e 100644 --- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java +++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java @@ -28,20 +28,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private List photoUrls = new ArrayList<>(); - @JsonProperty("tags") @Valid private List tags = null; @@ -82,7 +77,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; public Pet id(Long id) { @@ -94,6 +88,7 @@ public Pet id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -113,6 +108,7 @@ public Pet category(Category category) { * Get category * @return category */ + @JsonProperty("category") @Valid @ApiModelProperty(value = "") public Category getCategory() { @@ -132,6 +128,7 @@ public Pet name(String name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") public String getName() { @@ -156,6 +153,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ + @JsonProperty("photoUrls") @NotNull @ApiModelProperty(required = true, value = "") public List getPhotoUrls() { @@ -183,6 +181,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ + @JsonProperty("tags") @Valid @ApiModelProperty(value = "") public List getTags() { @@ -202,6 +201,7 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ + @JsonProperty("status") @ApiModelProperty(value = "pet status in the store") public StatusEnum getStatus() { diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java index b30aa3fd9a2c..397f28ba4b4f 100644 --- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java +++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java @@ -23,10 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -38,6 +36,7 @@ public Tag id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -57,6 +56,7 @@ public Tag name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java index 8d71f0fcc040..42b2a02dc443 100644 --- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java +++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java @@ -23,28 +23,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -56,6 +48,7 @@ public User id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -75,6 +68,7 @@ public User username(String username) { * Get username * @return username */ + @JsonProperty("username") @ApiModelProperty(value = "") public String getUsername() { @@ -94,6 +88,7 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ + @JsonProperty("firstName") @ApiModelProperty(value = "") public String getFirstName() { @@ -113,6 +108,7 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ + @JsonProperty("lastName") @ApiModelProperty(value = "") public String getLastName() { @@ -132,6 +128,7 @@ public User email(String email) { * Get email * @return email */ + @JsonProperty("email") @ApiModelProperty(value = "") public String getEmail() { @@ -151,6 +148,7 @@ public User password(String password) { * Get password * @return password */ + @JsonProperty("password") @ApiModelProperty(value = "") public String getPassword() { @@ -170,6 +168,7 @@ public User phone(String phone) { * Get phone * @return phone */ + @JsonProperty("phone") @ApiModelProperty(value = "") public String getPhone() { @@ -189,6 +188,7 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ + @JsonProperty("userStatus") @ApiModelProperty(value = "User Status") public Integer getUserStatus() { diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Category.java index f15bed232886..8facee0b4d00 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Category.java @@ -22,10 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Category id(Long id) { @@ -37,6 +35,7 @@ public Category id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -56,6 +55,7 @@ public Category name(String name) { * Get name * @return name */ + @JsonProperty("name") @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/ModelApiResponse.java index e74c0d15a185..dc22eb8bad56 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -24,13 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -42,6 +39,7 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ + @JsonProperty("code") @Schema(name = "code", required = false) public Integer getCode() { @@ -61,6 +59,7 @@ public ModelApiResponse type(String type) { * Get type * @return type */ + @JsonProperty("type") @Schema(name = "type", required = false) public String getType() { @@ -80,6 +79,7 @@ public ModelApiResponse message(String message) { * Get message * @return message */ + @JsonProperty("message") @Schema(name = "message", required = false) public String getMessage() { diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Order.java index e4a1030a0733..830de6970600 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Order.java @@ -25,16 +25,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -75,10 +71,8 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -90,6 +84,7 @@ public Order id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -109,6 +104,7 @@ public Order petId(Long petId) { * Get petId * @return petId */ + @JsonProperty("petId") @Schema(name = "petId", required = false) public Long getPetId() { @@ -128,6 +124,7 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ + @JsonProperty("quantity") @Schema(name = "quantity", required = false) public Integer getQuantity() { @@ -147,6 +144,7 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ + @JsonProperty("shipDate") @Valid @Schema(name = "shipDate", required = false) public OffsetDateTime getShipDate() { @@ -166,6 +164,7 @@ public Order status(StatusEnum status) { * Order Status * @return status */ + @JsonProperty("status") @Schema(name = "status", description = "Order Status", required = false) public StatusEnum getStatus() { @@ -185,6 +184,7 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ + @JsonProperty("complete") @Schema(name = "complete", required = false) public Boolean getComplete() { diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Pet.java index 1e00d49524a1..f63620ba65e4 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Pet.java @@ -27,20 +27,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private List photoUrls = new ArrayList<>(); - @JsonProperty("tags") @Valid private List tags = null; @@ -81,7 +76,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; public Pet id(Long id) { @@ -93,6 +87,7 @@ public Pet id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -112,6 +107,7 @@ public Pet category(Category category) { * Get category * @return category */ + @JsonProperty("category") @Valid @Schema(name = "category", required = false) public Category getCategory() { @@ -131,6 +127,7 @@ public Pet name(String name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @Schema(name = "name", example = "doggie", required = true) public String getName() { @@ -155,6 +152,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ + @JsonProperty("photoUrls") @NotNull @Schema(name = "photoUrls", required = true) public List getPhotoUrls() { @@ -182,6 +180,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ + @JsonProperty("tags") @Valid @Schema(name = "tags", required = false) public List getTags() { @@ -201,6 +200,7 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ + @JsonProperty("status") @Schema(name = "status", description = "pet status in the store", required = false) public StatusEnum getStatus() { diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Tag.java index 97130c50c034..f7c39632be46 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Tag.java @@ -22,10 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -37,6 +35,7 @@ public Tag id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -56,6 +55,7 @@ public Tag name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/User.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/User.java index 0a193cf96c24..c9d25cf39f6e 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/User.java @@ -22,28 +22,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -55,6 +47,7 @@ public User id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -74,6 +67,7 @@ public User username(String username) { * Get username * @return username */ + @JsonProperty("username") @Schema(name = "username", required = false) public String getUsername() { @@ -93,6 +87,7 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ + @JsonProperty("firstName") @Schema(name = "firstName", required = false) public String getFirstName() { @@ -112,6 +107,7 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ + @JsonProperty("lastName") @Schema(name = "lastName", required = false) public String getLastName() { @@ -131,6 +127,7 @@ public User email(String email) { * Get email * @return email */ + @JsonProperty("email") @Schema(name = "email", required = false) public String getEmail() { @@ -150,6 +147,7 @@ public User password(String password) { * Get password * @return password */ + @JsonProperty("password") @Schema(name = "password", required = false) public String getPassword() { @@ -169,6 +167,7 @@ public User phone(String phone) { * Get phone * @return phone */ + @JsonProperty("phone") @Schema(name = "phone", required = false) public String getPhone() { @@ -188,6 +187,7 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ + @JsonProperty("userStatus") @Schema(name = "userStatus", description = "User Status", required = false) public Integer getUserStatus() { diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Category.java index ed3c428e34a3..63e2bb12a67c 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Category.java @@ -22,10 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Category id(Long id) { @@ -37,6 +35,7 @@ public Category id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -56,6 +55,7 @@ public Category name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/ModelApiResponse.java index 18e0004c3354..5d93139025d0 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -24,13 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -42,6 +39,7 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ + @JsonProperty("code") @Schema(name = "code", required = false) public Integer getCode() { @@ -61,6 +59,7 @@ public ModelApiResponse type(String type) { * Get type * @return type */ + @JsonProperty("type") @Schema(name = "type", required = false) public String getType() { @@ -80,6 +79,7 @@ public ModelApiResponse message(String message) { * Get message * @return message */ + @JsonProperty("message") @Schema(name = "message", required = false) public String getMessage() { diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Order.java index 04bee348f98e..57e02c6a0658 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Order.java @@ -25,16 +25,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -75,10 +71,8 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -90,6 +84,7 @@ public Order id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -109,6 +104,7 @@ public Order petId(Long petId) { * Get petId * @return petId */ + @JsonProperty("petId") @Schema(name = "petId", required = false) public Long getPetId() { @@ -128,6 +124,7 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ + @JsonProperty("quantity") @Schema(name = "quantity", required = false) public Integer getQuantity() { @@ -147,6 +144,7 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ + @JsonProperty("shipDate") @Valid @Schema(name = "shipDate", required = false) public OffsetDateTime getShipDate() { @@ -166,6 +164,7 @@ public Order status(StatusEnum status) { * Order Status * @return status */ + @JsonProperty("status") @Schema(name = "status", description = "Order Status", required = false) public StatusEnum getStatus() { @@ -185,6 +184,7 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ + @JsonProperty("complete") @Schema(name = "complete", required = false) public Boolean getComplete() { diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java index f702d09a1a82..935a9242ca57 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java @@ -27,20 +27,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private List photoUrls = new ArrayList<>(); - @JsonProperty("tags") @Valid private List tags = null; @@ -81,7 +76,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; public Pet id(Long id) { @@ -93,6 +87,7 @@ public Pet id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -112,6 +107,7 @@ public Pet category(Category category) { * Get category * @return category */ + @JsonProperty("category") @Valid @Schema(name = "category", required = false) public Category getCategory() { @@ -131,6 +127,7 @@ public Pet name(String name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @Schema(name = "name", example = "doggie", required = true) public String getName() { @@ -155,6 +152,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ + @JsonProperty("photoUrls") @NotNull @Schema(name = "photoUrls", required = true) public List getPhotoUrls() { @@ -182,6 +180,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ + @JsonProperty("tags") @Valid @Schema(name = "tags", required = false) public List getTags() { @@ -201,6 +200,7 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ + @JsonProperty("status") @Schema(name = "status", description = "pet status in the store", required = false) public StatusEnum getStatus() { diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Tag.java index b4d9d7b0a13b..657e04be1aae 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Tag.java @@ -22,10 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -37,6 +35,7 @@ public Tag id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -56,6 +55,7 @@ public Tag name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/User.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/User.java index 01b7db75ca7a..c51537754aff 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/User.java @@ -22,28 +22,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -55,6 +47,7 @@ public User id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -74,6 +67,7 @@ public User username(String username) { * Get username * @return username */ + @JsonProperty("username") @Schema(name = "username", required = false) public String getUsername() { @@ -93,6 +87,7 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ + @JsonProperty("firstName") @Schema(name = "firstName", required = false) public String getFirstName() { @@ -112,6 +107,7 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ + @JsonProperty("lastName") @Schema(name = "lastName", required = false) public String getLastName() { @@ -131,6 +127,7 @@ public User email(String email) { * Get email * @return email */ + @JsonProperty("email") @Schema(name = "email", required = false) public String getEmail() { @@ -150,6 +147,7 @@ public User password(String password) { * Get password * @return password */ + @JsonProperty("password") @Schema(name = "password", required = false) public String getPassword() { @@ -169,6 +167,7 @@ public User phone(String phone) { * Get phone * @return phone */ + @JsonProperty("phone") @Schema(name = "phone", required = false) public String getPhone() { @@ -188,6 +187,7 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ + @JsonProperty("userStatus") @Schema(name = "userStatus", description = "User Status", required = false) public Integer getUserStatus() { diff --git a/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/model/Pet.java index e928a0c2c1f5..f9807396641d 100644 --- a/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/model/Pet.java @@ -25,23 +25,17 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("@type") private String atType = "Pet"; - @JsonProperty("age") private Integer age = 4; - @JsonProperty("happy") private Boolean happy = true; - @JsonProperty("price") private BigDecimal price = new BigDecimal("32000000000"); - @JsonProperty("lastFeed") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime lastFeed = OffsetDateTime.parse("1973-12-19T11:39:57Z[UTC]", java.time.format.DateTimeFormatter.ISO_ZONED_DATE_TIME.withZone(java.time.ZoneId.systemDefault())); - @JsonProperty("dateOfBirth") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate dateOfBirth = LocalDate.parse("2021-01-01"); @@ -54,6 +48,7 @@ public Pet atType(String atType) { * Get atType * @return atType */ + @JsonProperty("@type") @NotNull @Schema(name = "@type", required = true) public String getAtType() { @@ -73,6 +68,7 @@ public Pet age(Integer age) { * Get age * @return age */ + @JsonProperty("age") @Schema(name = "age", required = false) public Integer getAge() { @@ -92,6 +88,7 @@ public Pet happy(Boolean happy) { * Get happy * @return happy */ + @JsonProperty("happy") @Schema(name = "happy", required = false) public Boolean getHappy() { @@ -111,6 +108,7 @@ public Pet price(BigDecimal price) { * Get price * @return price */ + @JsonProperty("price") @Valid @Schema(name = "price", required = false) public BigDecimal getPrice() { @@ -130,6 +128,7 @@ public Pet lastFeed(OffsetDateTime lastFeed) { * Get lastFeed * @return lastFeed */ + @JsonProperty("lastFeed") @Valid @Schema(name = "lastFeed", required = false) public OffsetDateTime getLastFeed() { @@ -149,6 +148,7 @@ public Pet dateOfBirth(LocalDate dateOfBirth) { * Get dateOfBirth * @return dateOfBirth */ + @JsonProperty("dateOfBirth") @Valid @Schema(name = "dateOfBirth", required = false) public LocalDate getDateOfBirth() { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 0d95d7f91b29..e45a52c7a8af 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesAnyType extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesAnyType name(String name) { @@ -35,6 +34,7 @@ public AdditionalPropertiesAnyType name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 0a45cd0d195e..ff8e902ab955 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesArray extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesArray name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesArray name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index c53b449a5070..c21068182c49 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesBoolean extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesBoolean name(String name) { @@ -35,6 +34,7 @@ public AdditionalPropertiesBoolean name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index ae060d44dc4d..c43432f178b1 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -25,45 +25,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesClass { - @JsonProperty("map_string") @Valid private Map mapString = null; - @JsonProperty("map_number") @Valid private Map mapNumber = null; - @JsonProperty("map_integer") @Valid private Map mapInteger = null; - @JsonProperty("map_boolean") @Valid private Map mapBoolean = null; - @JsonProperty("map_array_integer") @Valid private Map> mapArrayInteger = null; - @JsonProperty("map_array_anytype") @Valid private Map> mapArrayAnytype = null; - @JsonProperty("map_map_string") @Valid private Map> mapMapString = null; - @JsonProperty("map_map_anytype") @Valid private Map> mapMapAnytype = null; - @JsonProperty("anytype_1") private Object anytype1; - @JsonProperty("anytype_2") private Object anytype2; - @JsonProperty("anytype_3") private Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { @@ -83,6 +72,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt * Get mapString * @return mapString */ + @JsonProperty("map_string") @Schema(name = "map_string", required = false) public Map getMapString() { @@ -110,6 +100,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * Get mapNumber * @return mapNumber */ + @JsonProperty("map_number") @Valid @Schema(name = "map_number", required = false) public Map getMapNumber() { @@ -137,6 +128,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege * Get mapInteger * @return mapInteger */ + @JsonProperty("map_integer") @Schema(name = "map_integer", required = false) public Map getMapInteger() { @@ -164,6 +156,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea * Get mapBoolean * @return mapBoolean */ + @JsonProperty("map_boolean") @Schema(name = "map_boolean", required = false) public Map getMapBoolean() { @@ -191,6 +184,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { @@ -218,6 +212,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * Get mapArrayAnytype * @return mapArrayAnytype */ + @JsonProperty("map_array_anytype") @Valid @Schema(name = "map_array_anytype", required = false) public Map> getMapArrayAnytype() { @@ -245,6 +240,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { @@ -272,6 +268,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { @@ -291,6 +288,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) { * Get anytype1 * @return anytype1 */ + @JsonProperty("anytype_1") @Schema(name = "anytype_1", required = false) public Object getAnytype1() { @@ -310,6 +308,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) { * Get anytype2 * @return anytype2 */ + @JsonProperty("anytype_2") @Schema(name = "anytype_2", required = false) public Object getAnytype2() { @@ -329,6 +328,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) { * Get anytype3 * @return anytype3 */ + @JsonProperty("anytype_3") @Schema(name = "anytype_3", required = false) public Object getAnytype3() { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 87a903f3e7f2..d4fe82193e30 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesInteger extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesInteger name(String name) { @@ -35,6 +34,7 @@ public AdditionalPropertiesInteger name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 873d1c9c229e..11f9dda21f3f 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesNumber extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesNumber name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesNumber name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 97827d22d963..ce4f9f1ff862 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesObject extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesObject name(String name) { @@ -35,6 +34,7 @@ public AdditionalPropertiesObject name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 53967d619036..2669a2e08d51 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesString extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesString name(String name) { @@ -35,6 +34,7 @@ public AdditionalPropertiesString name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { 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 8b3225fee193..50eb6fe3c62b 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 @@ -38,10 +38,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Animal { - @JsonProperty("className") private String className; - @JsonProperty("color") private String color = "red"; public Animal className(String className) { @@ -53,6 +51,7 @@ public Animal className(String className) { * Get className * @return className */ + @JsonProperty("className") @NotNull @Schema(name = "className", required = true) public String getClassName() { @@ -72,6 +71,7 @@ public Animal color(String color) { * Get color * @return color */ + @JsonProperty("color") @Schema(name = "color", required = false) public String getColor() { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 4fc6a6447db5..99f5ef3aa439 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfArrayOfNumberOnly { - @JsonProperty("ArrayArrayNumber") @Valid private List> arrayArrayNumber = null; @@ -45,6 +44,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * Get arrayArrayNumber * @return arrayArrayNumber */ + @JsonProperty("ArrayArrayNumber") @Valid @Schema(name = "ArrayArrayNumber", required = false) public List> getArrayArrayNumber() { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index da4dc071cfdf..563d0dc0f933 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfNumberOnly { - @JsonProperty("ArrayNumber") @Valid private List arrayNumber = null; @@ -45,6 +44,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ + @JsonProperty("ArrayNumber") @Valid @Schema(name = "ArrayNumber", required = false) public List getArrayNumber() { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayTest.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayTest.java index 03052a955e3b..839cf3ac40ab 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayTest.java @@ -24,15 +24,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayTest { - @JsonProperty("array_of_string") @Valid private List arrayOfString = null; - @JsonProperty("array_array_of_integer") @Valid private List> arrayArrayOfInteger = null; - @JsonProperty("array_array_of_model") @Valid private List> arrayArrayOfModel = null; @@ -53,6 +50,7 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) { * Get arrayOfString * @return arrayOfString */ + @JsonProperty("array_of_string") @Schema(name = "array_of_string", required = false) public List getArrayOfString() { @@ -80,6 +78,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ + @JsonProperty("array_array_of_integer") @Valid @Schema(name = "array_array_of_integer", required = false) public List> getArrayArrayOfInteger() { @@ -107,6 +106,7 @@ public ArrayTest addArrayArrayOfModelItem(List arrayArrayOfModelI * Get arrayArrayOfModel * @return arrayArrayOfModel */ + @JsonProperty("array_array_of_model") @Valid @Schema(name = "array_array_of_model", required = false) public List> getArrayArrayOfModel() { 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 344818cd160a..e0b22753e9e8 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 @@ -66,7 +66,6 @@ public static KindEnum fromValue(String value) { } } - @JsonProperty("kind") private KindEnum kind; public BigCat kind(KindEnum kind) { @@ -78,6 +77,7 @@ public BigCat kind(KindEnum kind) { * Get kind * @return kind */ + @JsonProperty("kind") @Schema(name = "kind", required = false) public KindEnum getKind() { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/BigCatAllOf.java index 96ddb1f49cd8..3b0788b0b304 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/BigCatAllOf.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/BigCatAllOf.java @@ -63,7 +63,6 @@ public static KindEnum fromValue(String value) { } } - @JsonProperty("kind") private KindEnum kind; public BigCatAllOf kind(KindEnum kind) { @@ -75,6 +74,7 @@ public BigCatAllOf kind(KindEnum kind) { * Get kind * @return kind */ + @JsonProperty("kind") @Schema(name = "kind", required = false) public KindEnum getKind() { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Capitalization.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Capitalization.java index e7f3b66e4814..7270c14a949f 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Capitalization.java @@ -21,22 +21,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Capitalization { - @JsonProperty("smallCamel") private String smallCamel; - @JsonProperty("CapitalCamel") private String capitalCamel; - @JsonProperty("small_Snake") private String smallSnake; - @JsonProperty("Capital_Snake") private String capitalSnake; - @JsonProperty("SCA_ETH_Flow_Points") private String scAETHFlowPoints; - @JsonProperty("ATT_NAME") private String ATT_NAME; public Capitalization smallCamel(String smallCamel) { @@ -48,6 +42,7 @@ public Capitalization smallCamel(String smallCamel) { * Get smallCamel * @return smallCamel */ + @JsonProperty("smallCamel") @Schema(name = "smallCamel", required = false) public String getSmallCamel() { @@ -67,6 +62,7 @@ public Capitalization capitalCamel(String capitalCamel) { * Get capitalCamel * @return capitalCamel */ + @JsonProperty("CapitalCamel") @Schema(name = "CapitalCamel", required = false) public String getCapitalCamel() { @@ -86,6 +82,7 @@ public Capitalization smallSnake(String smallSnake) { * Get smallSnake * @return smallSnake */ + @JsonProperty("small_Snake") @Schema(name = "small_Snake", required = false) public String getSmallSnake() { @@ -105,6 +102,7 @@ public Capitalization capitalSnake(String capitalSnake) { * Get capitalSnake * @return capitalSnake */ + @JsonProperty("Capital_Snake") @Schema(name = "Capital_Snake", required = false) public String getCapitalSnake() { @@ -124,6 +122,7 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) { * Get scAETHFlowPoints * @return scAETHFlowPoints */ + @JsonProperty("SCA_ETH_Flow_Points") @Schema(name = "SCA_ETH_Flow_Points", required = false) public String getScAETHFlowPoints() { @@ -143,6 +142,7 @@ public Capitalization ATT_NAME(String ATT_NAME) { * Name of the pet * @return ATT_NAME */ + @JsonProperty("ATT_NAME") @Schema(name = "ATT_NAME", description = "Name of the pet ", required = false) public String getATTNAME() { 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 afce161498ed..d1bb205b11b3 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 @@ -35,7 +35,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Cat extends Animal { - @JsonProperty("declawed") private Boolean declawed; public Cat declawed(Boolean declawed) { @@ -47,6 +46,7 @@ public Cat declawed(Boolean declawed) { * Get declawed * @return declawed */ + @JsonProperty("declawed") @Schema(name = "declawed", required = false) public Boolean getDeclawed() { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/CatAllOf.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/CatAllOf.java index bc83998fc4d5..b7a7ed5def6a 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/CatAllOf.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/CatAllOf.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class CatAllOf { - @JsonProperty("declawed") private Boolean declawed; public CatAllOf declawed(Boolean declawed) { @@ -35,6 +34,7 @@ public CatAllOf declawed(Boolean declawed) { * Get declawed * @return declawed */ + @JsonProperty("declawed") @Schema(name = "declawed", required = false) public Boolean getDeclawed() { 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 586658c922c5..9b1acc5a5c07 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 @@ -21,10 +21,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name = "default-name"; public Category id(Long id) { @@ -36,6 +34,7 @@ public Category id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -55,6 +54,7 @@ public Category name(String name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @Schema(name = "name", required = true) public String getName() { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ClassModel.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ClassModel.java index d3d25d6df8cd..20f5e2de16dd 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ClassModel.java @@ -22,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ClassModel { - @JsonProperty("_class") private String propertyClass; public ClassModel propertyClass(String propertyClass) { @@ -34,6 +33,7 @@ public ClassModel propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ + @JsonProperty("_class") @Schema(name = "_class", required = false) public String getPropertyClass() { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Client.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Client.java index 7ed5fbaae188..11ed7ead459c 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Client.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Client.java @@ -21,7 +21,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Client { - @JsonProperty("client") private String client; public Client client(String client) { @@ -33,6 +32,7 @@ public Client client(String client) { * Get client * @return client */ + @JsonProperty("client") @Schema(name = "client", required = false) public String getClient() { 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 738b9fbffc6c..b0f901978716 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 @@ -26,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Dog extends Animal { - @JsonProperty("breed") private String breed; public Dog breed(String breed) { @@ -38,6 +37,7 @@ public Dog breed(String breed) { * Get breed * @return breed */ + @JsonProperty("breed") @Schema(name = "breed", required = false) public String getBreed() { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/DogAllOf.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/DogAllOf.java index fbcd7127e41b..097dc159ee65 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/DogAllOf.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/DogAllOf.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class DogAllOf { - @JsonProperty("breed") private String breed; public DogAllOf breed(String breed) { @@ -35,6 +34,7 @@ public DogAllOf breed(String breed) { * Get breed * @return breed */ + @JsonProperty("breed") @Schema(name = "breed", required = false) public String getBreed() { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumArrays.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumArrays.java index 3c18fc1189fe..cb84a65b9e1c 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumArrays.java @@ -59,7 +59,6 @@ public static JustSymbolEnum fromValue(String value) { } } - @JsonProperty("just_symbol") private JustSymbolEnum justSymbol; /** @@ -97,7 +96,6 @@ public static ArrayEnumEnum fromValue(String value) { } } - @JsonProperty("array_enum") @Valid private List arrayEnum = null; @@ -110,6 +108,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) { * Get justSymbol * @return justSymbol */ + @JsonProperty("just_symbol") @Schema(name = "just_symbol", required = false) public JustSymbolEnum getJustSymbol() { @@ -137,6 +136,7 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) { * Get arrayEnum * @return arrayEnum */ + @JsonProperty("array_enum") @Schema(name = "array_enum", required = false) public List getArrayEnum() { 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 dc15f99afe84..2243d0fb1b8b 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 @@ -62,7 +62,6 @@ public static EnumStringEnum fromValue(String value) { } } - @JsonProperty("enum_string") private EnumStringEnum enumString; /** @@ -102,7 +101,6 @@ public static EnumStringRequiredEnum fromValue(String value) { } } - @JsonProperty("enum_string_required") private EnumStringRequiredEnum enumStringRequired; /** @@ -140,7 +138,6 @@ public static EnumIntegerEnum fromValue(Integer value) { } } - @JsonProperty("enum_integer") private EnumIntegerEnum enumInteger; /** @@ -178,10 +175,8 @@ public static EnumNumberEnum fromValue(Double value) { } } - @JsonProperty("enum_number") private EnumNumberEnum enumNumber; - @JsonProperty("outerEnum") private OuterEnum outerEnum; public EnumTest enumString(EnumStringEnum enumString) { @@ -193,6 +188,7 @@ public EnumTest enumString(EnumStringEnum enumString) { * Get enumString * @return enumString */ + @JsonProperty("enum_string") @Schema(name = "enum_string", required = false) public EnumStringEnum getEnumString() { @@ -212,6 +208,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) { * Get enumStringRequired * @return enumStringRequired */ + @JsonProperty("enum_string_required") @NotNull @Schema(name = "enum_string_required", required = true) public EnumStringRequiredEnum getEnumStringRequired() { @@ -231,6 +228,7 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) { * Get enumInteger * @return enumInteger */ + @JsonProperty("enum_integer") @Schema(name = "enum_integer", required = false) public EnumIntegerEnum getEnumInteger() { @@ -250,6 +248,7 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) { * Get enumNumber * @return enumNumber */ + @JsonProperty("enum_number") @Schema(name = "enum_number", required = false) public EnumNumberEnum getEnumNumber() { @@ -269,6 +268,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) { * Get outerEnum * @return outerEnum */ + @JsonProperty("outerEnum") @Valid @Schema(name = "outerEnum", required = false) public OuterEnum getOuterEnum() { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/File.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/File.java index d9a8ab4aa1f2..7d0f08137a62 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/File.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/File.java @@ -22,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class File { - @JsonProperty("sourceURI") private String sourceURI; public File sourceURI(String sourceURI) { @@ -34,6 +33,7 @@ public File sourceURI(String sourceURI) { * Test capitalization * @return sourceURI */ + @JsonProperty("sourceURI") @Schema(name = "sourceURI", description = "Test capitalization", required = false) public String getSourceURI() { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 5794883ff564..50df4bf463a8 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -24,10 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FileSchemaTestClass { - @JsonProperty("file") private File file; - @JsonProperty("files") @Valid private List files = null; @@ -40,6 +38,7 @@ public FileSchemaTestClass file(File file) { * Get file * @return file */ + @JsonProperty("file") @Valid @Schema(name = "file", required = false) public File getFile() { @@ -67,6 +66,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) { * Get files * @return files */ + @JsonProperty("files") @Valid @Schema(name = "files", required = false) public List getFiles() { 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 c4bacc257a36..c9ae6ace8274 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 @@ -29,48 +29,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FormatTest { - @JsonProperty("integer") private Integer integer; - @JsonProperty("int32") private Integer int32; - @JsonProperty("int64") private Long int64; - @JsonProperty("number") private BigDecimal number; - @JsonProperty("float") private Float _float; - @JsonProperty("double") private Double _double; - @JsonProperty("string") private String string; - @JsonProperty("byte") private byte[] _byte; - @JsonProperty("binary") private org.springframework.core.io.Resource binary; - @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("password") private String password; - @JsonProperty("BigDecimal") private BigDecimal bigDecimal; public FormatTest integer(Integer integer) { @@ -84,6 +70,7 @@ public FormatTest integer(Integer integer) { * maximum: 100 * @return integer */ + @JsonProperty("integer") @Min(10) @Max(100) @Schema(name = "integer", required = false) public Integer getInteger() { @@ -105,6 +92,7 @@ public FormatTest int32(Integer int32) { * maximum: 200 * @return int32 */ + @JsonProperty("int32") @Min(20) @Max(200) @Schema(name = "int32", required = false) public Integer getInt32() { @@ -124,6 +112,7 @@ public FormatTest int64(Long int64) { * Get int64 * @return int64 */ + @JsonProperty("int64") @Schema(name = "int64", required = false) public Long getInt64() { @@ -145,6 +134,7 @@ public FormatTest number(BigDecimal number) { * maximum: 543.2 * @return number */ + @JsonProperty("number") @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") @Schema(name = "number", required = true) public BigDecimal getNumber() { @@ -166,6 +156,7 @@ public FormatTest _float(Float _float) { * maximum: 987.6 * @return _float */ + @JsonProperty("float") @DecimalMin("54.3") @DecimalMax("987.6") @Schema(name = "float", required = false) public Float getFloat() { @@ -187,6 +178,7 @@ public FormatTest _double(Double _double) { * maximum: 123.4 * @return _double */ + @JsonProperty("double") @DecimalMin("67.8") @DecimalMax("123.4") @Schema(name = "double", required = false) public Double getDouble() { @@ -206,6 +198,7 @@ public FormatTest string(String string) { * Get string * @return string */ + @JsonProperty("string") @Pattern(regexp = "/[a-z]/i") @Schema(name = "string", required = false) public String getString() { @@ -225,6 +218,7 @@ public FormatTest _byte(byte[] _byte) { * Get _byte * @return _byte */ + @JsonProperty("byte") @NotNull @Schema(name = "byte", required = true) public byte[] getByte() { @@ -244,6 +238,7 @@ public FormatTest binary(org.springframework.core.io.Resource binary) { * Get binary * @return binary */ + @JsonProperty("binary") @Valid @Schema(name = "binary", required = false) public org.springframework.core.io.Resource getBinary() { @@ -263,6 +258,7 @@ public FormatTest date(LocalDate date) { * Get date * @return date */ + @JsonProperty("date") @NotNull @Valid @Schema(name = "date", required = true) public LocalDate getDate() { @@ -282,6 +278,7 @@ public FormatTest dateTime(OffsetDateTime dateTime) { * Get dateTime * @return dateTime */ + @JsonProperty("dateTime") @Valid @Schema(name = "dateTime", required = false) public OffsetDateTime getDateTime() { @@ -301,6 +298,7 @@ public FormatTest uuid(UUID uuid) { * Get uuid * @return uuid */ + @JsonProperty("uuid") @Valid @Schema(name = "uuid", example = "72f98069-206d-4f12-9f12-3d1e525a8e84", required = false) public UUID getUuid() { @@ -320,6 +318,7 @@ public FormatTest password(String password) { * Get password * @return password */ + @JsonProperty("password") @NotNull @Size(min = 10, max = 64) @Schema(name = "password", required = true) public String getPassword() { @@ -339,6 +338,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) { * Get bigDecimal * @return bigDecimal */ + @JsonProperty("BigDecimal") @Valid @Schema(name = "BigDecimal", required = false) public BigDecimal getBigDecimal() { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index d817048f2a75..aa8c3ee2514a 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -23,10 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class HasOnlyReadOnly { - @JsonProperty("bar") private String bar; - @JsonProperty("foo") private String foo; public HasOnlyReadOnly bar(String bar) { @@ -38,6 +36,7 @@ public HasOnlyReadOnly bar(String bar) { * Get bar * @return bar */ + @JsonProperty("bar") @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, required = false) public String getBar() { @@ -57,6 +56,7 @@ public HasOnlyReadOnly foo(String foo) { * Get foo * @return foo */ + @JsonProperty("foo") @Schema(name = "foo", accessMode = Schema.AccessMode.READ_ONLY, required = false) public String getFoo() { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MapTest.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MapTest.java index 55a10cdf8d08..594021c36d2d 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MapTest.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MapTest { - @JsonProperty("map_map_of_string") @Valid private Map> mapMapOfString = null; @@ -63,15 +62,12 @@ public static InnerEnum fromValue(String value) { } } - @JsonProperty("map_of_enum_string") @Valid private Map mapOfEnumString = null; - @JsonProperty("direct_map") @Valid private Map directMap = null; - @JsonProperty("indirect_map") @Valid private Map indirectMap = null; @@ -92,6 +88,7 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapMapOfString * @return mapMapOfString */ + @JsonProperty("map_map_of_string") @Valid @Schema(name = "map_map_of_string", required = false) public Map> getMapMapOfString() { @@ -119,6 +116,7 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) * Get mapOfEnumString * @return mapOfEnumString */ + @JsonProperty("map_of_enum_string") @Schema(name = "map_of_enum_string", required = false) public Map getMapOfEnumString() { @@ -146,6 +144,7 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) { * Get directMap * @return directMap */ + @JsonProperty("direct_map") @Schema(name = "direct_map", required = false) public Map getDirectMap() { @@ -173,6 +172,7 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) { * Get indirectMap * @return indirectMap */ + @JsonProperty("indirect_map") @Schema(name = "indirect_map", required = false) public Map getIndirectMap() { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index d58ed97c15d2..af4644ee1fd8 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -27,14 +27,11 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("map") @Valid private Map map = null; @@ -47,6 +44,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { * Get uuid * @return uuid */ + @JsonProperty("uuid") @Valid @Schema(name = "uuid", required = false) public UUID getUuid() { @@ -66,6 +64,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT * Get dateTime * @return dateTime */ + @JsonProperty("dateTime") @Valid @Schema(name = "dateTime", required = false) public OffsetDateTime getDateTime() { @@ -93,6 +92,7 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * Get map * @return map */ + @JsonProperty("map") @Valid @Schema(name = "map", required = false) public Map getMap() { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Model200Response.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Model200Response.java index 80ff3f1fc638..329840fd1cd5 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Model200Response.java @@ -24,10 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Model200Response { - @JsonProperty("name") private Integer name; - @JsonProperty("class") private String propertyClass; public Model200Response name(Integer name) { @@ -39,6 +37,7 @@ public Model200Response name(Integer name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public Integer getName() { @@ -58,6 +57,7 @@ public Model200Response propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ + @JsonProperty("class") @Schema(name = "class", required = false) public String getPropertyClass() { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelApiResponse.java index ed829bcb62cd..14ea90b13917 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -23,13 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -41,6 +38,7 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ + @JsonProperty("code") @Schema(name = "code", required = false) public Integer getCode() { @@ -60,6 +58,7 @@ public ModelApiResponse type(String type) { * Get type * @return type */ + @JsonProperty("type") @Schema(name = "type", required = false) public String getType() { @@ -79,6 +78,7 @@ public ModelApiResponse message(String message) { * Get message * @return message */ + @JsonProperty("message") @Schema(name = "message", required = false) public String getMessage() { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelList.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelList.java index 56e79c554452..1e0bcffc220c 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelList.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelList { - @JsonProperty("123-list") private String _123list; public ModelList _123list(String _123list) { @@ -35,6 +34,7 @@ public ModelList _123list(String _123list) { * Get _123list * @return _123list */ + @JsonProperty("123-list") @Schema(name = "123-list", required = false) public String get123list() { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelReturn.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelReturn.java index d95ce3f15491..90b17a6d6850 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelReturn.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelReturn { - @JsonProperty("return") private Integer _return; public ModelReturn _return(Integer _return) { @@ -36,6 +35,7 @@ public ModelReturn _return(Integer _return) { * Get _return * @return _return */ + @JsonProperty("return") @Schema(name = "return", required = false) public Integer getReturn() { 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 32cec75d981d..bcbb5aab0f79 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 @@ -22,16 +22,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Name { - @JsonProperty("name") private Integer name; - @JsonProperty("snake_case") private Integer snakeCase; - @JsonProperty("property") private String property; - @JsonProperty("123Number") private Integer _123number; public Name name(Integer name) { @@ -43,6 +39,7 @@ public Name name(Integer name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @Schema(name = "name", required = true) public Integer getName() { @@ -62,6 +59,7 @@ public Name snakeCase(Integer snakeCase) { * Get snakeCase * @return snakeCase */ + @JsonProperty("snake_case") @Schema(name = "snake_case", accessMode = Schema.AccessMode.READ_ONLY, required = false) public Integer getSnakeCase() { @@ -81,6 +79,7 @@ public Name property(String property) { * Get property * @return property */ + @JsonProperty("property") @Schema(name = "property", required = false) public String getProperty() { @@ -100,6 +99,7 @@ public Name _123number(Integer _123number) { * Get _123number * @return _123number */ + @JsonProperty("123Number") @Schema(name = "123Number", accessMode = Schema.AccessMode.READ_ONLY, required = false) public Integer get123number() { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/NumberOnly.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/NumberOnly.java index 14fb6641f919..a597943a3ef7 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/NumberOnly.java @@ -22,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class NumberOnly { - @JsonProperty("JustNumber") private BigDecimal justNumber; public NumberOnly justNumber(BigDecimal justNumber) { @@ -34,6 +33,7 @@ public NumberOnly justNumber(BigDecimal justNumber) { * Get justNumber * @return justNumber */ + @JsonProperty("JustNumber") @Valid @Schema(name = "JustNumber", required = false) public BigDecimal getJustNumber() { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Order.java index 9b54a719dbae..10e257004cf9 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Order.java @@ -24,16 +24,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -74,10 +70,8 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -89,6 +83,7 @@ public Order id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -108,6 +103,7 @@ public Order petId(Long petId) { * Get petId * @return petId */ + @JsonProperty("petId") @Schema(name = "petId", required = false) public Long getPetId() { @@ -127,6 +123,7 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ + @JsonProperty("quantity") @Schema(name = "quantity", required = false) public Integer getQuantity() { @@ -146,6 +143,7 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ + @JsonProperty("shipDate") @Valid @Schema(name = "shipDate", required = false) public OffsetDateTime getShipDate() { @@ -165,6 +163,7 @@ public Order status(StatusEnum status) { * Order Status * @return status */ + @JsonProperty("status") @Schema(name = "status", description = "Order Status", required = false) public StatusEnum getStatus() { @@ -184,6 +183,7 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ + @JsonProperty("complete") @Schema(name = "complete", required = false) public Boolean getComplete() { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/OuterComposite.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/OuterComposite.java index 461f98baa866..da3403158231 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/OuterComposite.java @@ -22,13 +22,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class OuterComposite { - @JsonProperty("my_number") private BigDecimal myNumber; - @JsonProperty("my_string") private String myString; - @JsonProperty("my_boolean") private Boolean myBoolean; public OuterComposite myNumber(BigDecimal myNumber) { @@ -40,6 +37,7 @@ public OuterComposite myNumber(BigDecimal myNumber) { * Get myNumber * @return myNumber */ + @JsonProperty("my_number") @Valid @Schema(name = "my_number", required = false) public BigDecimal getMyNumber() { @@ -59,6 +57,7 @@ public OuterComposite myString(String myString) { * Get myString * @return myString */ + @JsonProperty("my_string") @Schema(name = "my_string", required = false) public String getMyString() { @@ -78,6 +77,7 @@ public OuterComposite myBoolean(Boolean myBoolean) { * Get myBoolean * @return myBoolean */ + @JsonProperty("my_boolean") @Schema(name = "my_boolean", required = false) public Boolean getMyBoolean() { 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 c137885adb7f..edfea99a4441 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 @@ -29,20 +29,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private Set photoUrls = new LinkedHashSet<>(); - @JsonProperty("tags") @Valid private List tags = null; @@ -83,7 +78,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; public Pet id(Long id) { @@ -95,6 +89,7 @@ public Pet id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -114,6 +109,7 @@ public Pet category(Category category) { * Get category * @return category */ + @JsonProperty("category") @Valid @Schema(name = "category", required = false) public Category getCategory() { @@ -133,6 +129,7 @@ public Pet name(String name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @Schema(name = "name", example = "doggie", required = true) public String getName() { @@ -157,6 +154,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ + @JsonProperty("photoUrls") @NotNull @Schema(name = "photoUrls", required = true) public Set getPhotoUrls() { @@ -185,6 +183,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ + @JsonProperty("tags") @Valid @Schema(name = "tags", required = false) public List getTags() { @@ -204,6 +203,7 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ + @JsonProperty("status") @Schema(name = "status", description = "pet status in the store", required = false) public StatusEnum getStatus() { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ReadOnlyFirst.java index 39862919e7c7..5bb864fdfdf9 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -21,10 +21,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ReadOnlyFirst { - @JsonProperty("bar") private String bar; - @JsonProperty("baz") private String baz; public ReadOnlyFirst bar(String bar) { @@ -36,6 +34,7 @@ public ReadOnlyFirst bar(String bar) { * Get bar * @return bar */ + @JsonProperty("bar") @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, required = false) public String getBar() { @@ -55,6 +54,7 @@ public ReadOnlyFirst baz(String baz) { * Get baz * @return baz */ + @JsonProperty("baz") @Schema(name = "baz", required = false) public String getBaz() { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/SpecialModelName.java index fb431f59071a..d30f01ffd4ce 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/SpecialModelName.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class SpecialModelName { - @JsonProperty("$special[property.name]") private Long $specialPropertyName; public SpecialModelName $specialPropertyName(Long $specialPropertyName) { @@ -35,6 +34,7 @@ public class SpecialModelName { * Get $specialPropertyName * @return $specialPropertyName */ + @JsonProperty("$special[property.name]") @Schema(name = "$special[property.name]", required = false) public Long get$SpecialPropertyName() { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Tag.java index 75f3df1d0e17..7e0f150664d9 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Tag.java @@ -21,10 +21,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -36,6 +34,7 @@ public Tag id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -55,6 +54,7 @@ public Tag name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { 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 4d939d69a1e7..151d7623b25f 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 @@ -24,19 +24,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderDefault { - @JsonProperty("string_item") private String stringItem = "what"; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem = true; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -49,6 +44,7 @@ public TypeHolderDefault stringItem(String stringItem) { * Get stringItem * @return stringItem */ + @JsonProperty("string_item") @NotNull @Schema(name = "string_item", required = true) public String getStringItem() { @@ -68,6 +64,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ + @JsonProperty("number_item") @NotNull @Valid @Schema(name = "number_item", required = true) public BigDecimal getNumberItem() { @@ -87,6 +84,7 @@ public TypeHolderDefault integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ + @JsonProperty("integer_item") @NotNull @Schema(name = "integer_item", required = true) public Integer getIntegerItem() { @@ -106,6 +104,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ + @JsonProperty("bool_item") @NotNull @Schema(name = "bool_item", required = true) public Boolean getBoolItem() { @@ -130,6 +129,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ + @JsonProperty("array_item") @NotNull @Schema(name = "array_item", required = true) public List getArrayItem() { 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 c9b40aac5fa1..7239836800df 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 @@ -24,22 +24,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderExample { - @JsonProperty("string_item") private String stringItem; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("float_item") private Float floatItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -52,6 +46,7 @@ public TypeHolderExample stringItem(String stringItem) { * Get stringItem * @return stringItem */ + @JsonProperty("string_item") @NotNull @Schema(name = "string_item", example = "what", required = true) public String getStringItem() { @@ -71,6 +66,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ + @JsonProperty("number_item") @NotNull @Valid @Schema(name = "number_item", example = "1.234", required = true) public BigDecimal getNumberItem() { @@ -90,6 +86,7 @@ public TypeHolderExample floatItem(Float floatItem) { * Get floatItem * @return floatItem */ + @JsonProperty("float_item") @NotNull @Schema(name = "float_item", example = "1.234", required = true) public Float getFloatItem() { @@ -109,6 +106,7 @@ public TypeHolderExample integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ + @JsonProperty("integer_item") @NotNull @Schema(name = "integer_item", example = "-2", required = true) public Integer getIntegerItem() { @@ -128,6 +126,7 @@ public TypeHolderExample boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ + @JsonProperty("bool_item") @NotNull @Schema(name = "bool_item", example = "true", required = true) public Boolean getBoolItem() { @@ -152,6 +151,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ + @JsonProperty("array_item") @NotNull @Schema(name = "array_item", example = "[0, 1, 2, 3]", required = true) public List getArrayItem() { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/User.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/User.java index 9df36d407748..eb52ac9bab84 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/User.java @@ -21,28 +21,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -54,6 +46,7 @@ public User id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -73,6 +66,7 @@ public User username(String username) { * Get username * @return username */ + @JsonProperty("username") @Schema(name = "username", required = false) public String getUsername() { @@ -92,6 +86,7 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ + @JsonProperty("firstName") @Schema(name = "firstName", required = false) public String getFirstName() { @@ -111,6 +106,7 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ + @JsonProperty("lastName") @Schema(name = "lastName", required = false) public String getLastName() { @@ -130,6 +126,7 @@ public User email(String email) { * Get email * @return email */ + @JsonProperty("email") @Schema(name = "email", required = false) public String getEmail() { @@ -149,6 +146,7 @@ public User password(String password) { * Get password * @return password */ + @JsonProperty("password") @Schema(name = "password", required = false) public String getPassword() { @@ -168,6 +166,7 @@ public User phone(String phone) { * Get phone * @return phone */ + @JsonProperty("phone") @Schema(name = "phone", required = false) public String getPhone() { @@ -187,6 +186,7 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ + @JsonProperty("userStatus") @Schema(name = "userStatus", description = "User Status", required = false) public Integer getUserStatus() { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/XmlItem.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/XmlItem.java index 3b3593e71797..4b287492cc75 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/XmlItem.java @@ -24,99 +24,70 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class XmlItem { - @JsonProperty("attribute_string") private String attributeString; - @JsonProperty("attribute_number") private BigDecimal attributeNumber; - @JsonProperty("attribute_integer") private Integer attributeInteger; - @JsonProperty("attribute_boolean") private Boolean attributeBoolean; - @JsonProperty("wrapped_array") @Valid private List wrappedArray = null; - @JsonProperty("name_string") private String nameString; - @JsonProperty("name_number") private BigDecimal nameNumber; - @JsonProperty("name_integer") private Integer nameInteger; - @JsonProperty("name_boolean") private Boolean nameBoolean; - @JsonProperty("name_array") @Valid private List nameArray = null; - @JsonProperty("name_wrapped_array") @Valid private List nameWrappedArray = null; - @JsonProperty("prefix_string") private String prefixString; - @JsonProperty("prefix_number") private BigDecimal prefixNumber; - @JsonProperty("prefix_integer") private Integer prefixInteger; - @JsonProperty("prefix_boolean") private Boolean prefixBoolean; - @JsonProperty("prefix_array") @Valid private List prefixArray = null; - @JsonProperty("prefix_wrapped_array") @Valid private List prefixWrappedArray = null; - @JsonProperty("namespace_string") private String namespaceString; - @JsonProperty("namespace_number") private BigDecimal namespaceNumber; - @JsonProperty("namespace_integer") private Integer namespaceInteger; - @JsonProperty("namespace_boolean") private Boolean namespaceBoolean; - @JsonProperty("namespace_array") @Valid private List namespaceArray = null; - @JsonProperty("namespace_wrapped_array") @Valid private List namespaceWrappedArray = null; - @JsonProperty("prefix_ns_string") private String prefixNsString; - @JsonProperty("prefix_ns_number") private BigDecimal prefixNsNumber; - @JsonProperty("prefix_ns_integer") private Integer prefixNsInteger; - @JsonProperty("prefix_ns_boolean") private Boolean prefixNsBoolean; - @JsonProperty("prefix_ns_array") @Valid private List prefixNsArray = null; - @JsonProperty("prefix_ns_wrapped_array") @Valid private List prefixNsWrappedArray = null; @@ -129,6 +100,7 @@ public XmlItem attributeString(String attributeString) { * Get attributeString * @return attributeString */ + @JsonProperty("attribute_string") @Schema(name = "attribute_string", example = "string", required = false) public String getAttributeString() { @@ -148,6 +120,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) { * Get attributeNumber * @return attributeNumber */ + @JsonProperty("attribute_number") @Valid @Schema(name = "attribute_number", example = "1.234", required = false) public BigDecimal getAttributeNumber() { @@ -167,6 +140,7 @@ public XmlItem attributeInteger(Integer attributeInteger) { * Get attributeInteger * @return attributeInteger */ + @JsonProperty("attribute_integer") @Schema(name = "attribute_integer", example = "-2", required = false) public Integer getAttributeInteger() { @@ -186,6 +160,7 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) { * Get attributeBoolean * @return attributeBoolean */ + @JsonProperty("attribute_boolean") @Schema(name = "attribute_boolean", example = "true", required = false) public Boolean getAttributeBoolean() { @@ -213,6 +188,7 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) { * Get wrappedArray * @return wrappedArray */ + @JsonProperty("wrapped_array") @Schema(name = "wrapped_array", required = false) public List getWrappedArray() { @@ -232,6 +208,7 @@ public XmlItem nameString(String nameString) { * Get nameString * @return nameString */ + @JsonProperty("name_string") @Schema(name = "name_string", example = "string", required = false) public String getNameString() { @@ -251,6 +228,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) { * Get nameNumber * @return nameNumber */ + @JsonProperty("name_number") @Valid @Schema(name = "name_number", example = "1.234", required = false) public BigDecimal getNameNumber() { @@ -270,6 +248,7 @@ public XmlItem nameInteger(Integer nameInteger) { * Get nameInteger * @return nameInteger */ + @JsonProperty("name_integer") @Schema(name = "name_integer", example = "-2", required = false) public Integer getNameInteger() { @@ -289,6 +268,7 @@ public XmlItem nameBoolean(Boolean nameBoolean) { * Get nameBoolean * @return nameBoolean */ + @JsonProperty("name_boolean") @Schema(name = "name_boolean", example = "true", required = false) public Boolean getNameBoolean() { @@ -316,6 +296,7 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) { * Get nameArray * @return nameArray */ + @JsonProperty("name_array") @Schema(name = "name_array", required = false) public List getNameArray() { @@ -343,6 +324,7 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) { * Get nameWrappedArray * @return nameWrappedArray */ + @JsonProperty("name_wrapped_array") @Schema(name = "name_wrapped_array", required = false) public List getNameWrappedArray() { @@ -362,6 +344,7 @@ public XmlItem prefixString(String prefixString) { * Get prefixString * @return prefixString */ + @JsonProperty("prefix_string") @Schema(name = "prefix_string", example = "string", required = false) public String getPrefixString() { @@ -381,6 +364,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) { * Get prefixNumber * @return prefixNumber */ + @JsonProperty("prefix_number") @Valid @Schema(name = "prefix_number", example = "1.234", required = false) public BigDecimal getPrefixNumber() { @@ -400,6 +384,7 @@ public XmlItem prefixInteger(Integer prefixInteger) { * Get prefixInteger * @return prefixInteger */ + @JsonProperty("prefix_integer") @Schema(name = "prefix_integer", example = "-2", required = false) public Integer getPrefixInteger() { @@ -419,6 +404,7 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) { * Get prefixBoolean * @return prefixBoolean */ + @JsonProperty("prefix_boolean") @Schema(name = "prefix_boolean", example = "true", required = false) public Boolean getPrefixBoolean() { @@ -446,6 +432,7 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) { * Get prefixArray * @return prefixArray */ + @JsonProperty("prefix_array") @Schema(name = "prefix_array", required = false) public List getPrefixArray() { @@ -473,6 +460,7 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) { * Get prefixWrappedArray * @return prefixWrappedArray */ + @JsonProperty("prefix_wrapped_array") @Schema(name = "prefix_wrapped_array", required = false) public List getPrefixWrappedArray() { @@ -492,6 +480,7 @@ public XmlItem namespaceString(String namespaceString) { * Get namespaceString * @return namespaceString */ + @JsonProperty("namespace_string") @Schema(name = "namespace_string", example = "string", required = false) public String getNamespaceString() { @@ -511,6 +500,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) { * Get namespaceNumber * @return namespaceNumber */ + @JsonProperty("namespace_number") @Valid @Schema(name = "namespace_number", example = "1.234", required = false) public BigDecimal getNamespaceNumber() { @@ -530,6 +520,7 @@ public XmlItem namespaceInteger(Integer namespaceInteger) { * Get namespaceInteger * @return namespaceInteger */ + @JsonProperty("namespace_integer") @Schema(name = "namespace_integer", example = "-2", required = false) public Integer getNamespaceInteger() { @@ -549,6 +540,7 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) { * Get namespaceBoolean * @return namespaceBoolean */ + @JsonProperty("namespace_boolean") @Schema(name = "namespace_boolean", example = "true", required = false) public Boolean getNamespaceBoolean() { @@ -576,6 +568,7 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) { * Get namespaceArray * @return namespaceArray */ + @JsonProperty("namespace_array") @Schema(name = "namespace_array", required = false) public List getNamespaceArray() { @@ -603,6 +596,7 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) { * Get namespaceWrappedArray * @return namespaceWrappedArray */ + @JsonProperty("namespace_wrapped_array") @Schema(name = "namespace_wrapped_array", required = false) public List getNamespaceWrappedArray() { @@ -622,6 +616,7 @@ public XmlItem prefixNsString(String prefixNsString) { * Get prefixNsString * @return prefixNsString */ + @JsonProperty("prefix_ns_string") @Schema(name = "prefix_ns_string", example = "string", required = false) public String getPrefixNsString() { @@ -641,6 +636,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) { * Get prefixNsNumber * @return prefixNsNumber */ + @JsonProperty("prefix_ns_number") @Valid @Schema(name = "prefix_ns_number", example = "1.234", required = false) public BigDecimal getPrefixNsNumber() { @@ -660,6 +656,7 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) { * Get prefixNsInteger * @return prefixNsInteger */ + @JsonProperty("prefix_ns_integer") @Schema(name = "prefix_ns_integer", example = "-2", required = false) public Integer getPrefixNsInteger() { @@ -679,6 +676,7 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) { * Get prefixNsBoolean * @return prefixNsBoolean */ + @JsonProperty("prefix_ns_boolean") @Schema(name = "prefix_ns_boolean", example = "true", required = false) public Boolean getPrefixNsBoolean() { @@ -706,6 +704,7 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) { * Get prefixNsArray * @return prefixNsArray */ + @JsonProperty("prefix_ns_array") @Schema(name = "prefix_ns_array", required = false) public List getPrefixNsArray() { @@ -733,6 +732,7 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) { * Get prefixNsWrappedArray * @return prefixNsWrappedArray */ + @JsonProperty("prefix_ns_wrapped_array") @Schema(name = "prefix_ns_wrapped_array", required = false) public List getPrefixNsWrappedArray() { diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Category.java index ed3c428e34a3..63e2bb12a67c 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Category.java @@ -22,10 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Category id(Long id) { @@ -37,6 +35,7 @@ public Category id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -56,6 +55,7 @@ public Category name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java index 18e0004c3354..5d93139025d0 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -24,13 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -42,6 +39,7 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ + @JsonProperty("code") @Schema(name = "code", required = false) public Integer getCode() { @@ -61,6 +59,7 @@ public ModelApiResponse type(String type) { * Get type * @return type */ + @JsonProperty("type") @Schema(name = "type", required = false) public String getType() { @@ -80,6 +79,7 @@ public ModelApiResponse message(String message) { * Get message * @return message */ + @JsonProperty("message") @Schema(name = "message", required = false) public String getMessage() { diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Order.java index 04bee348f98e..57e02c6a0658 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Order.java @@ -25,16 +25,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -75,10 +71,8 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -90,6 +84,7 @@ public Order id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -109,6 +104,7 @@ public Order petId(Long petId) { * Get petId * @return petId */ + @JsonProperty("petId") @Schema(name = "petId", required = false) public Long getPetId() { @@ -128,6 +124,7 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ + @JsonProperty("quantity") @Schema(name = "quantity", required = false) public Integer getQuantity() { @@ -147,6 +144,7 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ + @JsonProperty("shipDate") @Valid @Schema(name = "shipDate", required = false) public OffsetDateTime getShipDate() { @@ -166,6 +164,7 @@ public Order status(StatusEnum status) { * Order Status * @return status */ + @JsonProperty("status") @Schema(name = "status", description = "Order Status", required = false) public StatusEnum getStatus() { @@ -185,6 +184,7 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ + @JsonProperty("complete") @Schema(name = "complete", required = false) public Boolean getComplete() { diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java index f702d09a1a82..935a9242ca57 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java @@ -27,20 +27,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private List photoUrls = new ArrayList<>(); - @JsonProperty("tags") @Valid private List tags = null; @@ -81,7 +76,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; public Pet id(Long id) { @@ -93,6 +87,7 @@ public Pet id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -112,6 +107,7 @@ public Pet category(Category category) { * Get category * @return category */ + @JsonProperty("category") @Valid @Schema(name = "category", required = false) public Category getCategory() { @@ -131,6 +127,7 @@ public Pet name(String name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @Schema(name = "name", example = "doggie", required = true) public String getName() { @@ -155,6 +152,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ + @JsonProperty("photoUrls") @NotNull @Schema(name = "photoUrls", required = true) public List getPhotoUrls() { @@ -182,6 +180,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ + @JsonProperty("tags") @Valid @Schema(name = "tags", required = false) public List getTags() { @@ -201,6 +200,7 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ + @JsonProperty("status") @Schema(name = "status", description = "pet status in the store", required = false) public StatusEnum getStatus() { diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Tag.java index b4d9d7b0a13b..657e04be1aae 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Tag.java @@ -22,10 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -37,6 +35,7 @@ public Tag id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -56,6 +55,7 @@ public Tag name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/User.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/User.java index 01b7db75ca7a..c51537754aff 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/User.java @@ -22,28 +22,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -55,6 +47,7 @@ public User id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -74,6 +67,7 @@ public User username(String username) { * Get username * @return username */ + @JsonProperty("username") @Schema(name = "username", required = false) public String getUsername() { @@ -93,6 +87,7 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ + @JsonProperty("firstName") @Schema(name = "firstName", required = false) public String getFirstName() { @@ -112,6 +107,7 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ + @JsonProperty("lastName") @Schema(name = "lastName", required = false) public String getLastName() { @@ -131,6 +127,7 @@ public User email(String email) { * Get email * @return email */ + @JsonProperty("email") @Schema(name = "email", required = false) public String getEmail() { @@ -150,6 +147,7 @@ public User password(String password) { * Get password * @return password */ + @JsonProperty("password") @Schema(name = "password", required = false) public String getPassword() { @@ -169,6 +167,7 @@ public User phone(String phone) { * Get phone * @return phone */ + @JsonProperty("phone") @Schema(name = "phone", required = false) public String getPhone() { @@ -188,6 +187,7 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ + @JsonProperty("userStatus") @Schema(name = "userStatus", description = "User Status", required = false) public Integer getUserStatus() { diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java index 24264bce8b2d..59ab132dc0b5 100644 --- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java @@ -22,10 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Category id(Long id) { @@ -37,6 +35,7 @@ public Category id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -56,6 +55,7 @@ public Category name(String name) { * Get name * @return name */ + @JsonProperty("name") @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java index 18e0004c3354..5d93139025d0 100644 --- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -24,13 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -42,6 +39,7 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ + @JsonProperty("code") @Schema(name = "code", required = false) public Integer getCode() { @@ -61,6 +59,7 @@ public ModelApiResponse type(String type) { * Get type * @return type */ + @JsonProperty("type") @Schema(name = "type", required = false) public String getType() { @@ -80,6 +79,7 @@ public ModelApiResponse message(String message) { * Get message * @return message */ + @JsonProperty("message") @Schema(name = "message", required = false) public String getMessage() { diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java index 04bee348f98e..57e02c6a0658 100644 --- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java @@ -25,16 +25,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -75,10 +71,8 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -90,6 +84,7 @@ public Order id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -109,6 +104,7 @@ public Order petId(Long petId) { * Get petId * @return petId */ + @JsonProperty("petId") @Schema(name = "petId", required = false) public Long getPetId() { @@ -128,6 +124,7 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ + @JsonProperty("quantity") @Schema(name = "quantity", required = false) public Integer getQuantity() { @@ -147,6 +144,7 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ + @JsonProperty("shipDate") @Valid @Schema(name = "shipDate", required = false) public OffsetDateTime getShipDate() { @@ -166,6 +164,7 @@ public Order status(StatusEnum status) { * Order Status * @return status */ + @JsonProperty("status") @Schema(name = "status", description = "Order Status", required = false) public StatusEnum getStatus() { @@ -185,6 +184,7 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ + @JsonProperty("complete") @Schema(name = "complete", required = false) public Boolean getComplete() { diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java index f702d09a1a82..935a9242ca57 100644 --- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java @@ -27,20 +27,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private List photoUrls = new ArrayList<>(); - @JsonProperty("tags") @Valid private List tags = null; @@ -81,7 +76,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; public Pet id(Long id) { @@ -93,6 +87,7 @@ public Pet id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -112,6 +107,7 @@ public Pet category(Category category) { * Get category * @return category */ + @JsonProperty("category") @Valid @Schema(name = "category", required = false) public Category getCategory() { @@ -131,6 +127,7 @@ public Pet name(String name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @Schema(name = "name", example = "doggie", required = true) public String getName() { @@ -155,6 +152,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ + @JsonProperty("photoUrls") @NotNull @Schema(name = "photoUrls", required = true) public List getPhotoUrls() { @@ -182,6 +180,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ + @JsonProperty("tags") @Valid @Schema(name = "tags", required = false) public List getTags() { @@ -201,6 +200,7 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ + @JsonProperty("status") @Schema(name = "status", description = "pet status in the store", required = false) public StatusEnum getStatus() { diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java index b4d9d7b0a13b..657e04be1aae 100644 --- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java @@ -22,10 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -37,6 +35,7 @@ public Tag id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -56,6 +55,7 @@ public Tag name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java index 01b7db75ca7a..c51537754aff 100644 --- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java @@ -22,28 +22,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -55,6 +47,7 @@ public User id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -74,6 +67,7 @@ public User username(String username) { * Get username * @return username */ + @JsonProperty("username") @Schema(name = "username", required = false) public String getUsername() { @@ -93,6 +87,7 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ + @JsonProperty("firstName") @Schema(name = "firstName", required = false) public String getFirstName() { @@ -112,6 +107,7 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ + @JsonProperty("lastName") @Schema(name = "lastName", required = false) public String getLastName() { @@ -131,6 +127,7 @@ public User email(String email) { * Get email * @return email */ + @JsonProperty("email") @Schema(name = "email", required = false) public String getEmail() { @@ -150,6 +147,7 @@ public User password(String password) { * Get password * @return password */ + @JsonProperty("password") @Schema(name = "password", required = false) public String getPassword() { @@ -169,6 +167,7 @@ public User phone(String phone) { * Get phone * @return phone */ + @JsonProperty("phone") @Schema(name = "phone", required = false) public String getPhone() { @@ -188,6 +187,7 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ + @JsonProperty("userStatus") @Schema(name = "userStatus", description = "User Status", required = false) public Integer getUserStatus() { diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Category.java index ed3c428e34a3..63e2bb12a67c 100644 --- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Category.java @@ -22,10 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Category id(Long id) { @@ -37,6 +35,7 @@ public Category id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -56,6 +55,7 @@ public Category name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/ModelApiResponse.java index 18e0004c3354..5d93139025d0 100644 --- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -24,13 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -42,6 +39,7 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ + @JsonProperty("code") @Schema(name = "code", required = false) public Integer getCode() { @@ -61,6 +59,7 @@ public ModelApiResponse type(String type) { * Get type * @return type */ + @JsonProperty("type") @Schema(name = "type", required = false) public String getType() { @@ -80,6 +79,7 @@ public ModelApiResponse message(String message) { * Get message * @return message */ + @JsonProperty("message") @Schema(name = "message", required = false) public String getMessage() { diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Order.java index 04bee348f98e..57e02c6a0658 100644 --- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Order.java @@ -25,16 +25,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -75,10 +71,8 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -90,6 +84,7 @@ public Order id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -109,6 +104,7 @@ public Order petId(Long petId) { * Get petId * @return petId */ + @JsonProperty("petId") @Schema(name = "petId", required = false) public Long getPetId() { @@ -128,6 +124,7 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ + @JsonProperty("quantity") @Schema(name = "quantity", required = false) public Integer getQuantity() { @@ -147,6 +144,7 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ + @JsonProperty("shipDate") @Valid @Schema(name = "shipDate", required = false) public OffsetDateTime getShipDate() { @@ -166,6 +164,7 @@ public Order status(StatusEnum status) { * Order Status * @return status */ + @JsonProperty("status") @Schema(name = "status", description = "Order Status", required = false) public StatusEnum getStatus() { @@ -185,6 +184,7 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ + @JsonProperty("complete") @Schema(name = "complete", required = false) public Boolean getComplete() { diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Pet.java index f702d09a1a82..935a9242ca57 100644 --- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Pet.java @@ -27,20 +27,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private List photoUrls = new ArrayList<>(); - @JsonProperty("tags") @Valid private List tags = null; @@ -81,7 +76,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; public Pet id(Long id) { @@ -93,6 +87,7 @@ public Pet id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -112,6 +107,7 @@ public Pet category(Category category) { * Get category * @return category */ + @JsonProperty("category") @Valid @Schema(name = "category", required = false) public Category getCategory() { @@ -131,6 +127,7 @@ public Pet name(String name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @Schema(name = "name", example = "doggie", required = true) public String getName() { @@ -155,6 +152,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ + @JsonProperty("photoUrls") @NotNull @Schema(name = "photoUrls", required = true) public List getPhotoUrls() { @@ -182,6 +180,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ + @JsonProperty("tags") @Valid @Schema(name = "tags", required = false) public List getTags() { @@ -201,6 +200,7 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ + @JsonProperty("status") @Schema(name = "status", description = "pet status in the store", required = false) public StatusEnum getStatus() { diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Tag.java index b4d9d7b0a13b..657e04be1aae 100644 --- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Tag.java @@ -22,10 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -37,6 +35,7 @@ public Tag id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -56,6 +55,7 @@ public Tag name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/User.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/User.java index 01b7db75ca7a..c51537754aff 100644 --- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/User.java @@ -22,28 +22,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -55,6 +47,7 @@ public User id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -74,6 +67,7 @@ public User username(String username) { * Get username * @return username */ + @JsonProperty("username") @Schema(name = "username", required = false) public String getUsername() { @@ -93,6 +87,7 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ + @JsonProperty("firstName") @Schema(name = "firstName", required = false) public String getFirstName() { @@ -112,6 +107,7 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ + @JsonProperty("lastName") @Schema(name = "lastName", required = false) public String getLastName() { @@ -131,6 +127,7 @@ public User email(String email) { * Get email * @return email */ + @JsonProperty("email") @Schema(name = "email", required = false) public String getEmail() { @@ -150,6 +147,7 @@ public User password(String password) { * Get password * @return password */ + @JsonProperty("password") @Schema(name = "password", required = false) public String getPassword() { @@ -169,6 +167,7 @@ public User phone(String phone) { * Get phone * @return phone */ + @JsonProperty("phone") @Schema(name = "phone", required = false) public String getPhone() { @@ -188,6 +187,7 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ + @JsonProperty("userStatus") @Schema(name = "userStatus", description = "User Status", required = false) public Integer getUserStatus() { diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Category.java index ed3c428e34a3..63e2bb12a67c 100644 --- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Category.java @@ -22,10 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Category id(Long id) { @@ -37,6 +35,7 @@ public Category id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -56,6 +55,7 @@ public Category name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/ModelApiResponse.java index 18e0004c3354..5d93139025d0 100644 --- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -24,13 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -42,6 +39,7 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ + @JsonProperty("code") @Schema(name = "code", required = false) public Integer getCode() { @@ -61,6 +59,7 @@ public ModelApiResponse type(String type) { * Get type * @return type */ + @JsonProperty("type") @Schema(name = "type", required = false) public String getType() { @@ -80,6 +79,7 @@ public ModelApiResponse message(String message) { * Get message * @return message */ + @JsonProperty("message") @Schema(name = "message", required = false) public String getMessage() { diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Order.java index 04bee348f98e..57e02c6a0658 100644 --- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Order.java @@ -25,16 +25,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -75,10 +71,8 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -90,6 +84,7 @@ public Order id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -109,6 +104,7 @@ public Order petId(Long petId) { * Get petId * @return petId */ + @JsonProperty("petId") @Schema(name = "petId", required = false) public Long getPetId() { @@ -128,6 +124,7 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ + @JsonProperty("quantity") @Schema(name = "quantity", required = false) public Integer getQuantity() { @@ -147,6 +144,7 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ + @JsonProperty("shipDate") @Valid @Schema(name = "shipDate", required = false) public OffsetDateTime getShipDate() { @@ -166,6 +164,7 @@ public Order status(StatusEnum status) { * Order Status * @return status */ + @JsonProperty("status") @Schema(name = "status", description = "Order Status", required = false) public StatusEnum getStatus() { @@ -185,6 +184,7 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ + @JsonProperty("complete") @Schema(name = "complete", required = false) public Boolean getComplete() { diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java index f702d09a1a82..935a9242ca57 100644 --- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java @@ -27,20 +27,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private List photoUrls = new ArrayList<>(); - @JsonProperty("tags") @Valid private List tags = null; @@ -81,7 +76,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; public Pet id(Long id) { @@ -93,6 +87,7 @@ public Pet id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -112,6 +107,7 @@ public Pet category(Category category) { * Get category * @return category */ + @JsonProperty("category") @Valid @Schema(name = "category", required = false) public Category getCategory() { @@ -131,6 +127,7 @@ public Pet name(String name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @Schema(name = "name", example = "doggie", required = true) public String getName() { @@ -155,6 +152,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ + @JsonProperty("photoUrls") @NotNull @Schema(name = "photoUrls", required = true) public List getPhotoUrls() { @@ -182,6 +180,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ + @JsonProperty("tags") @Valid @Schema(name = "tags", required = false) public List getTags() { @@ -201,6 +200,7 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ + @JsonProperty("status") @Schema(name = "status", description = "pet status in the store", required = false) public StatusEnum getStatus() { diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Tag.java index b4d9d7b0a13b..657e04be1aae 100644 --- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Tag.java @@ -22,10 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -37,6 +35,7 @@ public Tag id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -56,6 +55,7 @@ public Tag name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/User.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/User.java index 01b7db75ca7a..c51537754aff 100644 --- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/User.java @@ -22,28 +22,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -55,6 +47,7 @@ public User id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -74,6 +67,7 @@ public User username(String username) { * Get username * @return username */ + @JsonProperty("username") @Schema(name = "username", required = false) public String getUsername() { @@ -93,6 +87,7 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ + @JsonProperty("firstName") @Schema(name = "firstName", required = false) public String getFirstName() { @@ -112,6 +107,7 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ + @JsonProperty("lastName") @Schema(name = "lastName", required = false) public String getLastName() { @@ -131,6 +127,7 @@ public User email(String email) { * Get email * @return email */ + @JsonProperty("email") @Schema(name = "email", required = false) public String getEmail() { @@ -150,6 +147,7 @@ public User password(String password) { * Get password * @return password */ + @JsonProperty("password") @Schema(name = "password", required = false) public String getPassword() { @@ -169,6 +167,7 @@ public User phone(String phone) { * Get phone * @return phone */ + @JsonProperty("phone") @Schema(name = "phone", required = false) public String getPhone() { @@ -188,6 +187,7 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ + @JsonProperty("userStatus") @Schema(name = "userStatus", description = "User Status", required = false) public Integer getUserStatus() { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Addressable.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Addressable.java index 2cc692ebfcb3..eeff6ac5737d 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Addressable.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Addressable.java @@ -22,10 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Addressable { - @JsonProperty("href") private String href; - @JsonProperty("id") private String id; public Addressable href(String href) { @@ -37,6 +35,7 @@ public Addressable href(String href) { * Hyperlink reference * @return href */ + @JsonProperty("href") @Schema(name = "href", description = "Hyperlink reference", required = false) public String getHref() { @@ -56,6 +55,7 @@ public Addressable id(String id) { * unique identifier * @return id */ + @JsonProperty("id") @Schema(name = "id", description = "unique identifier", required = false) public String getId() { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Bar.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Bar.java index 2ba1acefbf2a..aecb640f8a9c 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Bar.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Bar.java @@ -27,16 +27,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Bar extends Entity implements BarRefOrValue { - @JsonProperty("id") private String id; - @JsonProperty("barPropA") private String barPropA; - @JsonProperty("fooPropB") private String fooPropB; - @JsonProperty("foo") private FooRefOrValue foo; public Bar id(String id) { @@ -48,6 +44,7 @@ public Bar id(String id) { * Get id * @return id */ + @JsonProperty("id") @NotNull @Schema(name = "id", required = true) public String getId() { @@ -67,6 +64,7 @@ public Bar barPropA(String barPropA) { * Get barPropA * @return barPropA */ + @JsonProperty("barPropA") @Schema(name = "barPropA", required = false) public String getBarPropA() { @@ -86,6 +84,7 @@ public Bar fooPropB(String fooPropB) { * Get fooPropB * @return fooPropB */ + @JsonProperty("fooPropB") @Schema(name = "fooPropB", required = false) public String getFooPropB() { @@ -105,6 +104,7 @@ public Bar foo(FooRefOrValue foo) { * Get foo * @return foo */ + @JsonProperty("foo") @Valid @Schema(name = "foo", required = false) public FooRefOrValue getFoo() { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarCreate.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarCreate.java index 365251e5d34d..779ffc4c01cf 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarCreate.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarCreate.java @@ -29,13 +29,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class BarCreate extends Entity { - @JsonProperty("barPropA") private String barPropA; - @JsonProperty("fooPropB") private String fooPropB; - @JsonProperty("foo") private FooRefOrValue foo; public BarCreate barPropA(String barPropA) { @@ -47,6 +44,7 @@ public BarCreate barPropA(String barPropA) { * Get barPropA * @return barPropA */ + @JsonProperty("barPropA") @Schema(name = "barPropA", required = false) public String getBarPropA() { @@ -66,6 +64,7 @@ public BarCreate fooPropB(String fooPropB) { * Get fooPropB * @return fooPropB */ + @JsonProperty("fooPropB") @Schema(name = "fooPropB", required = false) public String getFooPropB() { @@ -85,6 +84,7 @@ public BarCreate foo(FooRefOrValue foo) { * Get foo * @return foo */ + @JsonProperty("foo") @Valid @Schema(name = "foo", required = false) public FooRefOrValue getFoo() { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Entity.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Entity.java index 633e37be68f3..43903165f2e5 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Entity.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Entity.java @@ -44,19 +44,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Entity { - @JsonProperty("href") private String href; - @JsonProperty("id") private String id; - @JsonProperty("@schemaLocation") private String atSchemaLocation; - @JsonProperty("@baseType") private String atBaseType; - @JsonProperty("@type") private String atType; public Entity href(String href) { @@ -68,6 +63,7 @@ public Entity href(String href) { * Hyperlink reference * @return href */ + @JsonProperty("href") @Schema(name = "href", description = "Hyperlink reference", required = false) public String getHref() { @@ -87,6 +83,7 @@ public Entity id(String id) { * unique identifier * @return id */ + @JsonProperty("id") @Schema(name = "id", description = "unique identifier", required = false) public String getId() { @@ -106,6 +103,7 @@ public Entity atSchemaLocation(String atSchemaLocation) { * A URI to a JSON-Schema file that defines additional attributes and relationships * @return atSchemaLocation */ + @JsonProperty("@schemaLocation") @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", required = false) public String getAtSchemaLocation() { @@ -125,6 +123,7 @@ public Entity atBaseType(String atBaseType) { * When sub-classing, this defines the super-class * @return atBaseType */ + @JsonProperty("@baseType") @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", required = false) public String getAtBaseType() { @@ -144,6 +143,7 @@ public Entity atType(String atType) { * When sub-classing, this defines the sub-class Extensible name * @return atType */ + @JsonProperty("@type") @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", required = true) public String getAtType() { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/EntityRef.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/EntityRef.java index ae49fa332e0c..02b4f9eeadfc 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/EntityRef.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/EntityRef.java @@ -37,25 +37,18 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class EntityRef { - @JsonProperty("name") private String name; - @JsonProperty("@referredType") private String atReferredType; - @JsonProperty("href") private String href; - @JsonProperty("id") private String id; - @JsonProperty("@schemaLocation") private String atSchemaLocation; - @JsonProperty("@baseType") private String atBaseType; - @JsonProperty("@type") private String atType; public EntityRef name(String name) { @@ -67,6 +60,7 @@ public EntityRef name(String name) { * Name of the related entity. * @return name */ + @JsonProperty("name") @Schema(name = "name", description = "Name of the related entity.", required = false) public String getName() { @@ -86,6 +80,7 @@ public EntityRef atReferredType(String atReferredType) { * The actual type of the target instance when needed for disambiguation. * @return atReferredType */ + @JsonProperty("@referredType") @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", required = false) public String getAtReferredType() { @@ -105,6 +100,7 @@ public EntityRef href(String href) { * Hyperlink reference * @return href */ + @JsonProperty("href") @Schema(name = "href", description = "Hyperlink reference", required = false) public String getHref() { @@ -124,6 +120,7 @@ public EntityRef id(String id) { * unique identifier * @return id */ + @JsonProperty("id") @Schema(name = "id", description = "unique identifier", required = false) public String getId() { @@ -143,6 +140,7 @@ public EntityRef atSchemaLocation(String atSchemaLocation) { * A URI to a JSON-Schema file that defines additional attributes and relationships * @return atSchemaLocation */ + @JsonProperty("@schemaLocation") @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", required = false) public String getAtSchemaLocation() { @@ -162,6 +160,7 @@ public EntityRef atBaseType(String atBaseType) { * When sub-classing, this defines the super-class * @return atBaseType */ + @JsonProperty("@baseType") @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", required = false) public String getAtBaseType() { @@ -181,6 +180,7 @@ public EntityRef atType(String atType) { * When sub-classing, this defines the sub-class Extensible name * @return atType */ + @JsonProperty("@type") @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", required = true) public String getAtType() { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Extensible.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Extensible.java index f6a109c1d5f0..864f45502c88 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Extensible.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Extensible.java @@ -21,13 +21,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Extensible { - @JsonProperty("@schemaLocation") private String atSchemaLocation; - @JsonProperty("@baseType") private String atBaseType; - @JsonProperty("@type") private String atType; public Extensible atSchemaLocation(String atSchemaLocation) { @@ -39,6 +36,7 @@ public Extensible atSchemaLocation(String atSchemaLocation) { * A URI to a JSON-Schema file that defines additional attributes and relationships * @return atSchemaLocation */ + @JsonProperty("@schemaLocation") @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", required = false) public String getAtSchemaLocation() { @@ -58,6 +56,7 @@ public Extensible atBaseType(String atBaseType) { * When sub-classing, this defines the super-class * @return atBaseType */ + @JsonProperty("@baseType") @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", required = false) public String getAtBaseType() { @@ -77,6 +76,7 @@ public Extensible atType(String atType) { * When sub-classing, this defines the sub-class Extensible name * @return atType */ + @JsonProperty("@type") @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", required = true) public String getAtType() { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Foo.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Foo.java index b0b6f53b1b16..72ece922fb7a 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Foo.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Foo.java @@ -26,10 +26,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Foo extends Entity implements FooRefOrValue { - @JsonProperty("fooPropA") private String fooPropA; - @JsonProperty("fooPropB") private String fooPropB; public Foo fooPropA(String fooPropA) { @@ -41,6 +39,7 @@ public Foo fooPropA(String fooPropA) { * Get fooPropA * @return fooPropA */ + @JsonProperty("fooPropA") @Schema(name = "fooPropA", required = false) public String getFooPropA() { @@ -60,6 +59,7 @@ public Foo fooPropB(String fooPropB) { * Get fooPropB * @return fooPropB */ + @JsonProperty("fooPropB") @Schema(name = "fooPropB", required = false) public String getFooPropB() { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/FooRef.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/FooRef.java index 5900228902d6..c4d9525ea4a7 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/FooRef.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/FooRef.java @@ -26,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FooRef extends EntityRef implements FooRefOrValue { - @JsonProperty("foorefPropA") private String foorefPropA; public FooRef foorefPropA(String foorefPropA) { @@ -38,6 +37,7 @@ public FooRef foorefPropA(String foorefPropA) { * Get foorefPropA * @return foorefPropA */ + @JsonProperty("foorefPropA") @Schema(name = "foorefPropA", required = false) public String getFoorefPropA() { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pasta.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pasta.java index 116c2687b84f..25a72bbf0d70 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pasta.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pasta.java @@ -26,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pasta extends Entity { - @JsonProperty("vendor") private String vendor; public Pasta vendor(String vendor) { @@ -38,6 +37,7 @@ public Pasta vendor(String vendor) { * Get vendor * @return vendor */ + @JsonProperty("vendor") @Schema(name = "vendor", required = false) public String getVendor() { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pizza.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pizza.java index 015b75a8053b..018f882065c3 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pizza.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pizza.java @@ -36,7 +36,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pizza extends Entity { - @JsonProperty("pizzaSize") private BigDecimal pizzaSize; public Pizza pizzaSize(BigDecimal pizzaSize) { @@ -48,6 +47,7 @@ public Pizza pizzaSize(BigDecimal pizzaSize) { * Get pizzaSize * @return pizzaSize */ + @JsonProperty("pizzaSize") @Valid @Schema(name = "pizzaSize", required = false) public BigDecimal getPizzaSize() { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/PizzaSpeziale.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/PizzaSpeziale.java index 6b50ea036458..29b287cdd0ed 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/PizzaSpeziale.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/PizzaSpeziale.java @@ -27,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class PizzaSpeziale extends Pizza { - @JsonProperty("toppings") private String toppings; public PizzaSpeziale toppings(String toppings) { @@ -39,6 +38,7 @@ public PizzaSpeziale toppings(String toppings) { * Get toppings * @return toppings */ + @JsonProperty("toppings") @Schema(name = "toppings", required = false) public String getToppings() { diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Category.java index 24264bce8b2d..59ab132dc0b5 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Category.java @@ -22,10 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Category id(Long id) { @@ -37,6 +35,7 @@ public Category id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -56,6 +55,7 @@ public Category name(String name) { * Get name * @return name */ + @JsonProperty("name") @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/ModelApiResponse.java index 18e0004c3354..5d93139025d0 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -24,13 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -42,6 +39,7 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ + @JsonProperty("code") @Schema(name = "code", required = false) public Integer getCode() { @@ -61,6 +59,7 @@ public ModelApiResponse type(String type) { * Get type * @return type */ + @JsonProperty("type") @Schema(name = "type", required = false) public String getType() { @@ -80,6 +79,7 @@ public ModelApiResponse message(String message) { * Get message * @return message */ + @JsonProperty("message") @Schema(name = "message", required = false) public String getMessage() { diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Order.java index 04bee348f98e..57e02c6a0658 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Order.java @@ -25,16 +25,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -75,10 +71,8 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -90,6 +84,7 @@ public Order id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -109,6 +104,7 @@ public Order petId(Long petId) { * Get petId * @return petId */ + @JsonProperty("petId") @Schema(name = "petId", required = false) public Long getPetId() { @@ -128,6 +124,7 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ + @JsonProperty("quantity") @Schema(name = "quantity", required = false) public Integer getQuantity() { @@ -147,6 +144,7 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ + @JsonProperty("shipDate") @Valid @Schema(name = "shipDate", required = false) public OffsetDateTime getShipDate() { @@ -166,6 +164,7 @@ public Order status(StatusEnum status) { * Order Status * @return status */ + @JsonProperty("status") @Schema(name = "status", description = "Order Status", required = false) public StatusEnum getStatus() { @@ -185,6 +184,7 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ + @JsonProperty("complete") @Schema(name = "complete", required = false) public Boolean getComplete() { diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Pet.java index f702d09a1a82..935a9242ca57 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Pet.java @@ -27,20 +27,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private List photoUrls = new ArrayList<>(); - @JsonProperty("tags") @Valid private List tags = null; @@ -81,7 +76,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; public Pet id(Long id) { @@ -93,6 +87,7 @@ public Pet id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -112,6 +107,7 @@ public Pet category(Category category) { * Get category * @return category */ + @JsonProperty("category") @Valid @Schema(name = "category", required = false) public Category getCategory() { @@ -131,6 +127,7 @@ public Pet name(String name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @Schema(name = "name", example = "doggie", required = true) public String getName() { @@ -155,6 +152,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ + @JsonProperty("photoUrls") @NotNull @Schema(name = "photoUrls", required = true) public List getPhotoUrls() { @@ -182,6 +180,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ + @JsonProperty("tags") @Valid @Schema(name = "tags", required = false) public List getTags() { @@ -201,6 +200,7 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ + @JsonProperty("status") @Schema(name = "status", description = "pet status in the store", required = false) public StatusEnum getStatus() { diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Tag.java index b4d9d7b0a13b..657e04be1aae 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Tag.java @@ -22,10 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -37,6 +35,7 @@ public Tag id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -56,6 +55,7 @@ public Tag name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/User.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/User.java index 01b7db75ca7a..c51537754aff 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/User.java @@ -22,28 +22,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -55,6 +47,7 @@ public User id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -74,6 +67,7 @@ public User username(String username) { * Get username * @return username */ + @JsonProperty("username") @Schema(name = "username", required = false) public String getUsername() { @@ -93,6 +87,7 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ + @JsonProperty("firstName") @Schema(name = "firstName", required = false) public String getFirstName() { @@ -112,6 +107,7 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ + @JsonProperty("lastName") @Schema(name = "lastName", required = false) public String getLastName() { @@ -131,6 +127,7 @@ public User email(String email) { * Get email * @return email */ + @JsonProperty("email") @Schema(name = "email", required = false) public String getEmail() { @@ -150,6 +147,7 @@ public User password(String password) { * Get password * @return password */ + @JsonProperty("password") @Schema(name = "password", required = false) public String getPassword() { @@ -169,6 +167,7 @@ public User phone(String phone) { * Get phone * @return phone */ + @JsonProperty("phone") @Schema(name = "phone", required = false) public String getPhone() { @@ -188,6 +187,7 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ + @JsonProperty("userStatus") @Schema(name = "userStatus", description = "User Status", required = false) public Integer getUserStatus() { diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Category.java index f15bed232886..8facee0b4d00 100644 --- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Category.java @@ -22,10 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Category id(Long id) { @@ -37,6 +35,7 @@ public Category id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -56,6 +55,7 @@ public Category name(String name) { * Get name * @return name */ + @JsonProperty("name") @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/ModelApiResponse.java index e74c0d15a185..dc22eb8bad56 100644 --- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -24,13 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -42,6 +39,7 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ + @JsonProperty("code") @Schema(name = "code", required = false) public Integer getCode() { @@ -61,6 +59,7 @@ public ModelApiResponse type(String type) { * Get type * @return type */ + @JsonProperty("type") @Schema(name = "type", required = false) public String getType() { @@ -80,6 +79,7 @@ public ModelApiResponse message(String message) { * Get message * @return message */ + @JsonProperty("message") @Schema(name = "message", required = false) public String getMessage() { diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Order.java index e4a1030a0733..830de6970600 100644 --- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Order.java @@ -25,16 +25,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -75,10 +71,8 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -90,6 +84,7 @@ public Order id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -109,6 +104,7 @@ public Order petId(Long petId) { * Get petId * @return petId */ + @JsonProperty("petId") @Schema(name = "petId", required = false) public Long getPetId() { @@ -128,6 +124,7 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ + @JsonProperty("quantity") @Schema(name = "quantity", required = false) public Integer getQuantity() { @@ -147,6 +144,7 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ + @JsonProperty("shipDate") @Valid @Schema(name = "shipDate", required = false) public OffsetDateTime getShipDate() { @@ -166,6 +164,7 @@ public Order status(StatusEnum status) { * Order Status * @return status */ + @JsonProperty("status") @Schema(name = "status", description = "Order Status", required = false) public StatusEnum getStatus() { @@ -185,6 +184,7 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ + @JsonProperty("complete") @Schema(name = "complete", required = false) public Boolean getComplete() { diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Pet.java index 1e00d49524a1..f63620ba65e4 100644 --- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Pet.java @@ -27,20 +27,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private List photoUrls = new ArrayList<>(); - @JsonProperty("tags") @Valid private List tags = null; @@ -81,7 +76,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; public Pet id(Long id) { @@ -93,6 +87,7 @@ public Pet id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -112,6 +107,7 @@ public Pet category(Category category) { * Get category * @return category */ + @JsonProperty("category") @Valid @Schema(name = "category", required = false) public Category getCategory() { @@ -131,6 +127,7 @@ public Pet name(String name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @Schema(name = "name", example = "doggie", required = true) public String getName() { @@ -155,6 +152,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ + @JsonProperty("photoUrls") @NotNull @Schema(name = "photoUrls", required = true) public List getPhotoUrls() { @@ -182,6 +180,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ + @JsonProperty("tags") @Valid @Schema(name = "tags", required = false) public List getTags() { @@ -201,6 +200,7 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ + @JsonProperty("status") @Schema(name = "status", description = "pet status in the store", required = false) public StatusEnum getStatus() { diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Tag.java index 97130c50c034..f7c39632be46 100644 --- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Tag.java @@ -22,10 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -37,6 +35,7 @@ public Tag id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -56,6 +55,7 @@ public Tag name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/User.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/User.java index 0a193cf96c24..c9d25cf39f6e 100644 --- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/User.java @@ -22,28 +22,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -55,6 +47,7 @@ public User id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -74,6 +67,7 @@ public User username(String username) { * Get username * @return username */ + @JsonProperty("username") @Schema(name = "username", required = false) public String getUsername() { @@ -93,6 +87,7 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ + @JsonProperty("firstName") @Schema(name = "firstName", required = false) public String getFirstName() { @@ -112,6 +107,7 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ + @JsonProperty("lastName") @Schema(name = "lastName", required = false) public String getLastName() { @@ -131,6 +127,7 @@ public User email(String email) { * Get email * @return email */ + @JsonProperty("email") @Schema(name = "email", required = false) public String getEmail() { @@ -150,6 +147,7 @@ public User password(String password) { * Get password * @return password */ + @JsonProperty("password") @Schema(name = "password", required = false) public String getPassword() { @@ -169,6 +167,7 @@ public User phone(String phone) { * Get phone * @return phone */ + @JsonProperty("phone") @Schema(name = "phone", required = false) public String getPhone() { @@ -188,6 +187,7 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ + @JsonProperty("userStatus") @Schema(name = "userStatus", description = "User Status", required = false) public Integer getUserStatus() { diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index e01b3214db27..d98f790f8e7a 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -22,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesAnyType extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesAnyType name(String name) { @@ -34,6 +33,7 @@ public AdditionalPropertiesAnyType name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index ec428cb349f4..8a4933a449cd 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesArray extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesArray name(String name) { @@ -35,6 +34,7 @@ public AdditionalPropertiesArray name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 90527250a4d5..b08b1c82a8f4 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -22,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesBoolean extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesBoolean name(String name) { @@ -34,6 +33,7 @@ public AdditionalPropertiesBoolean name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 442b3f730a8d..cb5977def8f8 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -24,45 +24,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesClass { - @JsonProperty("map_string") @Valid private Map mapString = null; - @JsonProperty("map_number") @Valid private Map mapNumber = null; - @JsonProperty("map_integer") @Valid private Map mapInteger = null; - @JsonProperty("map_boolean") @Valid private Map mapBoolean = null; - @JsonProperty("map_array_integer") @Valid private Map> mapArrayInteger = null; - @JsonProperty("map_array_anytype") @Valid private Map> mapArrayAnytype = null; - @JsonProperty("map_map_string") @Valid private Map> mapMapString = null; - @JsonProperty("map_map_anytype") @Valid private Map> mapMapAnytype = null; - @JsonProperty("anytype_1") private Object anytype1; - @JsonProperty("anytype_2") private Object anytype2; - @JsonProperty("anytype_3") private Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { @@ -82,6 +71,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt * Get mapString * @return mapString */ + @JsonProperty("map_string") @Schema(name = "map_string", required = false) public Map getMapString() { @@ -109,6 +99,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * Get mapNumber * @return mapNumber */ + @JsonProperty("map_number") @Valid @Schema(name = "map_number", required = false) public Map getMapNumber() { @@ -136,6 +127,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege * Get mapInteger * @return mapInteger */ + @JsonProperty("map_integer") @Schema(name = "map_integer", required = false) public Map getMapInteger() { @@ -163,6 +155,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea * Get mapBoolean * @return mapBoolean */ + @JsonProperty("map_boolean") @Schema(name = "map_boolean", required = false) public Map getMapBoolean() { @@ -190,6 +183,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { @@ -217,6 +211,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * Get mapArrayAnytype * @return mapArrayAnytype */ + @JsonProperty("map_array_anytype") @Valid @Schema(name = "map_array_anytype", required = false) public Map> getMapArrayAnytype() { @@ -244,6 +239,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { @@ -271,6 +267,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { @@ -290,6 +287,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) { * Get anytype1 * @return anytype1 */ + @JsonProperty("anytype_1") @Schema(name = "anytype_1", required = false) public Object getAnytype1() { @@ -309,6 +307,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) { * Get anytype2 * @return anytype2 */ + @JsonProperty("anytype_2") @Schema(name = "anytype_2", required = false) public Object getAnytype2() { @@ -328,6 +327,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) { * Get anytype3 * @return anytype3 */ + @JsonProperty("anytype_3") @Schema(name = "anytype_3", required = false) public Object getAnytype3() { diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index e71c315dbade..c5a50399760c 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -22,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesInteger extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesInteger name(String name) { @@ -34,6 +33,7 @@ public AdditionalPropertiesInteger name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 089260568478..8255dc689d86 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesNumber extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesNumber name(String name) { @@ -35,6 +34,7 @@ public AdditionalPropertiesNumber name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index d7852c1184a2..e52b6eb1f8c1 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -22,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesObject extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesObject name(String name) { @@ -34,6 +33,7 @@ public AdditionalPropertiesObject name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 78fd51e521fc..b78858e58848 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -22,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesString extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesString name(String name) { @@ -34,6 +33,7 @@ public AdditionalPropertiesString name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Animal.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Animal.java index 44e94a714b7f..307dce327887 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Animal.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Animal.java @@ -37,10 +37,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Animal { - @JsonProperty("className") private String className; - @JsonProperty("color") private String color = "red"; public Animal className(String className) { @@ -52,6 +50,7 @@ public Animal className(String className) { * Get className * @return className */ + @JsonProperty("className") @NotNull @Schema(name = "className", required = true) public String getClassName() { @@ -71,6 +70,7 @@ public Animal color(String color) { * Get color * @return color */ + @JsonProperty("color") @Schema(name = "color", required = false) public String getColor() { diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 29b207211ca7..81caee1ed53e 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfArrayOfNumberOnly { - @JsonProperty("ArrayArrayNumber") @Valid private List> arrayArrayNumber = null; @@ -44,6 +43,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * Get arrayArrayNumber * @return arrayArrayNumber */ + @JsonProperty("ArrayArrayNumber") @Valid @Schema(name = "ArrayArrayNumber", required = false) public List> getArrayArrayNumber() { diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index c355a668b998..b5dc5ebccaa7 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfNumberOnly { - @JsonProperty("ArrayNumber") @Valid private List arrayNumber = null; @@ -44,6 +43,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ + @JsonProperty("ArrayNumber") @Valid @Schema(name = "ArrayNumber", required = false) public List getArrayNumber() { diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java index c69acc510f40..cfabb4860c9f 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java @@ -23,15 +23,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayTest { - @JsonProperty("array_of_string") @Valid private List arrayOfString = null; - @JsonProperty("array_array_of_integer") @Valid private List> arrayArrayOfInteger = null; - @JsonProperty("array_array_of_model") @Valid private List> arrayArrayOfModel = null; @@ -52,6 +49,7 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) { * Get arrayOfString * @return arrayOfString */ + @JsonProperty("array_of_string") @Schema(name = "array_of_string", required = false) public List getArrayOfString() { @@ -79,6 +77,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ + @JsonProperty("array_array_of_integer") @Valid @Schema(name = "array_array_of_integer", required = false) public List> getArrayArrayOfInteger() { @@ -106,6 +105,7 @@ public ArrayTest addArrayArrayOfModelItem(List arrayArrayOfModelI * Get arrayArrayOfModel * @return arrayArrayOfModel */ + @JsonProperty("array_array_of_model") @Valid @Schema(name = "array_array_of_model", required = false) public List> getArrayArrayOfModel() { diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCat.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCat.java index 5d7449c2d100..2d318f9cd96c 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCat.java @@ -65,7 +65,6 @@ public static KindEnum fromValue(String value) { } } - @JsonProperty("kind") private KindEnum kind; public BigCat kind(KindEnum kind) { @@ -77,6 +76,7 @@ public BigCat kind(KindEnum kind) { * Get kind * @return kind */ + @JsonProperty("kind") @Schema(name = "kind", required = false) public KindEnum getKind() { diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCatAllOf.java index 622f8115d00d..eb48663fe94b 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCatAllOf.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCatAllOf.java @@ -62,7 +62,6 @@ public static KindEnum fromValue(String value) { } } - @JsonProperty("kind") private KindEnum kind; public BigCatAllOf kind(KindEnum kind) { @@ -74,6 +73,7 @@ public BigCatAllOf kind(KindEnum kind) { * Get kind * @return kind */ + @JsonProperty("kind") @Schema(name = "kind", required = false) public KindEnum getKind() { diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Capitalization.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Capitalization.java index 58d0d2889dfa..6f9473e40a2b 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Capitalization.java @@ -20,22 +20,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Capitalization { - @JsonProperty("smallCamel") private String smallCamel; - @JsonProperty("CapitalCamel") private String capitalCamel; - @JsonProperty("small_Snake") private String smallSnake; - @JsonProperty("Capital_Snake") private String capitalSnake; - @JsonProperty("SCA_ETH_Flow_Points") private String scAETHFlowPoints; - @JsonProperty("ATT_NAME") private String ATT_NAME; public Capitalization smallCamel(String smallCamel) { @@ -47,6 +41,7 @@ public Capitalization smallCamel(String smallCamel) { * Get smallCamel * @return smallCamel */ + @JsonProperty("smallCamel") @Schema(name = "smallCamel", required = false) public String getSmallCamel() { @@ -66,6 +61,7 @@ public Capitalization capitalCamel(String capitalCamel) { * Get capitalCamel * @return capitalCamel */ + @JsonProperty("CapitalCamel") @Schema(name = "CapitalCamel", required = false) public String getCapitalCamel() { @@ -85,6 +81,7 @@ public Capitalization smallSnake(String smallSnake) { * Get smallSnake * @return smallSnake */ + @JsonProperty("small_Snake") @Schema(name = "small_Snake", required = false) public String getSmallSnake() { @@ -104,6 +101,7 @@ public Capitalization capitalSnake(String capitalSnake) { * Get capitalSnake * @return capitalSnake */ + @JsonProperty("Capital_Snake") @Schema(name = "Capital_Snake", required = false) public String getCapitalSnake() { @@ -123,6 +121,7 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) { * Get scAETHFlowPoints * @return scAETHFlowPoints */ + @JsonProperty("SCA_ETH_Flow_Points") @Schema(name = "SCA_ETH_Flow_Points", required = false) public String getScAETHFlowPoints() { @@ -142,6 +141,7 @@ public Capitalization ATT_NAME(String ATT_NAME) { * Name of the pet * @return ATT_NAME */ + @JsonProperty("ATT_NAME") @Schema(name = "ATT_NAME", description = "Name of the pet ", required = false) public String getATTNAME() { diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Cat.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Cat.java index 4c82aa5413a4..ec352c818385 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Cat.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Cat.java @@ -34,7 +34,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Cat extends Animal { - @JsonProperty("declawed") private Boolean declawed; public Cat declawed(Boolean declawed) { @@ -46,6 +45,7 @@ public Cat declawed(Boolean declawed) { * Get declawed * @return declawed */ + @JsonProperty("declawed") @Schema(name = "declawed", required = false) public Boolean getDeclawed() { diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/CatAllOf.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/CatAllOf.java index a7e5bd6ef8cb..d3b61ffddf8b 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/CatAllOf.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/CatAllOf.java @@ -22,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class CatAllOf { - @JsonProperty("declawed") private Boolean declawed; public CatAllOf declawed(Boolean declawed) { @@ -34,6 +33,7 @@ public CatAllOf declawed(Boolean declawed) { * Get declawed * @return declawed */ + @JsonProperty("declawed") @Schema(name = "declawed", required = false) public Boolean getDeclawed() { diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Category.java index eadae546511a..b416593e36c2 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Category.java @@ -20,10 +20,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name = "default-name"; public Category id(Long id) { @@ -35,6 +33,7 @@ public Category id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -54,6 +53,7 @@ public Category name(String name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @Schema(name = "name", required = true) public String getName() { diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ClassModel.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ClassModel.java index 27ee22fe70e8..52214509be55 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ClassModel.java @@ -21,7 +21,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ClassModel { - @JsonProperty("_class") private String propertyClass; public ClassModel propertyClass(String propertyClass) { @@ -33,6 +32,7 @@ public ClassModel propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ + @JsonProperty("_class") @Schema(name = "_class", required = false) public String getPropertyClass() { diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Client.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Client.java index b314b7e6c40b..1524ed0a63e1 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Client.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Client.java @@ -20,7 +20,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Client { - @JsonProperty("client") private String client; public Client client(String client) { @@ -32,6 +31,7 @@ public Client client(String client) { * Get client * @return client */ + @JsonProperty("client") @Schema(name = "client", required = false) public String getClient() { diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Dog.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Dog.java index d7f0d7f3ca6f..c135023bfab0 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Dog.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Dog.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Dog extends Animal { - @JsonProperty("breed") private String breed; public Dog breed(String breed) { @@ -37,6 +36,7 @@ public Dog breed(String breed) { * Get breed * @return breed */ + @JsonProperty("breed") @Schema(name = "breed", required = false) public String getBreed() { diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/DogAllOf.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/DogAllOf.java index 9115e097a41e..7a6de8b9f3e1 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/DogAllOf.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/DogAllOf.java @@ -22,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class DogAllOf { - @JsonProperty("breed") private String breed; public DogAllOf breed(String breed) { @@ -34,6 +33,7 @@ public DogAllOf breed(String breed) { * Get breed * @return breed */ + @JsonProperty("breed") @Schema(name = "breed", required = false) public String getBreed() { diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java index f6d26222d3d4..2b00e454a455 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java @@ -58,7 +58,6 @@ public static JustSymbolEnum fromValue(String value) { } } - @JsonProperty("just_symbol") private JustSymbolEnum justSymbol; /** @@ -96,7 +95,6 @@ public static ArrayEnumEnum fromValue(String value) { } } - @JsonProperty("array_enum") @Valid private List arrayEnum = null; @@ -109,6 +107,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) { * Get justSymbol * @return justSymbol */ + @JsonProperty("just_symbol") @Schema(name = "just_symbol", required = false) public JustSymbolEnum getJustSymbol() { @@ -136,6 +135,7 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) { * Get arrayEnum * @return arrayEnum */ + @JsonProperty("array_enum") @Schema(name = "array_enum", required = false) public List getArrayEnum() { diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumTest.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumTest.java index 5029217180eb..62fdd4bb55af 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumTest.java @@ -61,7 +61,6 @@ public static EnumStringEnum fromValue(String value) { } } - @JsonProperty("enum_string") private EnumStringEnum enumString; /** @@ -101,7 +100,6 @@ public static EnumStringRequiredEnum fromValue(String value) { } } - @JsonProperty("enum_string_required") private EnumStringRequiredEnum enumStringRequired; /** @@ -139,7 +137,6 @@ public static EnumIntegerEnum fromValue(Integer value) { } } - @JsonProperty("enum_integer") private EnumIntegerEnum enumInteger; /** @@ -177,10 +174,8 @@ public static EnumNumberEnum fromValue(Double value) { } } - @JsonProperty("enum_number") private EnumNumberEnum enumNumber; - @JsonProperty("outerEnum") private OuterEnum outerEnum; public EnumTest enumString(EnumStringEnum enumString) { @@ -192,6 +187,7 @@ public EnumTest enumString(EnumStringEnum enumString) { * Get enumString * @return enumString */ + @JsonProperty("enum_string") @Schema(name = "enum_string", required = false) public EnumStringEnum getEnumString() { @@ -211,6 +207,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) { * Get enumStringRequired * @return enumStringRequired */ + @JsonProperty("enum_string_required") @NotNull @Schema(name = "enum_string_required", required = true) public EnumStringRequiredEnum getEnumStringRequired() { @@ -230,6 +227,7 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) { * Get enumInteger * @return enumInteger */ + @JsonProperty("enum_integer") @Schema(name = "enum_integer", required = false) public EnumIntegerEnum getEnumInteger() { @@ -249,6 +247,7 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) { * Get enumNumber * @return enumNumber */ + @JsonProperty("enum_number") @Schema(name = "enum_number", required = false) public EnumNumberEnum getEnumNumber() { @@ -268,6 +267,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) { * Get outerEnum * @return outerEnum */ + @JsonProperty("outerEnum") @Valid @Schema(name = "outerEnum", required = false) public OuterEnum getOuterEnum() { diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/File.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/File.java index 7aa43240699d..507dcfc9b84b 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/File.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/File.java @@ -21,7 +21,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class File { - @JsonProperty("sourceURI") private String sourceURI; public File sourceURI(String sourceURI) { @@ -33,6 +32,7 @@ public File sourceURI(String sourceURI) { * Test capitalization * @return sourceURI */ + @JsonProperty("sourceURI") @Schema(name = "sourceURI", description = "Test capitalization", required = false) public String getSourceURI() { diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java index a8dde57867d8..62e902102b46 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -23,10 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FileSchemaTestClass { - @JsonProperty("file") private File file; - @JsonProperty("files") @Valid private List files = null; @@ -39,6 +37,7 @@ public FileSchemaTestClass file(File file) { * Get file * @return file */ + @JsonProperty("file") @Valid @Schema(name = "file", required = false) public File getFile() { @@ -66,6 +65,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) { * Get files * @return files */ + @JsonProperty("files") @Valid @Schema(name = "files", required = false) public List getFiles() { 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 d1f46558af53..07b7912e924d 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 @@ -28,48 +28,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FormatTest { - @JsonProperty("integer") private Integer integer; - @JsonProperty("int32") private Integer int32; - @JsonProperty("int64") private Long int64; - @JsonProperty("number") private BigDecimal number; - @JsonProperty("float") private Float _float; - @JsonProperty("double") private Double _double; - @JsonProperty("string") private String string; - @JsonProperty("byte") private byte[] _byte; - @JsonProperty("binary") private org.springframework.core.io.Resource binary; - @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("password") private String password; - @JsonProperty("BigDecimal") private BigDecimal bigDecimal; public FormatTest integer(Integer integer) { @@ -83,6 +69,7 @@ public FormatTest integer(Integer integer) { * maximum: 100 * @return integer */ + @JsonProperty("integer") @Min(10) @Max(100) @Schema(name = "integer", required = false) public Integer getInteger() { @@ -104,6 +91,7 @@ public FormatTest int32(Integer int32) { * maximum: 200 * @return int32 */ + @JsonProperty("int32") @Min(20) @Max(200) @Schema(name = "int32", required = false) public Integer getInt32() { @@ -123,6 +111,7 @@ public FormatTest int64(Long int64) { * Get int64 * @return int64 */ + @JsonProperty("int64") @Schema(name = "int64", required = false) public Long getInt64() { @@ -144,6 +133,7 @@ public FormatTest number(BigDecimal number) { * maximum: 543.2 * @return number */ + @JsonProperty("number") @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") @Schema(name = "number", required = true) public BigDecimal getNumber() { @@ -165,6 +155,7 @@ public FormatTest _float(Float _float) { * maximum: 987.6 * @return _float */ + @JsonProperty("float") @DecimalMin("54.3") @DecimalMax("987.6") @Schema(name = "float", required = false) public Float getFloat() { @@ -186,6 +177,7 @@ public FormatTest _double(Double _double) { * maximum: 123.4 * @return _double */ + @JsonProperty("double") @DecimalMin("67.8") @DecimalMax("123.4") @Schema(name = "double", required = false) public Double getDouble() { @@ -205,6 +197,7 @@ public FormatTest string(String string) { * Get string * @return string */ + @JsonProperty("string") @Pattern(regexp = "/[a-z]/i") @Schema(name = "string", required = false) public String getString() { @@ -224,6 +217,7 @@ public FormatTest _byte(byte[] _byte) { * Get _byte * @return _byte */ + @JsonProperty("byte") @NotNull @Schema(name = "byte", required = true) public byte[] getByte() { @@ -243,6 +237,7 @@ public FormatTest binary(org.springframework.core.io.Resource binary) { * Get binary * @return binary */ + @JsonProperty("binary") @Valid @Schema(name = "binary", required = false) public org.springframework.core.io.Resource getBinary() { @@ -262,6 +257,7 @@ public FormatTest date(LocalDate date) { * Get date * @return date */ + @JsonProperty("date") @NotNull @Valid @Schema(name = "date", required = true) public LocalDate getDate() { @@ -281,6 +277,7 @@ public FormatTest dateTime(OffsetDateTime dateTime) { * Get dateTime * @return dateTime */ + @JsonProperty("dateTime") @Valid @Schema(name = "dateTime", required = false) public OffsetDateTime getDateTime() { @@ -300,6 +297,7 @@ public FormatTest uuid(UUID uuid) { * Get uuid * @return uuid */ + @JsonProperty("uuid") @Valid @Schema(name = "uuid", example = "72f98069-206d-4f12-9f12-3d1e525a8e84", required = false) public UUID getUuid() { @@ -319,6 +317,7 @@ public FormatTest password(String password) { * Get password * @return password */ + @JsonProperty("password") @NotNull @Size(min = 10, max = 64) @Schema(name = "password", required = true) public String getPassword() { @@ -338,6 +337,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) { * Get bigDecimal * @return bigDecimal */ + @JsonProperty("BigDecimal") @Valid @Schema(name = "BigDecimal", required = false) public BigDecimal getBigDecimal() { diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index afca14167ef4..29c0967eb0eb 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -22,10 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class HasOnlyReadOnly { - @JsonProperty("bar") private String bar; - @JsonProperty("foo") private String foo; public HasOnlyReadOnly bar(String bar) { @@ -37,6 +35,7 @@ public HasOnlyReadOnly bar(String bar) { * Get bar * @return bar */ + @JsonProperty("bar") @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, required = false) public String getBar() { @@ -56,6 +55,7 @@ public HasOnlyReadOnly foo(String foo) { * Get foo * @return foo */ + @JsonProperty("foo") @Schema(name = "foo", accessMode = Schema.AccessMode.READ_ONLY, required = false) public String getFoo() { diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MapTest.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MapTest.java index da65e5c4ef2b..f3680e8cebb4 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MapTest.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MapTest { - @JsonProperty("map_map_of_string") @Valid private Map> mapMapOfString = null; @@ -62,15 +61,12 @@ public static InnerEnum fromValue(String value) { } } - @JsonProperty("map_of_enum_string") @Valid private Map mapOfEnumString = null; - @JsonProperty("direct_map") @Valid private Map directMap = null; - @JsonProperty("indirect_map") @Valid private Map indirectMap = null; @@ -91,6 +87,7 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapMapOfString * @return mapMapOfString */ + @JsonProperty("map_map_of_string") @Valid @Schema(name = "map_map_of_string", required = false) public Map> getMapMapOfString() { @@ -118,6 +115,7 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) * Get mapOfEnumString * @return mapOfEnumString */ + @JsonProperty("map_of_enum_string") @Schema(name = "map_of_enum_string", required = false) public Map getMapOfEnumString() { @@ -145,6 +143,7 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) { * Get directMap * @return directMap */ + @JsonProperty("direct_map") @Schema(name = "direct_map", required = false) public Map getDirectMap() { @@ -172,6 +171,7 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) { * Get indirectMap * @return indirectMap */ + @JsonProperty("indirect_map") @Schema(name = "indirect_map", required = false) public Map getIndirectMap() { diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index d4b37f52b6ca..36d6aca6aaba 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -26,14 +26,11 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("map") @Valid private Map map = null; @@ -46,6 +43,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { * Get uuid * @return uuid */ + @JsonProperty("uuid") @Valid @Schema(name = "uuid", required = false) public UUID getUuid() { @@ -65,6 +63,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT * Get dateTime * @return dateTime */ + @JsonProperty("dateTime") @Valid @Schema(name = "dateTime", required = false) public OffsetDateTime getDateTime() { @@ -92,6 +91,7 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * Get map * @return map */ + @JsonProperty("map") @Valid @Schema(name = "map", required = false) public Map getMap() { diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Model200Response.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Model200Response.java index cab3e70b2287..36cfbfa76fb5 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Model200Response.java @@ -23,10 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Model200Response { - @JsonProperty("name") private Integer name; - @JsonProperty("class") private String propertyClass; public Model200Response name(Integer name) { @@ -38,6 +36,7 @@ public Model200Response name(Integer name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public Integer getName() { @@ -57,6 +56,7 @@ public Model200Response propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ + @JsonProperty("class") @Schema(name = "class", required = false) public String getPropertyClass() { diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelApiResponse.java index c9f3676db045..0d863472f3ad 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -22,13 +22,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -40,6 +37,7 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ + @JsonProperty("code") @Schema(name = "code", required = false) public Integer getCode() { @@ -59,6 +57,7 @@ public ModelApiResponse type(String type) { * Get type * @return type */ + @JsonProperty("type") @Schema(name = "type", required = false) public String getType() { @@ -78,6 +77,7 @@ public ModelApiResponse message(String message) { * Get message * @return message */ + @JsonProperty("message") @Schema(name = "message", required = false) public String getMessage() { diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelList.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelList.java index 752a252ea435..17034472a60f 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelList.java @@ -22,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelList { - @JsonProperty("123-list") private String _123list; public ModelList _123list(String _123list) { @@ -34,6 +33,7 @@ public ModelList _123list(String _123list) { * Get _123list * @return _123list */ + @JsonProperty("123-list") @Schema(name = "123-list", required = false) public String get123list() { diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelReturn.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelReturn.java index 83d5c50471b0..d42fb0322d6c 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelReturn.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelReturn { - @JsonProperty("return") private Integer _return; public ModelReturn _return(Integer _return) { @@ -35,6 +34,7 @@ public ModelReturn _return(Integer _return) { * Get _return * @return _return */ + @JsonProperty("return") @Schema(name = "return", required = false) public Integer getReturn() { diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Name.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Name.java index b056fee672b7..4d36775c9ab3 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Name.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Name.java @@ -21,16 +21,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Name { - @JsonProperty("name") private Integer name; - @JsonProperty("snake_case") private Integer snakeCase; - @JsonProperty("property") private String property; - @JsonProperty("123Number") private Integer _123number; public Name name(Integer name) { @@ -42,6 +38,7 @@ public Name name(Integer name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @Schema(name = "name", required = true) public Integer getName() { @@ -61,6 +58,7 @@ public Name snakeCase(Integer snakeCase) { * Get snakeCase * @return snakeCase */ + @JsonProperty("snake_case") @Schema(name = "snake_case", accessMode = Schema.AccessMode.READ_ONLY, required = false) public Integer getSnakeCase() { @@ -80,6 +78,7 @@ public Name property(String property) { * Get property * @return property */ + @JsonProperty("property") @Schema(name = "property", required = false) public String getProperty() { @@ -99,6 +98,7 @@ public Name _123number(Integer _123number) { * Get _123number * @return _123number */ + @JsonProperty("123Number") @Schema(name = "123Number", accessMode = Schema.AccessMode.READ_ONLY, required = false) public Integer get123number() { diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/NumberOnly.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/NumberOnly.java index dd76d23b712a..c9987ac34849 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/NumberOnly.java @@ -21,7 +21,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class NumberOnly { - @JsonProperty("JustNumber") private BigDecimal justNumber; public NumberOnly justNumber(BigDecimal justNumber) { @@ -33,6 +32,7 @@ public NumberOnly justNumber(BigDecimal justNumber) { * Get justNumber * @return justNumber */ + @JsonProperty("JustNumber") @Valid @Schema(name = "JustNumber", required = false) public BigDecimal getJustNumber() { diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Order.java index 9dde75062926..7f8c7d7dbd68 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Order.java @@ -23,16 +23,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -73,10 +69,8 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -88,6 +82,7 @@ public Order id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -107,6 +102,7 @@ public Order petId(Long petId) { * Get petId * @return petId */ + @JsonProperty("petId") @Schema(name = "petId", required = false) public Long getPetId() { @@ -126,6 +122,7 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ + @JsonProperty("quantity") @Schema(name = "quantity", required = false) public Integer getQuantity() { @@ -145,6 +142,7 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ + @JsonProperty("shipDate") @Valid @Schema(name = "shipDate", required = false) public OffsetDateTime getShipDate() { @@ -164,6 +162,7 @@ public Order status(StatusEnum status) { * Order Status * @return status */ + @JsonProperty("status") @Schema(name = "status", description = "Order Status", required = false) public StatusEnum getStatus() { @@ -183,6 +182,7 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ + @JsonProperty("complete") @Schema(name = "complete", required = false) public Boolean getComplete() { diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/OuterComposite.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/OuterComposite.java index ee285c36534f..69e20faba44c 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/OuterComposite.java @@ -21,13 +21,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class OuterComposite { - @JsonProperty("my_number") private BigDecimal myNumber; - @JsonProperty("my_string") private String myString; - @JsonProperty("my_boolean") private Boolean myBoolean; public OuterComposite myNumber(BigDecimal myNumber) { @@ -39,6 +36,7 @@ public OuterComposite myNumber(BigDecimal myNumber) { * Get myNumber * @return myNumber */ + @JsonProperty("my_number") @Valid @Schema(name = "my_number", required = false) public BigDecimal getMyNumber() { @@ -58,6 +56,7 @@ public OuterComposite myString(String myString) { * Get myString * @return myString */ + @JsonProperty("my_string") @Schema(name = "my_string", required = false) public String getMyString() { @@ -77,6 +76,7 @@ public OuterComposite myBoolean(Boolean myBoolean) { * Get myBoolean * @return myBoolean */ + @JsonProperty("my_boolean") @Schema(name = "my_boolean", required = false) public Boolean getMyBoolean() { diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java index f727b1fd13c2..d5cd247f52c4 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java @@ -28,20 +28,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private Set photoUrls = new LinkedHashSet<>(); - @JsonProperty("tags") @Valid private List tags = null; @@ -82,7 +77,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; public Pet id(Long id) { @@ -94,6 +88,7 @@ public Pet id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -113,6 +108,7 @@ public Pet category(Category category) { * Get category * @return category */ + @JsonProperty("category") @Valid @Schema(name = "category", required = false) public Category getCategory() { @@ -132,6 +128,7 @@ public Pet name(String name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @Schema(name = "name", example = "doggie", required = true) public String getName() { @@ -159,6 +156,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ + @JsonProperty("photoUrls") @NotNull @Schema(name = "photoUrls", required = true) public Set getPhotoUrls() { @@ -187,6 +185,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ + @JsonProperty("tags") @Valid @Schema(name = "tags", required = false) public List getTags() { @@ -206,6 +205,7 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ + @JsonProperty("status") @Schema(name = "status", description = "pet status in the store", required = false) public StatusEnum getStatus() { diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ReadOnlyFirst.java index 8a406167b2db..2c3728d1a0dc 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -20,10 +20,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ReadOnlyFirst { - @JsonProperty("bar") private String bar; - @JsonProperty("baz") private String baz; public ReadOnlyFirst bar(String bar) { @@ -35,6 +33,7 @@ public ReadOnlyFirst bar(String bar) { * Get bar * @return bar */ + @JsonProperty("bar") @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, required = false) public String getBar() { @@ -54,6 +53,7 @@ public ReadOnlyFirst baz(String baz) { * Get baz * @return baz */ + @JsonProperty("baz") @Schema(name = "baz", required = false) public String getBaz() { diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/SpecialModelName.java index b90088c84169..d5e02b2f517d 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/SpecialModelName.java @@ -22,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class SpecialModelName { - @JsonProperty("$special[property.name]") private Long $specialPropertyName; public SpecialModelName $specialPropertyName(Long $specialPropertyName) { @@ -34,6 +33,7 @@ public class SpecialModelName { * Get $specialPropertyName * @return $specialPropertyName */ + @JsonProperty("$special[property.name]") @Schema(name = "$special[property.name]", required = false) public Long get$SpecialPropertyName() { diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Tag.java index 8d89066ef81d..c832495c2c60 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Tag.java @@ -20,10 +20,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -35,6 +33,7 @@ public Tag id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -54,6 +53,7 @@ public Tag name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java index aa063c93117a..05bec742f24c 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -23,19 +23,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderDefault { - @JsonProperty("string_item") private String stringItem = "what"; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem = true; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -48,6 +43,7 @@ public TypeHolderDefault stringItem(String stringItem) { * Get stringItem * @return stringItem */ + @JsonProperty("string_item") @NotNull @Schema(name = "string_item", required = true) public String getStringItem() { @@ -67,6 +63,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ + @JsonProperty("number_item") @NotNull @Valid @Schema(name = "number_item", required = true) public BigDecimal getNumberItem() { @@ -86,6 +83,7 @@ public TypeHolderDefault integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ + @JsonProperty("integer_item") @NotNull @Schema(name = "integer_item", required = true) public Integer getIntegerItem() { @@ -105,6 +103,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ + @JsonProperty("bool_item") @NotNull @Schema(name = "bool_item", required = true) public Boolean getBoolItem() { @@ -132,6 +131,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ + @JsonProperty("array_item") @NotNull @Schema(name = "array_item", required = true) public List getArrayItem() { diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java index eb2fb13585ba..1e3ddab16959 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -23,22 +23,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderExample { - @JsonProperty("string_item") private String stringItem; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("float_item") private Float floatItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -51,6 +45,7 @@ public TypeHolderExample stringItem(String stringItem) { * Get stringItem * @return stringItem */ + @JsonProperty("string_item") @NotNull @Schema(name = "string_item", example = "what", required = true) public String getStringItem() { @@ -70,6 +65,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ + @JsonProperty("number_item") @NotNull @Valid @Schema(name = "number_item", example = "1.234", required = true) public BigDecimal getNumberItem() { @@ -89,6 +85,7 @@ public TypeHolderExample floatItem(Float floatItem) { * Get floatItem * @return floatItem */ + @JsonProperty("float_item") @NotNull @Schema(name = "float_item", example = "1.234", required = true) public Float getFloatItem() { @@ -108,6 +105,7 @@ public TypeHolderExample integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ + @JsonProperty("integer_item") @NotNull @Schema(name = "integer_item", example = "-2", required = true) public Integer getIntegerItem() { @@ -127,6 +125,7 @@ public TypeHolderExample boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ + @JsonProperty("bool_item") @NotNull @Schema(name = "bool_item", example = "true", required = true) public Boolean getBoolItem() { @@ -154,6 +153,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ + @JsonProperty("array_item") @NotNull @Schema(name = "array_item", example = "[0, 1, 2, 3]", required = true) public List getArrayItem() { diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/User.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/User.java index 05af7907f063..351085109af2 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/User.java @@ -20,28 +20,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -53,6 +45,7 @@ public User id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -72,6 +65,7 @@ public User username(String username) { * Get username * @return username */ + @JsonProperty("username") @Schema(name = "username", required = false) public String getUsername() { @@ -91,6 +85,7 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ + @JsonProperty("firstName") @Schema(name = "firstName", required = false) public String getFirstName() { @@ -110,6 +105,7 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ + @JsonProperty("lastName") @Schema(name = "lastName", required = false) public String getLastName() { @@ -129,6 +125,7 @@ public User email(String email) { * Get email * @return email */ + @JsonProperty("email") @Schema(name = "email", required = false) public String getEmail() { @@ -148,6 +145,7 @@ public User password(String password) { * Get password * @return password */ + @JsonProperty("password") @Schema(name = "password", required = false) public String getPassword() { @@ -167,6 +165,7 @@ public User phone(String phone) { * Get phone * @return phone */ + @JsonProperty("phone") @Schema(name = "phone", required = false) public String getPhone() { @@ -186,6 +185,7 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ + @JsonProperty("userStatus") @Schema(name = "userStatus", description = "User Status", required = false) public Integer getUserStatus() { diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java index 7f777c900644..91357ebdefb5 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java @@ -23,99 +23,70 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class XmlItem { - @JsonProperty("attribute_string") private String attributeString; - @JsonProperty("attribute_number") private BigDecimal attributeNumber; - @JsonProperty("attribute_integer") private Integer attributeInteger; - @JsonProperty("attribute_boolean") private Boolean attributeBoolean; - @JsonProperty("wrapped_array") @Valid private List wrappedArray = null; - @JsonProperty("name_string") private String nameString; - @JsonProperty("name_number") private BigDecimal nameNumber; - @JsonProperty("name_integer") private Integer nameInteger; - @JsonProperty("name_boolean") private Boolean nameBoolean; - @JsonProperty("name_array") @Valid private List nameArray = null; - @JsonProperty("name_wrapped_array") @Valid private List nameWrappedArray = null; - @JsonProperty("prefix_string") private String prefixString; - @JsonProperty("prefix_number") private BigDecimal prefixNumber; - @JsonProperty("prefix_integer") private Integer prefixInteger; - @JsonProperty("prefix_boolean") private Boolean prefixBoolean; - @JsonProperty("prefix_array") @Valid private List prefixArray = null; - @JsonProperty("prefix_wrapped_array") @Valid private List prefixWrappedArray = null; - @JsonProperty("namespace_string") private String namespaceString; - @JsonProperty("namespace_number") private BigDecimal namespaceNumber; - @JsonProperty("namespace_integer") private Integer namespaceInteger; - @JsonProperty("namespace_boolean") private Boolean namespaceBoolean; - @JsonProperty("namespace_array") @Valid private List namespaceArray = null; - @JsonProperty("namespace_wrapped_array") @Valid private List namespaceWrappedArray = null; - @JsonProperty("prefix_ns_string") private String prefixNsString; - @JsonProperty("prefix_ns_number") private BigDecimal prefixNsNumber; - @JsonProperty("prefix_ns_integer") private Integer prefixNsInteger; - @JsonProperty("prefix_ns_boolean") private Boolean prefixNsBoolean; - @JsonProperty("prefix_ns_array") @Valid private List prefixNsArray = null; - @JsonProperty("prefix_ns_wrapped_array") @Valid private List prefixNsWrappedArray = null; @@ -128,6 +99,7 @@ public XmlItem attributeString(String attributeString) { * Get attributeString * @return attributeString */ + @JsonProperty("attribute_string") @Schema(name = "attribute_string", example = "string", required = false) public String getAttributeString() { @@ -147,6 +119,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) { * Get attributeNumber * @return attributeNumber */ + @JsonProperty("attribute_number") @Valid @Schema(name = "attribute_number", example = "1.234", required = false) public BigDecimal getAttributeNumber() { @@ -166,6 +139,7 @@ public XmlItem attributeInteger(Integer attributeInteger) { * Get attributeInteger * @return attributeInteger */ + @JsonProperty("attribute_integer") @Schema(name = "attribute_integer", example = "-2", required = false) public Integer getAttributeInteger() { @@ -185,6 +159,7 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) { * Get attributeBoolean * @return attributeBoolean */ + @JsonProperty("attribute_boolean") @Schema(name = "attribute_boolean", example = "true", required = false) public Boolean getAttributeBoolean() { @@ -212,6 +187,7 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) { * Get wrappedArray * @return wrappedArray */ + @JsonProperty("wrapped_array") @Schema(name = "wrapped_array", required = false) public List getWrappedArray() { @@ -231,6 +207,7 @@ public XmlItem nameString(String nameString) { * Get nameString * @return nameString */ + @JsonProperty("name_string") @Schema(name = "name_string", example = "string", required = false) public String getNameString() { @@ -250,6 +227,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) { * Get nameNumber * @return nameNumber */ + @JsonProperty("name_number") @Valid @Schema(name = "name_number", example = "1.234", required = false) public BigDecimal getNameNumber() { @@ -269,6 +247,7 @@ public XmlItem nameInteger(Integer nameInteger) { * Get nameInteger * @return nameInteger */ + @JsonProperty("name_integer") @Schema(name = "name_integer", example = "-2", required = false) public Integer getNameInteger() { @@ -288,6 +267,7 @@ public XmlItem nameBoolean(Boolean nameBoolean) { * Get nameBoolean * @return nameBoolean */ + @JsonProperty("name_boolean") @Schema(name = "name_boolean", example = "true", required = false) public Boolean getNameBoolean() { @@ -315,6 +295,7 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) { * Get nameArray * @return nameArray */ + @JsonProperty("name_array") @Schema(name = "name_array", required = false) public List getNameArray() { @@ -342,6 +323,7 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) { * Get nameWrappedArray * @return nameWrappedArray */ + @JsonProperty("name_wrapped_array") @Schema(name = "name_wrapped_array", required = false) public List getNameWrappedArray() { @@ -361,6 +343,7 @@ public XmlItem prefixString(String prefixString) { * Get prefixString * @return prefixString */ + @JsonProperty("prefix_string") @Schema(name = "prefix_string", example = "string", required = false) public String getPrefixString() { @@ -380,6 +363,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) { * Get prefixNumber * @return prefixNumber */ + @JsonProperty("prefix_number") @Valid @Schema(name = "prefix_number", example = "1.234", required = false) public BigDecimal getPrefixNumber() { @@ -399,6 +383,7 @@ public XmlItem prefixInteger(Integer prefixInteger) { * Get prefixInteger * @return prefixInteger */ + @JsonProperty("prefix_integer") @Schema(name = "prefix_integer", example = "-2", required = false) public Integer getPrefixInteger() { @@ -418,6 +403,7 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) { * Get prefixBoolean * @return prefixBoolean */ + @JsonProperty("prefix_boolean") @Schema(name = "prefix_boolean", example = "true", required = false) public Boolean getPrefixBoolean() { @@ -445,6 +431,7 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) { * Get prefixArray * @return prefixArray */ + @JsonProperty("prefix_array") @Schema(name = "prefix_array", required = false) public List getPrefixArray() { @@ -472,6 +459,7 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) { * Get prefixWrappedArray * @return prefixWrappedArray */ + @JsonProperty("prefix_wrapped_array") @Schema(name = "prefix_wrapped_array", required = false) public List getPrefixWrappedArray() { @@ -491,6 +479,7 @@ public XmlItem namespaceString(String namespaceString) { * Get namespaceString * @return namespaceString */ + @JsonProperty("namespace_string") @Schema(name = "namespace_string", example = "string", required = false) public String getNamespaceString() { @@ -510,6 +499,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) { * Get namespaceNumber * @return namespaceNumber */ + @JsonProperty("namespace_number") @Valid @Schema(name = "namespace_number", example = "1.234", required = false) public BigDecimal getNamespaceNumber() { @@ -529,6 +519,7 @@ public XmlItem namespaceInteger(Integer namespaceInteger) { * Get namespaceInteger * @return namespaceInteger */ + @JsonProperty("namespace_integer") @Schema(name = "namespace_integer", example = "-2", required = false) public Integer getNamespaceInteger() { @@ -548,6 +539,7 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) { * Get namespaceBoolean * @return namespaceBoolean */ + @JsonProperty("namespace_boolean") @Schema(name = "namespace_boolean", example = "true", required = false) public Boolean getNamespaceBoolean() { @@ -575,6 +567,7 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) { * Get namespaceArray * @return namespaceArray */ + @JsonProperty("namespace_array") @Schema(name = "namespace_array", required = false) public List getNamespaceArray() { @@ -602,6 +595,7 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) { * Get namespaceWrappedArray * @return namespaceWrappedArray */ + @JsonProperty("namespace_wrapped_array") @Schema(name = "namespace_wrapped_array", required = false) public List getNamespaceWrappedArray() { @@ -621,6 +615,7 @@ public XmlItem prefixNsString(String prefixNsString) { * Get prefixNsString * @return prefixNsString */ + @JsonProperty("prefix_ns_string") @Schema(name = "prefix_ns_string", example = "string", required = false) public String getPrefixNsString() { @@ -640,6 +635,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) { * Get prefixNsNumber * @return prefixNsNumber */ + @JsonProperty("prefix_ns_number") @Valid @Schema(name = "prefix_ns_number", example = "1.234", required = false) public BigDecimal getPrefixNsNumber() { @@ -659,6 +655,7 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) { * Get prefixNsInteger * @return prefixNsInteger */ + @JsonProperty("prefix_ns_integer") @Schema(name = "prefix_ns_integer", example = "-2", required = false) public Integer getPrefixNsInteger() { @@ -678,6 +675,7 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) { * Get prefixNsBoolean * @return prefixNsBoolean */ + @JsonProperty("prefix_ns_boolean") @Schema(name = "prefix_ns_boolean", example = "true", required = false) public Boolean getPrefixNsBoolean() { @@ -705,6 +703,7 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) { * Get prefixNsArray * @return prefixNsArray */ + @JsonProperty("prefix_ns_array") @Schema(name = "prefix_ns_array", required = false) public List getPrefixNsArray() { @@ -732,6 +731,7 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) { * Get prefixNsWrappedArray * @return prefixNsWrappedArray */ + @JsonProperty("prefix_ns_wrapped_array") @Schema(name = "prefix_ns_wrapped_array", required = false) public List getPrefixNsWrappedArray() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 0d95d7f91b29..e45a52c7a8af 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesAnyType extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesAnyType name(String name) { @@ -35,6 +34,7 @@ public AdditionalPropertiesAnyType name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 0a45cd0d195e..ff8e902ab955 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesArray extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesArray name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesArray name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index c53b449a5070..c21068182c49 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesBoolean extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesBoolean name(String name) { @@ -35,6 +34,7 @@ public AdditionalPropertiesBoolean name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index ae060d44dc4d..c43432f178b1 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -25,45 +25,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesClass { - @JsonProperty("map_string") @Valid private Map mapString = null; - @JsonProperty("map_number") @Valid private Map mapNumber = null; - @JsonProperty("map_integer") @Valid private Map mapInteger = null; - @JsonProperty("map_boolean") @Valid private Map mapBoolean = null; - @JsonProperty("map_array_integer") @Valid private Map> mapArrayInteger = null; - @JsonProperty("map_array_anytype") @Valid private Map> mapArrayAnytype = null; - @JsonProperty("map_map_string") @Valid private Map> mapMapString = null; - @JsonProperty("map_map_anytype") @Valid private Map> mapMapAnytype = null; - @JsonProperty("anytype_1") private Object anytype1; - @JsonProperty("anytype_2") private Object anytype2; - @JsonProperty("anytype_3") private Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { @@ -83,6 +72,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt * Get mapString * @return mapString */ + @JsonProperty("map_string") @Schema(name = "map_string", required = false) public Map getMapString() { @@ -110,6 +100,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * Get mapNumber * @return mapNumber */ + @JsonProperty("map_number") @Valid @Schema(name = "map_number", required = false) public Map getMapNumber() { @@ -137,6 +128,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege * Get mapInteger * @return mapInteger */ + @JsonProperty("map_integer") @Schema(name = "map_integer", required = false) public Map getMapInteger() { @@ -164,6 +156,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea * Get mapBoolean * @return mapBoolean */ + @JsonProperty("map_boolean") @Schema(name = "map_boolean", required = false) public Map getMapBoolean() { @@ -191,6 +184,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { @@ -218,6 +212,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * Get mapArrayAnytype * @return mapArrayAnytype */ + @JsonProperty("map_array_anytype") @Valid @Schema(name = "map_array_anytype", required = false) public Map> getMapArrayAnytype() { @@ -245,6 +240,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { @@ -272,6 +268,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { @@ -291,6 +288,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) { * Get anytype1 * @return anytype1 */ + @JsonProperty("anytype_1") @Schema(name = "anytype_1", required = false) public Object getAnytype1() { @@ -310,6 +308,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) { * Get anytype2 * @return anytype2 */ + @JsonProperty("anytype_2") @Schema(name = "anytype_2", required = false) public Object getAnytype2() { @@ -329,6 +328,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) { * Get anytype3 * @return anytype3 */ + @JsonProperty("anytype_3") @Schema(name = "anytype_3", required = false) public Object getAnytype3() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 87a903f3e7f2..d4fe82193e30 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesInteger extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesInteger name(String name) { @@ -35,6 +34,7 @@ public AdditionalPropertiesInteger name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 873d1c9c229e..11f9dda21f3f 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesNumber extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesNumber name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesNumber name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 97827d22d963..ce4f9f1ff862 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesObject extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesObject name(String name) { @@ -35,6 +34,7 @@ public AdditionalPropertiesObject name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 53967d619036..2669a2e08d51 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesString extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesString name(String name) { @@ -35,6 +34,7 @@ public AdditionalPropertiesString name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java index 8b3225fee193..50eb6fe3c62b 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java @@ -38,10 +38,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Animal { - @JsonProperty("className") private String className; - @JsonProperty("color") private String color = "red"; public Animal className(String className) { @@ -53,6 +51,7 @@ public Animal className(String className) { * Get className * @return className */ + @JsonProperty("className") @NotNull @Schema(name = "className", required = true) public String getClassName() { @@ -72,6 +71,7 @@ public Animal color(String color) { * Get color * @return color */ + @JsonProperty("color") @Schema(name = "color", required = false) public String getColor() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 4fc6a6447db5..99f5ef3aa439 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfArrayOfNumberOnly { - @JsonProperty("ArrayArrayNumber") @Valid private List> arrayArrayNumber = null; @@ -45,6 +44,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * Get arrayArrayNumber * @return arrayArrayNumber */ + @JsonProperty("ArrayArrayNumber") @Valid @Schema(name = "ArrayArrayNumber", required = false) public List> getArrayArrayNumber() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index da4dc071cfdf..563d0dc0f933 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfNumberOnly { - @JsonProperty("ArrayNumber") @Valid private List arrayNumber = null; @@ -45,6 +44,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ + @JsonProperty("ArrayNumber") @Valid @Schema(name = "ArrayNumber", required = false) public List getArrayNumber() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java index 03052a955e3b..839cf3ac40ab 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java @@ -24,15 +24,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayTest { - @JsonProperty("array_of_string") @Valid private List arrayOfString = null; - @JsonProperty("array_array_of_integer") @Valid private List> arrayArrayOfInteger = null; - @JsonProperty("array_array_of_model") @Valid private List> arrayArrayOfModel = null; @@ -53,6 +50,7 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) { * Get arrayOfString * @return arrayOfString */ + @JsonProperty("array_of_string") @Schema(name = "array_of_string", required = false) public List getArrayOfString() { @@ -80,6 +78,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ + @JsonProperty("array_array_of_integer") @Valid @Schema(name = "array_array_of_integer", required = false) public List> getArrayArrayOfInteger() { @@ -107,6 +106,7 @@ public ArrayTest addArrayArrayOfModelItem(List arrayArrayOfModelI * Get arrayArrayOfModel * @return arrayArrayOfModel */ + @JsonProperty("array_array_of_model") @Valid @Schema(name = "array_array_of_model", required = false) public List> getArrayArrayOfModel() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java index 344818cd160a..e0b22753e9e8 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java @@ -66,7 +66,6 @@ public static KindEnum fromValue(String value) { } } - @JsonProperty("kind") private KindEnum kind; public BigCat kind(KindEnum kind) { @@ -78,6 +77,7 @@ public BigCat kind(KindEnum kind) { * Get kind * @return kind */ + @JsonProperty("kind") @Schema(name = "kind", required = false) public KindEnum getKind() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCatAllOf.java index 96ddb1f49cd8..3b0788b0b304 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCatAllOf.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCatAllOf.java @@ -63,7 +63,6 @@ public static KindEnum fromValue(String value) { } } - @JsonProperty("kind") private KindEnum kind; public BigCatAllOf kind(KindEnum kind) { @@ -75,6 +74,7 @@ public BigCatAllOf kind(KindEnum kind) { * Get kind * @return kind */ + @JsonProperty("kind") @Schema(name = "kind", required = false) public KindEnum getKind() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Capitalization.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Capitalization.java index e7f3b66e4814..7270c14a949f 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Capitalization.java @@ -21,22 +21,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Capitalization { - @JsonProperty("smallCamel") private String smallCamel; - @JsonProperty("CapitalCamel") private String capitalCamel; - @JsonProperty("small_Snake") private String smallSnake; - @JsonProperty("Capital_Snake") private String capitalSnake; - @JsonProperty("SCA_ETH_Flow_Points") private String scAETHFlowPoints; - @JsonProperty("ATT_NAME") private String ATT_NAME; public Capitalization smallCamel(String smallCamel) { @@ -48,6 +42,7 @@ public Capitalization smallCamel(String smallCamel) { * Get smallCamel * @return smallCamel */ + @JsonProperty("smallCamel") @Schema(name = "smallCamel", required = false) public String getSmallCamel() { @@ -67,6 +62,7 @@ public Capitalization capitalCamel(String capitalCamel) { * Get capitalCamel * @return capitalCamel */ + @JsonProperty("CapitalCamel") @Schema(name = "CapitalCamel", required = false) public String getCapitalCamel() { @@ -86,6 +82,7 @@ public Capitalization smallSnake(String smallSnake) { * Get smallSnake * @return smallSnake */ + @JsonProperty("small_Snake") @Schema(name = "small_Snake", required = false) public String getSmallSnake() { @@ -105,6 +102,7 @@ public Capitalization capitalSnake(String capitalSnake) { * Get capitalSnake * @return capitalSnake */ + @JsonProperty("Capital_Snake") @Schema(name = "Capital_Snake", required = false) public String getCapitalSnake() { @@ -124,6 +122,7 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) { * Get scAETHFlowPoints * @return scAETHFlowPoints */ + @JsonProperty("SCA_ETH_Flow_Points") @Schema(name = "SCA_ETH_Flow_Points", required = false) public String getScAETHFlowPoints() { @@ -143,6 +142,7 @@ public Capitalization ATT_NAME(String ATT_NAME) { * Name of the pet * @return ATT_NAME */ + @JsonProperty("ATT_NAME") @Schema(name = "ATT_NAME", description = "Name of the pet ", required = false) public String getATTNAME() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java index afce161498ed..d1bb205b11b3 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java @@ -35,7 +35,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Cat extends Animal { - @JsonProperty("declawed") private Boolean declawed; public Cat declawed(Boolean declawed) { @@ -47,6 +46,7 @@ public Cat declawed(Boolean declawed) { * Get declawed * @return declawed */ + @JsonProperty("declawed") @Schema(name = "declawed", required = false) public Boolean getDeclawed() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/CatAllOf.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/CatAllOf.java index bc83998fc4d5..b7a7ed5def6a 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/CatAllOf.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/CatAllOf.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class CatAllOf { - @JsonProperty("declawed") private Boolean declawed; public CatAllOf declawed(Boolean declawed) { @@ -35,6 +34,7 @@ public CatAllOf declawed(Boolean declawed) { * Get declawed * @return declawed */ + @JsonProperty("declawed") @Schema(name = "declawed", required = false) public Boolean getDeclawed() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java index 586658c922c5..9b1acc5a5c07 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java @@ -21,10 +21,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name = "default-name"; public Category id(Long id) { @@ -36,6 +34,7 @@ public Category id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -55,6 +54,7 @@ public Category name(String name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @Schema(name = "name", required = true) public String getName() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ClassModel.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ClassModel.java index d3d25d6df8cd..20f5e2de16dd 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ClassModel.java @@ -22,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ClassModel { - @JsonProperty("_class") private String propertyClass; public ClassModel propertyClass(String propertyClass) { @@ -34,6 +33,7 @@ public ClassModel propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ + @JsonProperty("_class") @Schema(name = "_class", required = false) public String getPropertyClass() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Client.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Client.java index 7ed5fbaae188..11ed7ead459c 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Client.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Client.java @@ -21,7 +21,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Client { - @JsonProperty("client") private String client; public Client client(String client) { @@ -33,6 +32,7 @@ public Client client(String client) { * Get client * @return client */ + @JsonProperty("client") @Schema(name = "client", required = false) public String getClient() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Dog.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Dog.java index 738b9fbffc6c..b0f901978716 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Dog.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Dog.java @@ -26,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Dog extends Animal { - @JsonProperty("breed") private String breed; public Dog breed(String breed) { @@ -38,6 +37,7 @@ public Dog breed(String breed) { * Get breed * @return breed */ + @JsonProperty("breed") @Schema(name = "breed", required = false) public String getBreed() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/DogAllOf.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/DogAllOf.java index fbcd7127e41b..097dc159ee65 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/DogAllOf.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/DogAllOf.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class DogAllOf { - @JsonProperty("breed") private String breed; public DogAllOf breed(String breed) { @@ -35,6 +34,7 @@ public DogAllOf breed(String breed) { * Get breed * @return breed */ + @JsonProperty("breed") @Schema(name = "breed", required = false) public String getBreed() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java index 3c18fc1189fe..cb84a65b9e1c 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java @@ -59,7 +59,6 @@ public static JustSymbolEnum fromValue(String value) { } } - @JsonProperty("just_symbol") private JustSymbolEnum justSymbol; /** @@ -97,7 +96,6 @@ public static ArrayEnumEnum fromValue(String value) { } } - @JsonProperty("array_enum") @Valid private List arrayEnum = null; @@ -110,6 +108,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) { * Get justSymbol * @return justSymbol */ + @JsonProperty("just_symbol") @Schema(name = "just_symbol", required = false) public JustSymbolEnum getJustSymbol() { @@ -137,6 +136,7 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) { * Get arrayEnum * @return arrayEnum */ + @JsonProperty("array_enum") @Schema(name = "array_enum", required = false) public List getArrayEnum() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java index dc15f99afe84..2243d0fb1b8b 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java @@ -62,7 +62,6 @@ public static EnumStringEnum fromValue(String value) { } } - @JsonProperty("enum_string") private EnumStringEnum enumString; /** @@ -102,7 +101,6 @@ public static EnumStringRequiredEnum fromValue(String value) { } } - @JsonProperty("enum_string_required") private EnumStringRequiredEnum enumStringRequired; /** @@ -140,7 +138,6 @@ public static EnumIntegerEnum fromValue(Integer value) { } } - @JsonProperty("enum_integer") private EnumIntegerEnum enumInteger; /** @@ -178,10 +175,8 @@ public static EnumNumberEnum fromValue(Double value) { } } - @JsonProperty("enum_number") private EnumNumberEnum enumNumber; - @JsonProperty("outerEnum") private OuterEnum outerEnum; public EnumTest enumString(EnumStringEnum enumString) { @@ -193,6 +188,7 @@ public EnumTest enumString(EnumStringEnum enumString) { * Get enumString * @return enumString */ + @JsonProperty("enum_string") @Schema(name = "enum_string", required = false) public EnumStringEnum getEnumString() { @@ -212,6 +208,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) { * Get enumStringRequired * @return enumStringRequired */ + @JsonProperty("enum_string_required") @NotNull @Schema(name = "enum_string_required", required = true) public EnumStringRequiredEnum getEnumStringRequired() { @@ -231,6 +228,7 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) { * Get enumInteger * @return enumInteger */ + @JsonProperty("enum_integer") @Schema(name = "enum_integer", required = false) public EnumIntegerEnum getEnumInteger() { @@ -250,6 +248,7 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) { * Get enumNumber * @return enumNumber */ + @JsonProperty("enum_number") @Schema(name = "enum_number", required = false) public EnumNumberEnum getEnumNumber() { @@ -269,6 +268,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) { * Get outerEnum * @return outerEnum */ + @JsonProperty("outerEnum") @Valid @Schema(name = "outerEnum", required = false) public OuterEnum getOuterEnum() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/File.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/File.java index d9a8ab4aa1f2..7d0f08137a62 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/File.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/File.java @@ -22,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class File { - @JsonProperty("sourceURI") private String sourceURI; public File sourceURI(String sourceURI) { @@ -34,6 +33,7 @@ public File sourceURI(String sourceURI) { * Test capitalization * @return sourceURI */ + @JsonProperty("sourceURI") @Schema(name = "sourceURI", description = "Test capitalization", required = false) public String getSourceURI() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 5794883ff564..50df4bf463a8 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -24,10 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FileSchemaTestClass { - @JsonProperty("file") private File file; - @JsonProperty("files") @Valid private List files = null; @@ -40,6 +38,7 @@ public FileSchemaTestClass file(File file) { * Get file * @return file */ + @JsonProperty("file") @Valid @Schema(name = "file", required = false) public File getFile() { @@ -67,6 +66,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) { * Get files * @return files */ + @JsonProperty("files") @Valid @Schema(name = "files", required = false) public List getFiles() { 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 c4bacc257a36..c9ae6ace8274 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 @@ -29,48 +29,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FormatTest { - @JsonProperty("integer") private Integer integer; - @JsonProperty("int32") private Integer int32; - @JsonProperty("int64") private Long int64; - @JsonProperty("number") private BigDecimal number; - @JsonProperty("float") private Float _float; - @JsonProperty("double") private Double _double; - @JsonProperty("string") private String string; - @JsonProperty("byte") private byte[] _byte; - @JsonProperty("binary") private org.springframework.core.io.Resource binary; - @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("password") private String password; - @JsonProperty("BigDecimal") private BigDecimal bigDecimal; public FormatTest integer(Integer integer) { @@ -84,6 +70,7 @@ public FormatTest integer(Integer integer) { * maximum: 100 * @return integer */ + @JsonProperty("integer") @Min(10) @Max(100) @Schema(name = "integer", required = false) public Integer getInteger() { @@ -105,6 +92,7 @@ public FormatTest int32(Integer int32) { * maximum: 200 * @return int32 */ + @JsonProperty("int32") @Min(20) @Max(200) @Schema(name = "int32", required = false) public Integer getInt32() { @@ -124,6 +112,7 @@ public FormatTest int64(Long int64) { * Get int64 * @return int64 */ + @JsonProperty("int64") @Schema(name = "int64", required = false) public Long getInt64() { @@ -145,6 +134,7 @@ public FormatTest number(BigDecimal number) { * maximum: 543.2 * @return number */ + @JsonProperty("number") @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") @Schema(name = "number", required = true) public BigDecimal getNumber() { @@ -166,6 +156,7 @@ public FormatTest _float(Float _float) { * maximum: 987.6 * @return _float */ + @JsonProperty("float") @DecimalMin("54.3") @DecimalMax("987.6") @Schema(name = "float", required = false) public Float getFloat() { @@ -187,6 +178,7 @@ public FormatTest _double(Double _double) { * maximum: 123.4 * @return _double */ + @JsonProperty("double") @DecimalMin("67.8") @DecimalMax("123.4") @Schema(name = "double", required = false) public Double getDouble() { @@ -206,6 +198,7 @@ public FormatTest string(String string) { * Get string * @return string */ + @JsonProperty("string") @Pattern(regexp = "/[a-z]/i") @Schema(name = "string", required = false) public String getString() { @@ -225,6 +218,7 @@ public FormatTest _byte(byte[] _byte) { * Get _byte * @return _byte */ + @JsonProperty("byte") @NotNull @Schema(name = "byte", required = true) public byte[] getByte() { @@ -244,6 +238,7 @@ public FormatTest binary(org.springframework.core.io.Resource binary) { * Get binary * @return binary */ + @JsonProperty("binary") @Valid @Schema(name = "binary", required = false) public org.springframework.core.io.Resource getBinary() { @@ -263,6 +258,7 @@ public FormatTest date(LocalDate date) { * Get date * @return date */ + @JsonProperty("date") @NotNull @Valid @Schema(name = "date", required = true) public LocalDate getDate() { @@ -282,6 +278,7 @@ public FormatTest dateTime(OffsetDateTime dateTime) { * Get dateTime * @return dateTime */ + @JsonProperty("dateTime") @Valid @Schema(name = "dateTime", required = false) public OffsetDateTime getDateTime() { @@ -301,6 +298,7 @@ public FormatTest uuid(UUID uuid) { * Get uuid * @return uuid */ + @JsonProperty("uuid") @Valid @Schema(name = "uuid", example = "72f98069-206d-4f12-9f12-3d1e525a8e84", required = false) public UUID getUuid() { @@ -320,6 +318,7 @@ public FormatTest password(String password) { * Get password * @return password */ + @JsonProperty("password") @NotNull @Size(min = 10, max = 64) @Schema(name = "password", required = true) public String getPassword() { @@ -339,6 +338,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) { * Get bigDecimal * @return bigDecimal */ + @JsonProperty("BigDecimal") @Valid @Schema(name = "BigDecimal", required = false) public BigDecimal getBigDecimal() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index d817048f2a75..aa8c3ee2514a 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -23,10 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class HasOnlyReadOnly { - @JsonProperty("bar") private String bar; - @JsonProperty("foo") private String foo; public HasOnlyReadOnly bar(String bar) { @@ -38,6 +36,7 @@ public HasOnlyReadOnly bar(String bar) { * Get bar * @return bar */ + @JsonProperty("bar") @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, required = false) public String getBar() { @@ -57,6 +56,7 @@ public HasOnlyReadOnly foo(String foo) { * Get foo * @return foo */ + @JsonProperty("foo") @Schema(name = "foo", accessMode = Schema.AccessMode.READ_ONLY, required = false) public String getFoo() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java index 55a10cdf8d08..594021c36d2d 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MapTest { - @JsonProperty("map_map_of_string") @Valid private Map> mapMapOfString = null; @@ -63,15 +62,12 @@ public static InnerEnum fromValue(String value) { } } - @JsonProperty("map_of_enum_string") @Valid private Map mapOfEnumString = null; - @JsonProperty("direct_map") @Valid private Map directMap = null; - @JsonProperty("indirect_map") @Valid private Map indirectMap = null; @@ -92,6 +88,7 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapMapOfString * @return mapMapOfString */ + @JsonProperty("map_map_of_string") @Valid @Schema(name = "map_map_of_string", required = false) public Map> getMapMapOfString() { @@ -119,6 +116,7 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) * Get mapOfEnumString * @return mapOfEnumString */ + @JsonProperty("map_of_enum_string") @Schema(name = "map_of_enum_string", required = false) public Map getMapOfEnumString() { @@ -146,6 +144,7 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) { * Get directMap * @return directMap */ + @JsonProperty("direct_map") @Schema(name = "direct_map", required = false) public Map getDirectMap() { @@ -173,6 +172,7 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) { * Get indirectMap * @return indirectMap */ + @JsonProperty("indirect_map") @Schema(name = "indirect_map", required = false) public Map getIndirectMap() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index d58ed97c15d2..af4644ee1fd8 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -27,14 +27,11 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("map") @Valid private Map map = null; @@ -47,6 +44,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { * Get uuid * @return uuid */ + @JsonProperty("uuid") @Valid @Schema(name = "uuid", required = false) public UUID getUuid() { @@ -66,6 +64,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT * Get dateTime * @return dateTime */ + @JsonProperty("dateTime") @Valid @Schema(name = "dateTime", required = false) public OffsetDateTime getDateTime() { @@ -93,6 +92,7 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * Get map * @return map */ + @JsonProperty("map") @Valid @Schema(name = "map", required = false) public Map getMap() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Model200Response.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Model200Response.java index 80ff3f1fc638..329840fd1cd5 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Model200Response.java @@ -24,10 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Model200Response { - @JsonProperty("name") private Integer name; - @JsonProperty("class") private String propertyClass; public Model200Response name(Integer name) { @@ -39,6 +37,7 @@ public Model200Response name(Integer name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public Integer getName() { @@ -58,6 +57,7 @@ public Model200Response propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ + @JsonProperty("class") @Schema(name = "class", required = false) public String getPropertyClass() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelApiResponse.java index ed829bcb62cd..14ea90b13917 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -23,13 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -41,6 +38,7 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ + @JsonProperty("code") @Schema(name = "code", required = false) public Integer getCode() { @@ -60,6 +58,7 @@ public ModelApiResponse type(String type) { * Get type * @return type */ + @JsonProperty("type") @Schema(name = "type", required = false) public String getType() { @@ -79,6 +78,7 @@ public ModelApiResponse message(String message) { * Get message * @return message */ + @JsonProperty("message") @Schema(name = "message", required = false) public String getMessage() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelList.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelList.java index 56e79c554452..1e0bcffc220c 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelList.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelList { - @JsonProperty("123-list") private String _123list; public ModelList _123list(String _123list) { @@ -35,6 +34,7 @@ public ModelList _123list(String _123list) { * Get _123list * @return _123list */ + @JsonProperty("123-list") @Schema(name = "123-list", required = false) public String get123list() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelReturn.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelReturn.java index d95ce3f15491..90b17a6d6850 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelReturn.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelReturn { - @JsonProperty("return") private Integer _return; public ModelReturn _return(Integer _return) { @@ -36,6 +35,7 @@ public ModelReturn _return(Integer _return) { * Get _return * @return _return */ + @JsonProperty("return") @Schema(name = "return", required = false) public Integer getReturn() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Name.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Name.java index 32cec75d981d..bcbb5aab0f79 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Name.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Name.java @@ -22,16 +22,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Name { - @JsonProperty("name") private Integer name; - @JsonProperty("snake_case") private Integer snakeCase; - @JsonProperty("property") private String property; - @JsonProperty("123Number") private Integer _123number; public Name name(Integer name) { @@ -43,6 +39,7 @@ public Name name(Integer name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @Schema(name = "name", required = true) public Integer getName() { @@ -62,6 +59,7 @@ public Name snakeCase(Integer snakeCase) { * Get snakeCase * @return snakeCase */ + @JsonProperty("snake_case") @Schema(name = "snake_case", accessMode = Schema.AccessMode.READ_ONLY, required = false) public Integer getSnakeCase() { @@ -81,6 +79,7 @@ public Name property(String property) { * Get property * @return property */ + @JsonProperty("property") @Schema(name = "property", required = false) public String getProperty() { @@ -100,6 +99,7 @@ public Name _123number(Integer _123number) { * Get _123number * @return _123number */ + @JsonProperty("123Number") @Schema(name = "123Number", accessMode = Schema.AccessMode.READ_ONLY, required = false) public Integer get123number() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NumberOnly.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NumberOnly.java index 14fb6641f919..a597943a3ef7 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NumberOnly.java @@ -22,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class NumberOnly { - @JsonProperty("JustNumber") private BigDecimal justNumber; public NumberOnly justNumber(BigDecimal justNumber) { @@ -34,6 +33,7 @@ public NumberOnly justNumber(BigDecimal justNumber) { * Get justNumber * @return justNumber */ + @JsonProperty("JustNumber") @Valid @Schema(name = "JustNumber", required = false) public BigDecimal getJustNumber() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Order.java index 9b54a719dbae..10e257004cf9 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Order.java @@ -24,16 +24,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -74,10 +70,8 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -89,6 +83,7 @@ public Order id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -108,6 +103,7 @@ public Order petId(Long petId) { * Get petId * @return petId */ + @JsonProperty("petId") @Schema(name = "petId", required = false) public Long getPetId() { @@ -127,6 +123,7 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ + @JsonProperty("quantity") @Schema(name = "quantity", required = false) public Integer getQuantity() { @@ -146,6 +143,7 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ + @JsonProperty("shipDate") @Valid @Schema(name = "shipDate", required = false) public OffsetDateTime getShipDate() { @@ -165,6 +163,7 @@ public Order status(StatusEnum status) { * Order Status * @return status */ + @JsonProperty("status") @Schema(name = "status", description = "Order Status", required = false) public StatusEnum getStatus() { @@ -184,6 +183,7 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ + @JsonProperty("complete") @Schema(name = "complete", required = false) public Boolean getComplete() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/OuterComposite.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/OuterComposite.java index 461f98baa866..da3403158231 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/OuterComposite.java @@ -22,13 +22,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class OuterComposite { - @JsonProperty("my_number") private BigDecimal myNumber; - @JsonProperty("my_string") private String myString; - @JsonProperty("my_boolean") private Boolean myBoolean; public OuterComposite myNumber(BigDecimal myNumber) { @@ -40,6 +37,7 @@ public OuterComposite myNumber(BigDecimal myNumber) { * Get myNumber * @return myNumber */ + @JsonProperty("my_number") @Valid @Schema(name = "my_number", required = false) public BigDecimal getMyNumber() { @@ -59,6 +57,7 @@ public OuterComposite myString(String myString) { * Get myString * @return myString */ + @JsonProperty("my_string") @Schema(name = "my_string", required = false) public String getMyString() { @@ -78,6 +77,7 @@ public OuterComposite myBoolean(Boolean myBoolean) { * Get myBoolean * @return myBoolean */ + @JsonProperty("my_boolean") @Schema(name = "my_boolean", required = false) public Boolean getMyBoolean() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java index c137885adb7f..edfea99a4441 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java @@ -29,20 +29,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private Set photoUrls = new LinkedHashSet<>(); - @JsonProperty("tags") @Valid private List tags = null; @@ -83,7 +78,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; public Pet id(Long id) { @@ -95,6 +89,7 @@ public Pet id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -114,6 +109,7 @@ public Pet category(Category category) { * Get category * @return category */ + @JsonProperty("category") @Valid @Schema(name = "category", required = false) public Category getCategory() { @@ -133,6 +129,7 @@ public Pet name(String name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @Schema(name = "name", example = "doggie", required = true) public String getName() { @@ -157,6 +154,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ + @JsonProperty("photoUrls") @NotNull @Schema(name = "photoUrls", required = true) public Set getPhotoUrls() { @@ -185,6 +183,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ + @JsonProperty("tags") @Valid @Schema(name = "tags", required = false) public List getTags() { @@ -204,6 +203,7 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ + @JsonProperty("status") @Schema(name = "status", description = "pet status in the store", required = false) public StatusEnum getStatus() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java index 39862919e7c7..5bb864fdfdf9 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -21,10 +21,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ReadOnlyFirst { - @JsonProperty("bar") private String bar; - @JsonProperty("baz") private String baz; public ReadOnlyFirst bar(String bar) { @@ -36,6 +34,7 @@ public ReadOnlyFirst bar(String bar) { * Get bar * @return bar */ + @JsonProperty("bar") @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, required = false) public String getBar() { @@ -55,6 +54,7 @@ public ReadOnlyFirst baz(String baz) { * Get baz * @return baz */ + @JsonProperty("baz") @Schema(name = "baz", required = false) public String getBaz() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java index fb431f59071a..d30f01ffd4ce 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class SpecialModelName { - @JsonProperty("$special[property.name]") private Long $specialPropertyName; public SpecialModelName $specialPropertyName(Long $specialPropertyName) { @@ -35,6 +34,7 @@ public class SpecialModelName { * Get $specialPropertyName * @return $specialPropertyName */ + @JsonProperty("$special[property.name]") @Schema(name = "$special[property.name]", required = false) public Long get$SpecialPropertyName() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Tag.java index 75f3df1d0e17..7e0f150664d9 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Tag.java @@ -21,10 +21,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -36,6 +34,7 @@ public Tag id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -55,6 +54,7 @@ public Tag name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java index 4d939d69a1e7..151d7623b25f 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -24,19 +24,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderDefault { - @JsonProperty("string_item") private String stringItem = "what"; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem = true; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -49,6 +44,7 @@ public TypeHolderDefault stringItem(String stringItem) { * Get stringItem * @return stringItem */ + @JsonProperty("string_item") @NotNull @Schema(name = "string_item", required = true) public String getStringItem() { @@ -68,6 +64,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ + @JsonProperty("number_item") @NotNull @Valid @Schema(name = "number_item", required = true) public BigDecimal getNumberItem() { @@ -87,6 +84,7 @@ public TypeHolderDefault integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ + @JsonProperty("integer_item") @NotNull @Schema(name = "integer_item", required = true) public Integer getIntegerItem() { @@ -106,6 +104,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ + @JsonProperty("bool_item") @NotNull @Schema(name = "bool_item", required = true) public Boolean getBoolItem() { @@ -130,6 +129,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ + @JsonProperty("array_item") @NotNull @Schema(name = "array_item", required = true) public List getArrayItem() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java index c9b40aac5fa1..7239836800df 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -24,22 +24,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderExample { - @JsonProperty("string_item") private String stringItem; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("float_item") private Float floatItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -52,6 +46,7 @@ public TypeHolderExample stringItem(String stringItem) { * Get stringItem * @return stringItem */ + @JsonProperty("string_item") @NotNull @Schema(name = "string_item", example = "what", required = true) public String getStringItem() { @@ -71,6 +66,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ + @JsonProperty("number_item") @NotNull @Valid @Schema(name = "number_item", example = "1.234", required = true) public BigDecimal getNumberItem() { @@ -90,6 +86,7 @@ public TypeHolderExample floatItem(Float floatItem) { * Get floatItem * @return floatItem */ + @JsonProperty("float_item") @NotNull @Schema(name = "float_item", example = "1.234", required = true) public Float getFloatItem() { @@ -109,6 +106,7 @@ public TypeHolderExample integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ + @JsonProperty("integer_item") @NotNull @Schema(name = "integer_item", example = "-2", required = true) public Integer getIntegerItem() { @@ -128,6 +126,7 @@ public TypeHolderExample boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ + @JsonProperty("bool_item") @NotNull @Schema(name = "bool_item", example = "true", required = true) public Boolean getBoolItem() { @@ -152,6 +151,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ + @JsonProperty("array_item") @NotNull @Schema(name = "array_item", example = "[0, 1, 2, 3]", required = true) public List getArrayItem() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/User.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/User.java index 9df36d407748..eb52ac9bab84 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/User.java @@ -21,28 +21,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -54,6 +46,7 @@ public User id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -73,6 +66,7 @@ public User username(String username) { * Get username * @return username */ + @JsonProperty("username") @Schema(name = "username", required = false) public String getUsername() { @@ -92,6 +86,7 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ + @JsonProperty("firstName") @Schema(name = "firstName", required = false) public String getFirstName() { @@ -111,6 +106,7 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ + @JsonProperty("lastName") @Schema(name = "lastName", required = false) public String getLastName() { @@ -130,6 +126,7 @@ public User email(String email) { * Get email * @return email */ + @JsonProperty("email") @Schema(name = "email", required = false) public String getEmail() { @@ -149,6 +146,7 @@ public User password(String password) { * Get password * @return password */ + @JsonProperty("password") @Schema(name = "password", required = false) public String getPassword() { @@ -168,6 +166,7 @@ public User phone(String phone) { * Get phone * @return phone */ + @JsonProperty("phone") @Schema(name = "phone", required = false) public String getPhone() { @@ -187,6 +186,7 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ + @JsonProperty("userStatus") @Schema(name = "userStatus", description = "User Status", required = false) public Integer getUserStatus() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java index 3b3593e71797..4b287492cc75 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java @@ -24,99 +24,70 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class XmlItem { - @JsonProperty("attribute_string") private String attributeString; - @JsonProperty("attribute_number") private BigDecimal attributeNumber; - @JsonProperty("attribute_integer") private Integer attributeInteger; - @JsonProperty("attribute_boolean") private Boolean attributeBoolean; - @JsonProperty("wrapped_array") @Valid private List wrappedArray = null; - @JsonProperty("name_string") private String nameString; - @JsonProperty("name_number") private BigDecimal nameNumber; - @JsonProperty("name_integer") private Integer nameInteger; - @JsonProperty("name_boolean") private Boolean nameBoolean; - @JsonProperty("name_array") @Valid private List nameArray = null; - @JsonProperty("name_wrapped_array") @Valid private List nameWrappedArray = null; - @JsonProperty("prefix_string") private String prefixString; - @JsonProperty("prefix_number") private BigDecimal prefixNumber; - @JsonProperty("prefix_integer") private Integer prefixInteger; - @JsonProperty("prefix_boolean") private Boolean prefixBoolean; - @JsonProperty("prefix_array") @Valid private List prefixArray = null; - @JsonProperty("prefix_wrapped_array") @Valid private List prefixWrappedArray = null; - @JsonProperty("namespace_string") private String namespaceString; - @JsonProperty("namespace_number") private BigDecimal namespaceNumber; - @JsonProperty("namespace_integer") private Integer namespaceInteger; - @JsonProperty("namespace_boolean") private Boolean namespaceBoolean; - @JsonProperty("namespace_array") @Valid private List namespaceArray = null; - @JsonProperty("namespace_wrapped_array") @Valid private List namespaceWrappedArray = null; - @JsonProperty("prefix_ns_string") private String prefixNsString; - @JsonProperty("prefix_ns_number") private BigDecimal prefixNsNumber; - @JsonProperty("prefix_ns_integer") private Integer prefixNsInteger; - @JsonProperty("prefix_ns_boolean") private Boolean prefixNsBoolean; - @JsonProperty("prefix_ns_array") @Valid private List prefixNsArray = null; - @JsonProperty("prefix_ns_wrapped_array") @Valid private List prefixNsWrappedArray = null; @@ -129,6 +100,7 @@ public XmlItem attributeString(String attributeString) { * Get attributeString * @return attributeString */ + @JsonProperty("attribute_string") @Schema(name = "attribute_string", example = "string", required = false) public String getAttributeString() { @@ -148,6 +120,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) { * Get attributeNumber * @return attributeNumber */ + @JsonProperty("attribute_number") @Valid @Schema(name = "attribute_number", example = "1.234", required = false) public BigDecimal getAttributeNumber() { @@ -167,6 +140,7 @@ public XmlItem attributeInteger(Integer attributeInteger) { * Get attributeInteger * @return attributeInteger */ + @JsonProperty("attribute_integer") @Schema(name = "attribute_integer", example = "-2", required = false) public Integer getAttributeInteger() { @@ -186,6 +160,7 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) { * Get attributeBoolean * @return attributeBoolean */ + @JsonProperty("attribute_boolean") @Schema(name = "attribute_boolean", example = "true", required = false) public Boolean getAttributeBoolean() { @@ -213,6 +188,7 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) { * Get wrappedArray * @return wrappedArray */ + @JsonProperty("wrapped_array") @Schema(name = "wrapped_array", required = false) public List getWrappedArray() { @@ -232,6 +208,7 @@ public XmlItem nameString(String nameString) { * Get nameString * @return nameString */ + @JsonProperty("name_string") @Schema(name = "name_string", example = "string", required = false) public String getNameString() { @@ -251,6 +228,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) { * Get nameNumber * @return nameNumber */ + @JsonProperty("name_number") @Valid @Schema(name = "name_number", example = "1.234", required = false) public BigDecimal getNameNumber() { @@ -270,6 +248,7 @@ public XmlItem nameInteger(Integer nameInteger) { * Get nameInteger * @return nameInteger */ + @JsonProperty("name_integer") @Schema(name = "name_integer", example = "-2", required = false) public Integer getNameInteger() { @@ -289,6 +268,7 @@ public XmlItem nameBoolean(Boolean nameBoolean) { * Get nameBoolean * @return nameBoolean */ + @JsonProperty("name_boolean") @Schema(name = "name_boolean", example = "true", required = false) public Boolean getNameBoolean() { @@ -316,6 +296,7 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) { * Get nameArray * @return nameArray */ + @JsonProperty("name_array") @Schema(name = "name_array", required = false) public List getNameArray() { @@ -343,6 +324,7 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) { * Get nameWrappedArray * @return nameWrappedArray */ + @JsonProperty("name_wrapped_array") @Schema(name = "name_wrapped_array", required = false) public List getNameWrappedArray() { @@ -362,6 +344,7 @@ public XmlItem prefixString(String prefixString) { * Get prefixString * @return prefixString */ + @JsonProperty("prefix_string") @Schema(name = "prefix_string", example = "string", required = false) public String getPrefixString() { @@ -381,6 +364,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) { * Get prefixNumber * @return prefixNumber */ + @JsonProperty("prefix_number") @Valid @Schema(name = "prefix_number", example = "1.234", required = false) public BigDecimal getPrefixNumber() { @@ -400,6 +384,7 @@ public XmlItem prefixInteger(Integer prefixInteger) { * Get prefixInteger * @return prefixInteger */ + @JsonProperty("prefix_integer") @Schema(name = "prefix_integer", example = "-2", required = false) public Integer getPrefixInteger() { @@ -419,6 +404,7 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) { * Get prefixBoolean * @return prefixBoolean */ + @JsonProperty("prefix_boolean") @Schema(name = "prefix_boolean", example = "true", required = false) public Boolean getPrefixBoolean() { @@ -446,6 +432,7 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) { * Get prefixArray * @return prefixArray */ + @JsonProperty("prefix_array") @Schema(name = "prefix_array", required = false) public List getPrefixArray() { @@ -473,6 +460,7 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) { * Get prefixWrappedArray * @return prefixWrappedArray */ + @JsonProperty("prefix_wrapped_array") @Schema(name = "prefix_wrapped_array", required = false) public List getPrefixWrappedArray() { @@ -492,6 +480,7 @@ public XmlItem namespaceString(String namespaceString) { * Get namespaceString * @return namespaceString */ + @JsonProperty("namespace_string") @Schema(name = "namespace_string", example = "string", required = false) public String getNamespaceString() { @@ -511,6 +500,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) { * Get namespaceNumber * @return namespaceNumber */ + @JsonProperty("namespace_number") @Valid @Schema(name = "namespace_number", example = "1.234", required = false) public BigDecimal getNamespaceNumber() { @@ -530,6 +520,7 @@ public XmlItem namespaceInteger(Integer namespaceInteger) { * Get namespaceInteger * @return namespaceInteger */ + @JsonProperty("namespace_integer") @Schema(name = "namespace_integer", example = "-2", required = false) public Integer getNamespaceInteger() { @@ -549,6 +540,7 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) { * Get namespaceBoolean * @return namespaceBoolean */ + @JsonProperty("namespace_boolean") @Schema(name = "namespace_boolean", example = "true", required = false) public Boolean getNamespaceBoolean() { @@ -576,6 +568,7 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) { * Get namespaceArray * @return namespaceArray */ + @JsonProperty("namespace_array") @Schema(name = "namespace_array", required = false) public List getNamespaceArray() { @@ -603,6 +596,7 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) { * Get namespaceWrappedArray * @return namespaceWrappedArray */ + @JsonProperty("namespace_wrapped_array") @Schema(name = "namespace_wrapped_array", required = false) public List getNamespaceWrappedArray() { @@ -622,6 +616,7 @@ public XmlItem prefixNsString(String prefixNsString) { * Get prefixNsString * @return prefixNsString */ + @JsonProperty("prefix_ns_string") @Schema(name = "prefix_ns_string", example = "string", required = false) public String getPrefixNsString() { @@ -641,6 +636,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) { * Get prefixNsNumber * @return prefixNsNumber */ + @JsonProperty("prefix_ns_number") @Valid @Schema(name = "prefix_ns_number", example = "1.234", required = false) public BigDecimal getPrefixNsNumber() { @@ -660,6 +656,7 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) { * Get prefixNsInteger * @return prefixNsInteger */ + @JsonProperty("prefix_ns_integer") @Schema(name = "prefix_ns_integer", example = "-2", required = false) public Integer getPrefixNsInteger() { @@ -679,6 +676,7 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) { * Get prefixNsBoolean * @return prefixNsBoolean */ + @JsonProperty("prefix_ns_boolean") @Schema(name = "prefix_ns_boolean", example = "true", required = false) public Boolean getPrefixNsBoolean() { @@ -706,6 +704,7 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) { * Get prefixNsArray * @return prefixNsArray */ + @JsonProperty("prefix_ns_array") @Schema(name = "prefix_ns_array", required = false) public List getPrefixNsArray() { @@ -733,6 +732,7 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) { * Get prefixNsWrappedArray * @return prefixNsWrappedArray */ + @JsonProperty("prefix_ns_wrapped_array") @Schema(name = "prefix_ns_wrapped_array", required = false) public List getPrefixNsWrappedArray() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 0d95d7f91b29..e45a52c7a8af 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesAnyType extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesAnyType name(String name) { @@ -35,6 +34,7 @@ public AdditionalPropertiesAnyType name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 0a45cd0d195e..ff8e902ab955 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesArray extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesArray name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesArray name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index c53b449a5070..c21068182c49 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesBoolean extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesBoolean name(String name) { @@ -35,6 +34,7 @@ public AdditionalPropertiesBoolean name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index ae060d44dc4d..c43432f178b1 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -25,45 +25,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesClass { - @JsonProperty("map_string") @Valid private Map mapString = null; - @JsonProperty("map_number") @Valid private Map mapNumber = null; - @JsonProperty("map_integer") @Valid private Map mapInteger = null; - @JsonProperty("map_boolean") @Valid private Map mapBoolean = null; - @JsonProperty("map_array_integer") @Valid private Map> mapArrayInteger = null; - @JsonProperty("map_array_anytype") @Valid private Map> mapArrayAnytype = null; - @JsonProperty("map_map_string") @Valid private Map> mapMapString = null; - @JsonProperty("map_map_anytype") @Valid private Map> mapMapAnytype = null; - @JsonProperty("anytype_1") private Object anytype1; - @JsonProperty("anytype_2") private Object anytype2; - @JsonProperty("anytype_3") private Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { @@ -83,6 +72,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt * Get mapString * @return mapString */ + @JsonProperty("map_string") @Schema(name = "map_string", required = false) public Map getMapString() { @@ -110,6 +100,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * Get mapNumber * @return mapNumber */ + @JsonProperty("map_number") @Valid @Schema(name = "map_number", required = false) public Map getMapNumber() { @@ -137,6 +128,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege * Get mapInteger * @return mapInteger */ + @JsonProperty("map_integer") @Schema(name = "map_integer", required = false) public Map getMapInteger() { @@ -164,6 +156,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea * Get mapBoolean * @return mapBoolean */ + @JsonProperty("map_boolean") @Schema(name = "map_boolean", required = false) public Map getMapBoolean() { @@ -191,6 +184,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { @@ -218,6 +212,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * Get mapArrayAnytype * @return mapArrayAnytype */ + @JsonProperty("map_array_anytype") @Valid @Schema(name = "map_array_anytype", required = false) public Map> getMapArrayAnytype() { @@ -245,6 +240,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { @@ -272,6 +268,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { @@ -291,6 +288,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) { * Get anytype1 * @return anytype1 */ + @JsonProperty("anytype_1") @Schema(name = "anytype_1", required = false) public Object getAnytype1() { @@ -310,6 +308,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) { * Get anytype2 * @return anytype2 */ + @JsonProperty("anytype_2") @Schema(name = "anytype_2", required = false) public Object getAnytype2() { @@ -329,6 +328,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) { * Get anytype3 * @return anytype3 */ + @JsonProperty("anytype_3") @Schema(name = "anytype_3", required = false) public Object getAnytype3() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 87a903f3e7f2..d4fe82193e30 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesInteger extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesInteger name(String name) { @@ -35,6 +34,7 @@ public AdditionalPropertiesInteger name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 873d1c9c229e..11f9dda21f3f 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesNumber extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesNumber name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesNumber name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 97827d22d963..ce4f9f1ff862 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesObject extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesObject name(String name) { @@ -35,6 +34,7 @@ public AdditionalPropertiesObject name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 53967d619036..2669a2e08d51 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesString extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesString name(String name) { @@ -35,6 +34,7 @@ public AdditionalPropertiesString name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java index 8b3225fee193..50eb6fe3c62b 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java @@ -38,10 +38,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Animal { - @JsonProperty("className") private String className; - @JsonProperty("color") private String color = "red"; public Animal className(String className) { @@ -53,6 +51,7 @@ public Animal className(String className) { * Get className * @return className */ + @JsonProperty("className") @NotNull @Schema(name = "className", required = true) public String getClassName() { @@ -72,6 +71,7 @@ public Animal color(String color) { * Get color * @return color */ + @JsonProperty("color") @Schema(name = "color", required = false) public String getColor() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 4fc6a6447db5..99f5ef3aa439 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfArrayOfNumberOnly { - @JsonProperty("ArrayArrayNumber") @Valid private List> arrayArrayNumber = null; @@ -45,6 +44,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * Get arrayArrayNumber * @return arrayArrayNumber */ + @JsonProperty("ArrayArrayNumber") @Valid @Schema(name = "ArrayArrayNumber", required = false) public List> getArrayArrayNumber() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index da4dc071cfdf..563d0dc0f933 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfNumberOnly { - @JsonProperty("ArrayNumber") @Valid private List arrayNumber = null; @@ -45,6 +44,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ + @JsonProperty("ArrayNumber") @Valid @Schema(name = "ArrayNumber", required = false) public List getArrayNumber() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java index 03052a955e3b..839cf3ac40ab 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java @@ -24,15 +24,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayTest { - @JsonProperty("array_of_string") @Valid private List arrayOfString = null; - @JsonProperty("array_array_of_integer") @Valid private List> arrayArrayOfInteger = null; - @JsonProperty("array_array_of_model") @Valid private List> arrayArrayOfModel = null; @@ -53,6 +50,7 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) { * Get arrayOfString * @return arrayOfString */ + @JsonProperty("array_of_string") @Schema(name = "array_of_string", required = false) public List getArrayOfString() { @@ -80,6 +78,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ + @JsonProperty("array_array_of_integer") @Valid @Schema(name = "array_array_of_integer", required = false) public List> getArrayArrayOfInteger() { @@ -107,6 +106,7 @@ public ArrayTest addArrayArrayOfModelItem(List arrayArrayOfModelI * Get arrayArrayOfModel * @return arrayArrayOfModel */ + @JsonProperty("array_array_of_model") @Valid @Schema(name = "array_array_of_model", required = false) public List> getArrayArrayOfModel() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java index 344818cd160a..e0b22753e9e8 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java @@ -66,7 +66,6 @@ public static KindEnum fromValue(String value) { } } - @JsonProperty("kind") private KindEnum kind; public BigCat kind(KindEnum kind) { @@ -78,6 +77,7 @@ public BigCat kind(KindEnum kind) { * Get kind * @return kind */ + @JsonProperty("kind") @Schema(name = "kind", required = false) public KindEnum getKind() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCatAllOf.java index 96ddb1f49cd8..3b0788b0b304 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCatAllOf.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCatAllOf.java @@ -63,7 +63,6 @@ public static KindEnum fromValue(String value) { } } - @JsonProperty("kind") private KindEnum kind; public BigCatAllOf kind(KindEnum kind) { @@ -75,6 +74,7 @@ public BigCatAllOf kind(KindEnum kind) { * Get kind * @return kind */ + @JsonProperty("kind") @Schema(name = "kind", required = false) public KindEnum getKind() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Capitalization.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Capitalization.java index e7f3b66e4814..7270c14a949f 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Capitalization.java @@ -21,22 +21,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Capitalization { - @JsonProperty("smallCamel") private String smallCamel; - @JsonProperty("CapitalCamel") private String capitalCamel; - @JsonProperty("small_Snake") private String smallSnake; - @JsonProperty("Capital_Snake") private String capitalSnake; - @JsonProperty("SCA_ETH_Flow_Points") private String scAETHFlowPoints; - @JsonProperty("ATT_NAME") private String ATT_NAME; public Capitalization smallCamel(String smallCamel) { @@ -48,6 +42,7 @@ public Capitalization smallCamel(String smallCamel) { * Get smallCamel * @return smallCamel */ + @JsonProperty("smallCamel") @Schema(name = "smallCamel", required = false) public String getSmallCamel() { @@ -67,6 +62,7 @@ public Capitalization capitalCamel(String capitalCamel) { * Get capitalCamel * @return capitalCamel */ + @JsonProperty("CapitalCamel") @Schema(name = "CapitalCamel", required = false) public String getCapitalCamel() { @@ -86,6 +82,7 @@ public Capitalization smallSnake(String smallSnake) { * Get smallSnake * @return smallSnake */ + @JsonProperty("small_Snake") @Schema(name = "small_Snake", required = false) public String getSmallSnake() { @@ -105,6 +102,7 @@ public Capitalization capitalSnake(String capitalSnake) { * Get capitalSnake * @return capitalSnake */ + @JsonProperty("Capital_Snake") @Schema(name = "Capital_Snake", required = false) public String getCapitalSnake() { @@ -124,6 +122,7 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) { * Get scAETHFlowPoints * @return scAETHFlowPoints */ + @JsonProperty("SCA_ETH_Flow_Points") @Schema(name = "SCA_ETH_Flow_Points", required = false) public String getScAETHFlowPoints() { @@ -143,6 +142,7 @@ public Capitalization ATT_NAME(String ATT_NAME) { * Name of the pet * @return ATT_NAME */ + @JsonProperty("ATT_NAME") @Schema(name = "ATT_NAME", description = "Name of the pet ", required = false) public String getATTNAME() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java index afce161498ed..d1bb205b11b3 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java @@ -35,7 +35,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Cat extends Animal { - @JsonProperty("declawed") private Boolean declawed; public Cat declawed(Boolean declawed) { @@ -47,6 +46,7 @@ public Cat declawed(Boolean declawed) { * Get declawed * @return declawed */ + @JsonProperty("declawed") @Schema(name = "declawed", required = false) public Boolean getDeclawed() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/CatAllOf.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/CatAllOf.java index bc83998fc4d5..b7a7ed5def6a 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/CatAllOf.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/CatAllOf.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class CatAllOf { - @JsonProperty("declawed") private Boolean declawed; public CatAllOf declawed(Boolean declawed) { @@ -35,6 +34,7 @@ public CatAllOf declawed(Boolean declawed) { * Get declawed * @return declawed */ + @JsonProperty("declawed") @Schema(name = "declawed", required = false) public Boolean getDeclawed() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Category.java index 586658c922c5..9b1acc5a5c07 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Category.java @@ -21,10 +21,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name = "default-name"; public Category id(Long id) { @@ -36,6 +34,7 @@ public Category id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -55,6 +54,7 @@ public Category name(String name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @Schema(name = "name", required = true) public String getName() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ClassModel.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ClassModel.java index d3d25d6df8cd..20f5e2de16dd 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ClassModel.java @@ -22,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ClassModel { - @JsonProperty("_class") private String propertyClass; public ClassModel propertyClass(String propertyClass) { @@ -34,6 +33,7 @@ public ClassModel propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ + @JsonProperty("_class") @Schema(name = "_class", required = false) public String getPropertyClass() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Client.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Client.java index 7ed5fbaae188..11ed7ead459c 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Client.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Client.java @@ -21,7 +21,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Client { - @JsonProperty("client") private String client; public Client client(String client) { @@ -33,6 +32,7 @@ public Client client(String client) { * Get client * @return client */ + @JsonProperty("client") @Schema(name = "client", required = false) public String getClient() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Dog.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Dog.java index 738b9fbffc6c..b0f901978716 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Dog.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Dog.java @@ -26,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Dog extends Animal { - @JsonProperty("breed") private String breed; public Dog breed(String breed) { @@ -38,6 +37,7 @@ public Dog breed(String breed) { * Get breed * @return breed */ + @JsonProperty("breed") @Schema(name = "breed", required = false) public String getBreed() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/DogAllOf.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/DogAllOf.java index fbcd7127e41b..097dc159ee65 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/DogAllOf.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/DogAllOf.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class DogAllOf { - @JsonProperty("breed") private String breed; public DogAllOf breed(String breed) { @@ -35,6 +34,7 @@ public DogAllOf breed(String breed) { * Get breed * @return breed */ + @JsonProperty("breed") @Schema(name = "breed", required = false) public String getBreed() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java index 3c18fc1189fe..cb84a65b9e1c 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java @@ -59,7 +59,6 @@ public static JustSymbolEnum fromValue(String value) { } } - @JsonProperty("just_symbol") private JustSymbolEnum justSymbol; /** @@ -97,7 +96,6 @@ public static ArrayEnumEnum fromValue(String value) { } } - @JsonProperty("array_enum") @Valid private List arrayEnum = null; @@ -110,6 +108,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) { * Get justSymbol * @return justSymbol */ + @JsonProperty("just_symbol") @Schema(name = "just_symbol", required = false) public JustSymbolEnum getJustSymbol() { @@ -137,6 +136,7 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) { * Get arrayEnum * @return arrayEnum */ + @JsonProperty("array_enum") @Schema(name = "array_enum", required = false) public List getArrayEnum() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java index dc15f99afe84..2243d0fb1b8b 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java @@ -62,7 +62,6 @@ public static EnumStringEnum fromValue(String value) { } } - @JsonProperty("enum_string") private EnumStringEnum enumString; /** @@ -102,7 +101,6 @@ public static EnumStringRequiredEnum fromValue(String value) { } } - @JsonProperty("enum_string_required") private EnumStringRequiredEnum enumStringRequired; /** @@ -140,7 +138,6 @@ public static EnumIntegerEnum fromValue(Integer value) { } } - @JsonProperty("enum_integer") private EnumIntegerEnum enumInteger; /** @@ -178,10 +175,8 @@ public static EnumNumberEnum fromValue(Double value) { } } - @JsonProperty("enum_number") private EnumNumberEnum enumNumber; - @JsonProperty("outerEnum") private OuterEnum outerEnum; public EnumTest enumString(EnumStringEnum enumString) { @@ -193,6 +188,7 @@ public EnumTest enumString(EnumStringEnum enumString) { * Get enumString * @return enumString */ + @JsonProperty("enum_string") @Schema(name = "enum_string", required = false) public EnumStringEnum getEnumString() { @@ -212,6 +208,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) { * Get enumStringRequired * @return enumStringRequired */ + @JsonProperty("enum_string_required") @NotNull @Schema(name = "enum_string_required", required = true) public EnumStringRequiredEnum getEnumStringRequired() { @@ -231,6 +228,7 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) { * Get enumInteger * @return enumInteger */ + @JsonProperty("enum_integer") @Schema(name = "enum_integer", required = false) public EnumIntegerEnum getEnumInteger() { @@ -250,6 +248,7 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) { * Get enumNumber * @return enumNumber */ + @JsonProperty("enum_number") @Schema(name = "enum_number", required = false) public EnumNumberEnum getEnumNumber() { @@ -269,6 +268,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) { * Get outerEnum * @return outerEnum */ + @JsonProperty("outerEnum") @Valid @Schema(name = "outerEnum", required = false) public OuterEnum getOuterEnum() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/File.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/File.java index d9a8ab4aa1f2..7d0f08137a62 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/File.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/File.java @@ -22,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class File { - @JsonProperty("sourceURI") private String sourceURI; public File sourceURI(String sourceURI) { @@ -34,6 +33,7 @@ public File sourceURI(String sourceURI) { * Test capitalization * @return sourceURI */ + @JsonProperty("sourceURI") @Schema(name = "sourceURI", description = "Test capitalization", required = false) public String getSourceURI() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 5794883ff564..50df4bf463a8 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -24,10 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FileSchemaTestClass { - @JsonProperty("file") private File file; - @JsonProperty("files") @Valid private List files = null; @@ -40,6 +38,7 @@ public FileSchemaTestClass file(File file) { * Get file * @return file */ + @JsonProperty("file") @Valid @Schema(name = "file", required = false) public File getFile() { @@ -67,6 +66,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) { * Get files * @return files */ + @JsonProperty("files") @Valid @Schema(name = "files", required = false) public List getFiles() { 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 c4bacc257a36..c9ae6ace8274 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 @@ -29,48 +29,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FormatTest { - @JsonProperty("integer") private Integer integer; - @JsonProperty("int32") private Integer int32; - @JsonProperty("int64") private Long int64; - @JsonProperty("number") private BigDecimal number; - @JsonProperty("float") private Float _float; - @JsonProperty("double") private Double _double; - @JsonProperty("string") private String string; - @JsonProperty("byte") private byte[] _byte; - @JsonProperty("binary") private org.springframework.core.io.Resource binary; - @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("password") private String password; - @JsonProperty("BigDecimal") private BigDecimal bigDecimal; public FormatTest integer(Integer integer) { @@ -84,6 +70,7 @@ public FormatTest integer(Integer integer) { * maximum: 100 * @return integer */ + @JsonProperty("integer") @Min(10) @Max(100) @Schema(name = "integer", required = false) public Integer getInteger() { @@ -105,6 +92,7 @@ public FormatTest int32(Integer int32) { * maximum: 200 * @return int32 */ + @JsonProperty("int32") @Min(20) @Max(200) @Schema(name = "int32", required = false) public Integer getInt32() { @@ -124,6 +112,7 @@ public FormatTest int64(Long int64) { * Get int64 * @return int64 */ + @JsonProperty("int64") @Schema(name = "int64", required = false) public Long getInt64() { @@ -145,6 +134,7 @@ public FormatTest number(BigDecimal number) { * maximum: 543.2 * @return number */ + @JsonProperty("number") @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") @Schema(name = "number", required = true) public BigDecimal getNumber() { @@ -166,6 +156,7 @@ public FormatTest _float(Float _float) { * maximum: 987.6 * @return _float */ + @JsonProperty("float") @DecimalMin("54.3") @DecimalMax("987.6") @Schema(name = "float", required = false) public Float getFloat() { @@ -187,6 +178,7 @@ public FormatTest _double(Double _double) { * maximum: 123.4 * @return _double */ + @JsonProperty("double") @DecimalMin("67.8") @DecimalMax("123.4") @Schema(name = "double", required = false) public Double getDouble() { @@ -206,6 +198,7 @@ public FormatTest string(String string) { * Get string * @return string */ + @JsonProperty("string") @Pattern(regexp = "/[a-z]/i") @Schema(name = "string", required = false) public String getString() { @@ -225,6 +218,7 @@ public FormatTest _byte(byte[] _byte) { * Get _byte * @return _byte */ + @JsonProperty("byte") @NotNull @Schema(name = "byte", required = true) public byte[] getByte() { @@ -244,6 +238,7 @@ public FormatTest binary(org.springframework.core.io.Resource binary) { * Get binary * @return binary */ + @JsonProperty("binary") @Valid @Schema(name = "binary", required = false) public org.springframework.core.io.Resource getBinary() { @@ -263,6 +258,7 @@ public FormatTest date(LocalDate date) { * Get date * @return date */ + @JsonProperty("date") @NotNull @Valid @Schema(name = "date", required = true) public LocalDate getDate() { @@ -282,6 +278,7 @@ public FormatTest dateTime(OffsetDateTime dateTime) { * Get dateTime * @return dateTime */ + @JsonProperty("dateTime") @Valid @Schema(name = "dateTime", required = false) public OffsetDateTime getDateTime() { @@ -301,6 +298,7 @@ public FormatTest uuid(UUID uuid) { * Get uuid * @return uuid */ + @JsonProperty("uuid") @Valid @Schema(name = "uuid", example = "72f98069-206d-4f12-9f12-3d1e525a8e84", required = false) public UUID getUuid() { @@ -320,6 +318,7 @@ public FormatTest password(String password) { * Get password * @return password */ + @JsonProperty("password") @NotNull @Size(min = 10, max = 64) @Schema(name = "password", required = true) public String getPassword() { @@ -339,6 +338,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) { * Get bigDecimal * @return bigDecimal */ + @JsonProperty("BigDecimal") @Valid @Schema(name = "BigDecimal", required = false) public BigDecimal getBigDecimal() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index d817048f2a75..aa8c3ee2514a 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -23,10 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class HasOnlyReadOnly { - @JsonProperty("bar") private String bar; - @JsonProperty("foo") private String foo; public HasOnlyReadOnly bar(String bar) { @@ -38,6 +36,7 @@ public HasOnlyReadOnly bar(String bar) { * Get bar * @return bar */ + @JsonProperty("bar") @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, required = false) public String getBar() { @@ -57,6 +56,7 @@ public HasOnlyReadOnly foo(String foo) { * Get foo * @return foo */ + @JsonProperty("foo") @Schema(name = "foo", accessMode = Schema.AccessMode.READ_ONLY, required = false) public String getFoo() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java index 55a10cdf8d08..594021c36d2d 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MapTest { - @JsonProperty("map_map_of_string") @Valid private Map> mapMapOfString = null; @@ -63,15 +62,12 @@ public static InnerEnum fromValue(String value) { } } - @JsonProperty("map_of_enum_string") @Valid private Map mapOfEnumString = null; - @JsonProperty("direct_map") @Valid private Map directMap = null; - @JsonProperty("indirect_map") @Valid private Map indirectMap = null; @@ -92,6 +88,7 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapMapOfString * @return mapMapOfString */ + @JsonProperty("map_map_of_string") @Valid @Schema(name = "map_map_of_string", required = false) public Map> getMapMapOfString() { @@ -119,6 +116,7 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) * Get mapOfEnumString * @return mapOfEnumString */ + @JsonProperty("map_of_enum_string") @Schema(name = "map_of_enum_string", required = false) public Map getMapOfEnumString() { @@ -146,6 +144,7 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) { * Get directMap * @return directMap */ + @JsonProperty("direct_map") @Schema(name = "direct_map", required = false) public Map getDirectMap() { @@ -173,6 +172,7 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) { * Get indirectMap * @return indirectMap */ + @JsonProperty("indirect_map") @Schema(name = "indirect_map", required = false) public Map getIndirectMap() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index d58ed97c15d2..af4644ee1fd8 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -27,14 +27,11 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("map") @Valid private Map map = null; @@ -47,6 +44,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { * Get uuid * @return uuid */ + @JsonProperty("uuid") @Valid @Schema(name = "uuid", required = false) public UUID getUuid() { @@ -66,6 +64,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT * Get dateTime * @return dateTime */ + @JsonProperty("dateTime") @Valid @Schema(name = "dateTime", required = false) public OffsetDateTime getDateTime() { @@ -93,6 +92,7 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * Get map * @return map */ + @JsonProperty("map") @Valid @Schema(name = "map", required = false) public Map getMap() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Model200Response.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Model200Response.java index 80ff3f1fc638..329840fd1cd5 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Model200Response.java @@ -24,10 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Model200Response { - @JsonProperty("name") private Integer name; - @JsonProperty("class") private String propertyClass; public Model200Response name(Integer name) { @@ -39,6 +37,7 @@ public Model200Response name(Integer name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public Integer getName() { @@ -58,6 +57,7 @@ public Model200Response propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ + @JsonProperty("class") @Schema(name = "class", required = false) public String getPropertyClass() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelApiResponse.java index ed829bcb62cd..14ea90b13917 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -23,13 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -41,6 +38,7 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ + @JsonProperty("code") @Schema(name = "code", required = false) public Integer getCode() { @@ -60,6 +58,7 @@ public ModelApiResponse type(String type) { * Get type * @return type */ + @JsonProperty("type") @Schema(name = "type", required = false) public String getType() { @@ -79,6 +78,7 @@ public ModelApiResponse message(String message) { * Get message * @return message */ + @JsonProperty("message") @Schema(name = "message", required = false) public String getMessage() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelList.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelList.java index 56e79c554452..1e0bcffc220c 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelList.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelList { - @JsonProperty("123-list") private String _123list; public ModelList _123list(String _123list) { @@ -35,6 +34,7 @@ public ModelList _123list(String _123list) { * Get _123list * @return _123list */ + @JsonProperty("123-list") @Schema(name = "123-list", required = false) public String get123list() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelReturn.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelReturn.java index d95ce3f15491..90b17a6d6850 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelReturn.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelReturn { - @JsonProperty("return") private Integer _return; public ModelReturn _return(Integer _return) { @@ -36,6 +35,7 @@ public ModelReturn _return(Integer _return) { * Get _return * @return _return */ + @JsonProperty("return") @Schema(name = "return", required = false) public Integer getReturn() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Name.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Name.java index 32cec75d981d..bcbb5aab0f79 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Name.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Name.java @@ -22,16 +22,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Name { - @JsonProperty("name") private Integer name; - @JsonProperty("snake_case") private Integer snakeCase; - @JsonProperty("property") private String property; - @JsonProperty("123Number") private Integer _123number; public Name name(Integer name) { @@ -43,6 +39,7 @@ public Name name(Integer name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @Schema(name = "name", required = true) public Integer getName() { @@ -62,6 +59,7 @@ public Name snakeCase(Integer snakeCase) { * Get snakeCase * @return snakeCase */ + @JsonProperty("snake_case") @Schema(name = "snake_case", accessMode = Schema.AccessMode.READ_ONLY, required = false) public Integer getSnakeCase() { @@ -81,6 +79,7 @@ public Name property(String property) { * Get property * @return property */ + @JsonProperty("property") @Schema(name = "property", required = false) public String getProperty() { @@ -100,6 +99,7 @@ public Name _123number(Integer _123number) { * Get _123number * @return _123number */ + @JsonProperty("123Number") @Schema(name = "123Number", accessMode = Schema.AccessMode.READ_ONLY, required = false) public Integer get123number() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NumberOnly.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NumberOnly.java index 14fb6641f919..a597943a3ef7 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NumberOnly.java @@ -22,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class NumberOnly { - @JsonProperty("JustNumber") private BigDecimal justNumber; public NumberOnly justNumber(BigDecimal justNumber) { @@ -34,6 +33,7 @@ public NumberOnly justNumber(BigDecimal justNumber) { * Get justNumber * @return justNumber */ + @JsonProperty("JustNumber") @Valid @Schema(name = "JustNumber", required = false) public BigDecimal getJustNumber() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Order.java index 9b54a719dbae..10e257004cf9 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Order.java @@ -24,16 +24,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -74,10 +70,8 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -89,6 +83,7 @@ public Order id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -108,6 +103,7 @@ public Order petId(Long petId) { * Get petId * @return petId */ + @JsonProperty("petId") @Schema(name = "petId", required = false) public Long getPetId() { @@ -127,6 +123,7 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ + @JsonProperty("quantity") @Schema(name = "quantity", required = false) public Integer getQuantity() { @@ -146,6 +143,7 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ + @JsonProperty("shipDate") @Valid @Schema(name = "shipDate", required = false) public OffsetDateTime getShipDate() { @@ -165,6 +163,7 @@ public Order status(StatusEnum status) { * Order Status * @return status */ + @JsonProperty("status") @Schema(name = "status", description = "Order Status", required = false) public StatusEnum getStatus() { @@ -184,6 +183,7 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ + @JsonProperty("complete") @Schema(name = "complete", required = false) public Boolean getComplete() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/OuterComposite.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/OuterComposite.java index 461f98baa866..da3403158231 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/OuterComposite.java @@ -22,13 +22,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class OuterComposite { - @JsonProperty("my_number") private BigDecimal myNumber; - @JsonProperty("my_string") private String myString; - @JsonProperty("my_boolean") private Boolean myBoolean; public OuterComposite myNumber(BigDecimal myNumber) { @@ -40,6 +37,7 @@ public OuterComposite myNumber(BigDecimal myNumber) { * Get myNumber * @return myNumber */ + @JsonProperty("my_number") @Valid @Schema(name = "my_number", required = false) public BigDecimal getMyNumber() { @@ -59,6 +57,7 @@ public OuterComposite myString(String myString) { * Get myString * @return myString */ + @JsonProperty("my_string") @Schema(name = "my_string", required = false) public String getMyString() { @@ -78,6 +77,7 @@ public OuterComposite myBoolean(Boolean myBoolean) { * Get myBoolean * @return myBoolean */ + @JsonProperty("my_boolean") @Schema(name = "my_boolean", required = false) public Boolean getMyBoolean() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java index c137885adb7f..edfea99a4441 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java @@ -29,20 +29,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private Set photoUrls = new LinkedHashSet<>(); - @JsonProperty("tags") @Valid private List tags = null; @@ -83,7 +78,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; public Pet id(Long id) { @@ -95,6 +89,7 @@ public Pet id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -114,6 +109,7 @@ public Pet category(Category category) { * Get category * @return category */ + @JsonProperty("category") @Valid @Schema(name = "category", required = false) public Category getCategory() { @@ -133,6 +129,7 @@ public Pet name(String name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @Schema(name = "name", example = "doggie", required = true) public String getName() { @@ -157,6 +154,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ + @JsonProperty("photoUrls") @NotNull @Schema(name = "photoUrls", required = true) public Set getPhotoUrls() { @@ -185,6 +183,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ + @JsonProperty("tags") @Valid @Schema(name = "tags", required = false) public List getTags() { @@ -204,6 +203,7 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ + @JsonProperty("status") @Schema(name = "status", description = "pet status in the store", required = false) public StatusEnum getStatus() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java index 39862919e7c7..5bb864fdfdf9 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -21,10 +21,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ReadOnlyFirst { - @JsonProperty("bar") private String bar; - @JsonProperty("baz") private String baz; public ReadOnlyFirst bar(String bar) { @@ -36,6 +34,7 @@ public ReadOnlyFirst bar(String bar) { * Get bar * @return bar */ + @JsonProperty("bar") @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, required = false) public String getBar() { @@ -55,6 +54,7 @@ public ReadOnlyFirst baz(String baz) { * Get baz * @return baz */ + @JsonProperty("baz") @Schema(name = "baz", required = false) public String getBaz() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java index fb431f59071a..d30f01ffd4ce 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class SpecialModelName { - @JsonProperty("$special[property.name]") private Long $specialPropertyName; public SpecialModelName $specialPropertyName(Long $specialPropertyName) { @@ -35,6 +34,7 @@ public class SpecialModelName { * Get $specialPropertyName * @return $specialPropertyName */ + @JsonProperty("$special[property.name]") @Schema(name = "$special[property.name]", required = false) public Long get$SpecialPropertyName() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Tag.java index 75f3df1d0e17..7e0f150664d9 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Tag.java @@ -21,10 +21,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -36,6 +34,7 @@ public Tag id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -55,6 +54,7 @@ public Tag name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java index 4d939d69a1e7..151d7623b25f 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -24,19 +24,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderDefault { - @JsonProperty("string_item") private String stringItem = "what"; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem = true; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -49,6 +44,7 @@ public TypeHolderDefault stringItem(String stringItem) { * Get stringItem * @return stringItem */ + @JsonProperty("string_item") @NotNull @Schema(name = "string_item", required = true) public String getStringItem() { @@ -68,6 +64,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ + @JsonProperty("number_item") @NotNull @Valid @Schema(name = "number_item", required = true) public BigDecimal getNumberItem() { @@ -87,6 +84,7 @@ public TypeHolderDefault integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ + @JsonProperty("integer_item") @NotNull @Schema(name = "integer_item", required = true) public Integer getIntegerItem() { @@ -106,6 +104,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ + @JsonProperty("bool_item") @NotNull @Schema(name = "bool_item", required = true) public Boolean getBoolItem() { @@ -130,6 +129,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ + @JsonProperty("array_item") @NotNull @Schema(name = "array_item", required = true) public List getArrayItem() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java index c9b40aac5fa1..7239836800df 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -24,22 +24,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderExample { - @JsonProperty("string_item") private String stringItem; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("float_item") private Float floatItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -52,6 +46,7 @@ public TypeHolderExample stringItem(String stringItem) { * Get stringItem * @return stringItem */ + @JsonProperty("string_item") @NotNull @Schema(name = "string_item", example = "what", required = true) public String getStringItem() { @@ -71,6 +66,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ + @JsonProperty("number_item") @NotNull @Valid @Schema(name = "number_item", example = "1.234", required = true) public BigDecimal getNumberItem() { @@ -90,6 +86,7 @@ public TypeHolderExample floatItem(Float floatItem) { * Get floatItem * @return floatItem */ + @JsonProperty("float_item") @NotNull @Schema(name = "float_item", example = "1.234", required = true) public Float getFloatItem() { @@ -109,6 +106,7 @@ public TypeHolderExample integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ + @JsonProperty("integer_item") @NotNull @Schema(name = "integer_item", example = "-2", required = true) public Integer getIntegerItem() { @@ -128,6 +126,7 @@ public TypeHolderExample boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ + @JsonProperty("bool_item") @NotNull @Schema(name = "bool_item", example = "true", required = true) public Boolean getBoolItem() { @@ -152,6 +151,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ + @JsonProperty("array_item") @NotNull @Schema(name = "array_item", example = "[0, 1, 2, 3]", required = true) public List getArrayItem() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/User.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/User.java index 9df36d407748..eb52ac9bab84 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/User.java @@ -21,28 +21,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -54,6 +46,7 @@ public User id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -73,6 +66,7 @@ public User username(String username) { * Get username * @return username */ + @JsonProperty("username") @Schema(name = "username", required = false) public String getUsername() { @@ -92,6 +86,7 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ + @JsonProperty("firstName") @Schema(name = "firstName", required = false) public String getFirstName() { @@ -111,6 +106,7 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ + @JsonProperty("lastName") @Schema(name = "lastName", required = false) public String getLastName() { @@ -130,6 +126,7 @@ public User email(String email) { * Get email * @return email */ + @JsonProperty("email") @Schema(name = "email", required = false) public String getEmail() { @@ -149,6 +146,7 @@ public User password(String password) { * Get password * @return password */ + @JsonProperty("password") @Schema(name = "password", required = false) public String getPassword() { @@ -168,6 +166,7 @@ public User phone(String phone) { * Get phone * @return phone */ + @JsonProperty("phone") @Schema(name = "phone", required = false) public String getPhone() { @@ -187,6 +186,7 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ + @JsonProperty("userStatus") @Schema(name = "userStatus", description = "User Status", required = false) public Integer getUserStatus() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java index 3b3593e71797..4b287492cc75 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java @@ -24,99 +24,70 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class XmlItem { - @JsonProperty("attribute_string") private String attributeString; - @JsonProperty("attribute_number") private BigDecimal attributeNumber; - @JsonProperty("attribute_integer") private Integer attributeInteger; - @JsonProperty("attribute_boolean") private Boolean attributeBoolean; - @JsonProperty("wrapped_array") @Valid private List wrappedArray = null; - @JsonProperty("name_string") private String nameString; - @JsonProperty("name_number") private BigDecimal nameNumber; - @JsonProperty("name_integer") private Integer nameInteger; - @JsonProperty("name_boolean") private Boolean nameBoolean; - @JsonProperty("name_array") @Valid private List nameArray = null; - @JsonProperty("name_wrapped_array") @Valid private List nameWrappedArray = null; - @JsonProperty("prefix_string") private String prefixString; - @JsonProperty("prefix_number") private BigDecimal prefixNumber; - @JsonProperty("prefix_integer") private Integer prefixInteger; - @JsonProperty("prefix_boolean") private Boolean prefixBoolean; - @JsonProperty("prefix_array") @Valid private List prefixArray = null; - @JsonProperty("prefix_wrapped_array") @Valid private List prefixWrappedArray = null; - @JsonProperty("namespace_string") private String namespaceString; - @JsonProperty("namespace_number") private BigDecimal namespaceNumber; - @JsonProperty("namespace_integer") private Integer namespaceInteger; - @JsonProperty("namespace_boolean") private Boolean namespaceBoolean; - @JsonProperty("namespace_array") @Valid private List namespaceArray = null; - @JsonProperty("namespace_wrapped_array") @Valid private List namespaceWrappedArray = null; - @JsonProperty("prefix_ns_string") private String prefixNsString; - @JsonProperty("prefix_ns_number") private BigDecimal prefixNsNumber; - @JsonProperty("prefix_ns_integer") private Integer prefixNsInteger; - @JsonProperty("prefix_ns_boolean") private Boolean prefixNsBoolean; - @JsonProperty("prefix_ns_array") @Valid private List prefixNsArray = null; - @JsonProperty("prefix_ns_wrapped_array") @Valid private List prefixNsWrappedArray = null; @@ -129,6 +100,7 @@ public XmlItem attributeString(String attributeString) { * Get attributeString * @return attributeString */ + @JsonProperty("attribute_string") @Schema(name = "attribute_string", example = "string", required = false) public String getAttributeString() { @@ -148,6 +120,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) { * Get attributeNumber * @return attributeNumber */ + @JsonProperty("attribute_number") @Valid @Schema(name = "attribute_number", example = "1.234", required = false) public BigDecimal getAttributeNumber() { @@ -167,6 +140,7 @@ public XmlItem attributeInteger(Integer attributeInteger) { * Get attributeInteger * @return attributeInteger */ + @JsonProperty("attribute_integer") @Schema(name = "attribute_integer", example = "-2", required = false) public Integer getAttributeInteger() { @@ -186,6 +160,7 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) { * Get attributeBoolean * @return attributeBoolean */ + @JsonProperty("attribute_boolean") @Schema(name = "attribute_boolean", example = "true", required = false) public Boolean getAttributeBoolean() { @@ -213,6 +188,7 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) { * Get wrappedArray * @return wrappedArray */ + @JsonProperty("wrapped_array") @Schema(name = "wrapped_array", required = false) public List getWrappedArray() { @@ -232,6 +208,7 @@ public XmlItem nameString(String nameString) { * Get nameString * @return nameString */ + @JsonProperty("name_string") @Schema(name = "name_string", example = "string", required = false) public String getNameString() { @@ -251,6 +228,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) { * Get nameNumber * @return nameNumber */ + @JsonProperty("name_number") @Valid @Schema(name = "name_number", example = "1.234", required = false) public BigDecimal getNameNumber() { @@ -270,6 +248,7 @@ public XmlItem nameInteger(Integer nameInteger) { * Get nameInteger * @return nameInteger */ + @JsonProperty("name_integer") @Schema(name = "name_integer", example = "-2", required = false) public Integer getNameInteger() { @@ -289,6 +268,7 @@ public XmlItem nameBoolean(Boolean nameBoolean) { * Get nameBoolean * @return nameBoolean */ + @JsonProperty("name_boolean") @Schema(name = "name_boolean", example = "true", required = false) public Boolean getNameBoolean() { @@ -316,6 +296,7 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) { * Get nameArray * @return nameArray */ + @JsonProperty("name_array") @Schema(name = "name_array", required = false) public List getNameArray() { @@ -343,6 +324,7 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) { * Get nameWrappedArray * @return nameWrappedArray */ + @JsonProperty("name_wrapped_array") @Schema(name = "name_wrapped_array", required = false) public List getNameWrappedArray() { @@ -362,6 +344,7 @@ public XmlItem prefixString(String prefixString) { * Get prefixString * @return prefixString */ + @JsonProperty("prefix_string") @Schema(name = "prefix_string", example = "string", required = false) public String getPrefixString() { @@ -381,6 +364,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) { * Get prefixNumber * @return prefixNumber */ + @JsonProperty("prefix_number") @Valid @Schema(name = "prefix_number", example = "1.234", required = false) public BigDecimal getPrefixNumber() { @@ -400,6 +384,7 @@ public XmlItem prefixInteger(Integer prefixInteger) { * Get prefixInteger * @return prefixInteger */ + @JsonProperty("prefix_integer") @Schema(name = "prefix_integer", example = "-2", required = false) public Integer getPrefixInteger() { @@ -419,6 +404,7 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) { * Get prefixBoolean * @return prefixBoolean */ + @JsonProperty("prefix_boolean") @Schema(name = "prefix_boolean", example = "true", required = false) public Boolean getPrefixBoolean() { @@ -446,6 +432,7 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) { * Get prefixArray * @return prefixArray */ + @JsonProperty("prefix_array") @Schema(name = "prefix_array", required = false) public List getPrefixArray() { @@ -473,6 +460,7 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) { * Get prefixWrappedArray * @return prefixWrappedArray */ + @JsonProperty("prefix_wrapped_array") @Schema(name = "prefix_wrapped_array", required = false) public List getPrefixWrappedArray() { @@ -492,6 +480,7 @@ public XmlItem namespaceString(String namespaceString) { * Get namespaceString * @return namespaceString */ + @JsonProperty("namespace_string") @Schema(name = "namespace_string", example = "string", required = false) public String getNamespaceString() { @@ -511,6 +500,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) { * Get namespaceNumber * @return namespaceNumber */ + @JsonProperty("namespace_number") @Valid @Schema(name = "namespace_number", example = "1.234", required = false) public BigDecimal getNamespaceNumber() { @@ -530,6 +520,7 @@ public XmlItem namespaceInteger(Integer namespaceInteger) { * Get namespaceInteger * @return namespaceInteger */ + @JsonProperty("namespace_integer") @Schema(name = "namespace_integer", example = "-2", required = false) public Integer getNamespaceInteger() { @@ -549,6 +540,7 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) { * Get namespaceBoolean * @return namespaceBoolean */ + @JsonProperty("namespace_boolean") @Schema(name = "namespace_boolean", example = "true", required = false) public Boolean getNamespaceBoolean() { @@ -576,6 +568,7 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) { * Get namespaceArray * @return namespaceArray */ + @JsonProperty("namespace_array") @Schema(name = "namespace_array", required = false) public List getNamespaceArray() { @@ -603,6 +596,7 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) { * Get namespaceWrappedArray * @return namespaceWrappedArray */ + @JsonProperty("namespace_wrapped_array") @Schema(name = "namespace_wrapped_array", required = false) public List getNamespaceWrappedArray() { @@ -622,6 +616,7 @@ public XmlItem prefixNsString(String prefixNsString) { * Get prefixNsString * @return prefixNsString */ + @JsonProperty("prefix_ns_string") @Schema(name = "prefix_ns_string", example = "string", required = false) public String getPrefixNsString() { @@ -641,6 +636,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) { * Get prefixNsNumber * @return prefixNsNumber */ + @JsonProperty("prefix_ns_number") @Valid @Schema(name = "prefix_ns_number", example = "1.234", required = false) public BigDecimal getPrefixNsNumber() { @@ -660,6 +656,7 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) { * Get prefixNsInteger * @return prefixNsInteger */ + @JsonProperty("prefix_ns_integer") @Schema(name = "prefix_ns_integer", example = "-2", required = false) public Integer getPrefixNsInteger() { @@ -679,6 +676,7 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) { * Get prefixNsBoolean * @return prefixNsBoolean */ + @JsonProperty("prefix_ns_boolean") @Schema(name = "prefix_ns_boolean", example = "true", required = false) public Boolean getPrefixNsBoolean() { @@ -706,6 +704,7 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) { * Get prefixNsArray * @return prefixNsArray */ + @JsonProperty("prefix_ns_array") @Schema(name = "prefix_ns_array", required = false) public List getPrefixNsArray() { @@ -733,6 +732,7 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) { * Get prefixNsWrappedArray * @return prefixNsWrappedArray */ + @JsonProperty("prefix_ns_wrapped_array") @Schema(name = "prefix_ns_wrapped_array", required = false) public List getPrefixNsWrappedArray() { diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 0d95d7f91b29..e45a52c7a8af 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesAnyType extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesAnyType name(String name) { @@ -35,6 +34,7 @@ public AdditionalPropertiesAnyType name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 0a45cd0d195e..ff8e902ab955 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesArray extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesArray name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesArray name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index c53b449a5070..c21068182c49 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesBoolean extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesBoolean name(String name) { @@ -35,6 +34,7 @@ public AdditionalPropertiesBoolean name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index ae060d44dc4d..c43432f178b1 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -25,45 +25,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesClass { - @JsonProperty("map_string") @Valid private Map mapString = null; - @JsonProperty("map_number") @Valid private Map mapNumber = null; - @JsonProperty("map_integer") @Valid private Map mapInteger = null; - @JsonProperty("map_boolean") @Valid private Map mapBoolean = null; - @JsonProperty("map_array_integer") @Valid private Map> mapArrayInteger = null; - @JsonProperty("map_array_anytype") @Valid private Map> mapArrayAnytype = null; - @JsonProperty("map_map_string") @Valid private Map> mapMapString = null; - @JsonProperty("map_map_anytype") @Valid private Map> mapMapAnytype = null; - @JsonProperty("anytype_1") private Object anytype1; - @JsonProperty("anytype_2") private Object anytype2; - @JsonProperty("anytype_3") private Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { @@ -83,6 +72,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt * Get mapString * @return mapString */ + @JsonProperty("map_string") @Schema(name = "map_string", required = false) public Map getMapString() { @@ -110,6 +100,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * Get mapNumber * @return mapNumber */ + @JsonProperty("map_number") @Valid @Schema(name = "map_number", required = false) public Map getMapNumber() { @@ -137,6 +128,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege * Get mapInteger * @return mapInteger */ + @JsonProperty("map_integer") @Schema(name = "map_integer", required = false) public Map getMapInteger() { @@ -164,6 +156,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea * Get mapBoolean * @return mapBoolean */ + @JsonProperty("map_boolean") @Schema(name = "map_boolean", required = false) public Map getMapBoolean() { @@ -191,6 +184,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { @@ -218,6 +212,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * Get mapArrayAnytype * @return mapArrayAnytype */ + @JsonProperty("map_array_anytype") @Valid @Schema(name = "map_array_anytype", required = false) public Map> getMapArrayAnytype() { @@ -245,6 +240,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { @@ -272,6 +268,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { @@ -291,6 +288,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) { * Get anytype1 * @return anytype1 */ + @JsonProperty("anytype_1") @Schema(name = "anytype_1", required = false) public Object getAnytype1() { @@ -310,6 +308,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) { * Get anytype2 * @return anytype2 */ + @JsonProperty("anytype_2") @Schema(name = "anytype_2", required = false) public Object getAnytype2() { @@ -329,6 +328,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) { * Get anytype3 * @return anytype3 */ + @JsonProperty("anytype_3") @Schema(name = "anytype_3", required = false) public Object getAnytype3() { diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 87a903f3e7f2..d4fe82193e30 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesInteger extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesInteger name(String name) { @@ -35,6 +34,7 @@ public AdditionalPropertiesInteger name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 873d1c9c229e..11f9dda21f3f 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesNumber extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesNumber name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesNumber name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 97827d22d963..ce4f9f1ff862 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesObject extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesObject name(String name) { @@ -35,6 +34,7 @@ public AdditionalPropertiesObject name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 53967d619036..2669a2e08d51 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesString extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesString name(String name) { @@ -35,6 +34,7 @@ public AdditionalPropertiesString name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Animal.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Animal.java index 8b3225fee193..50eb6fe3c62b 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Animal.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Animal.java @@ -38,10 +38,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Animal { - @JsonProperty("className") private String className; - @JsonProperty("color") private String color = "red"; public Animal className(String className) { @@ -53,6 +51,7 @@ public Animal className(String className) { * Get className * @return className */ + @JsonProperty("className") @NotNull @Schema(name = "className", required = true) public String getClassName() { @@ -72,6 +71,7 @@ public Animal color(String color) { * Get color * @return color */ + @JsonProperty("color") @Schema(name = "color", required = false) public String getColor() { diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 4fc6a6447db5..99f5ef3aa439 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfArrayOfNumberOnly { - @JsonProperty("ArrayArrayNumber") @Valid private List> arrayArrayNumber = null; @@ -45,6 +44,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * Get arrayArrayNumber * @return arrayArrayNumber */ + @JsonProperty("ArrayArrayNumber") @Valid @Schema(name = "ArrayArrayNumber", required = false) public List> getArrayArrayNumber() { diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index da4dc071cfdf..563d0dc0f933 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfNumberOnly { - @JsonProperty("ArrayNumber") @Valid private List arrayNumber = null; @@ -45,6 +44,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ + @JsonProperty("ArrayNumber") @Valid @Schema(name = "ArrayNumber", required = false) public List getArrayNumber() { diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayTest.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayTest.java index 03052a955e3b..839cf3ac40ab 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayTest.java @@ -24,15 +24,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayTest { - @JsonProperty("array_of_string") @Valid private List arrayOfString = null; - @JsonProperty("array_array_of_integer") @Valid private List> arrayArrayOfInteger = null; - @JsonProperty("array_array_of_model") @Valid private List> arrayArrayOfModel = null; @@ -53,6 +50,7 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) { * Get arrayOfString * @return arrayOfString */ + @JsonProperty("array_of_string") @Schema(name = "array_of_string", required = false) public List getArrayOfString() { @@ -80,6 +78,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ + @JsonProperty("array_array_of_integer") @Valid @Schema(name = "array_array_of_integer", required = false) public List> getArrayArrayOfInteger() { @@ -107,6 +106,7 @@ public ArrayTest addArrayArrayOfModelItem(List arrayArrayOfModelI * Get arrayArrayOfModel * @return arrayArrayOfModel */ + @JsonProperty("array_array_of_model") @Valid @Schema(name = "array_array_of_model", required = false) public List> getArrayArrayOfModel() { diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCat.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCat.java index 344818cd160a..e0b22753e9e8 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCat.java @@ -66,7 +66,6 @@ public static KindEnum fromValue(String value) { } } - @JsonProperty("kind") private KindEnum kind; public BigCat kind(KindEnum kind) { @@ -78,6 +77,7 @@ public BigCat kind(KindEnum kind) { * Get kind * @return kind */ + @JsonProperty("kind") @Schema(name = "kind", required = false) public KindEnum getKind() { diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCatAllOf.java index 96ddb1f49cd8..3b0788b0b304 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCatAllOf.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCatAllOf.java @@ -63,7 +63,6 @@ public static KindEnum fromValue(String value) { } } - @JsonProperty("kind") private KindEnum kind; public BigCatAllOf kind(KindEnum kind) { @@ -75,6 +74,7 @@ public BigCatAllOf kind(KindEnum kind) { * Get kind * @return kind */ + @JsonProperty("kind") @Schema(name = "kind", required = false) public KindEnum getKind() { diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Capitalization.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Capitalization.java index e7f3b66e4814..7270c14a949f 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Capitalization.java @@ -21,22 +21,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Capitalization { - @JsonProperty("smallCamel") private String smallCamel; - @JsonProperty("CapitalCamel") private String capitalCamel; - @JsonProperty("small_Snake") private String smallSnake; - @JsonProperty("Capital_Snake") private String capitalSnake; - @JsonProperty("SCA_ETH_Flow_Points") private String scAETHFlowPoints; - @JsonProperty("ATT_NAME") private String ATT_NAME; public Capitalization smallCamel(String smallCamel) { @@ -48,6 +42,7 @@ public Capitalization smallCamel(String smallCamel) { * Get smallCamel * @return smallCamel */ + @JsonProperty("smallCamel") @Schema(name = "smallCamel", required = false) public String getSmallCamel() { @@ -67,6 +62,7 @@ public Capitalization capitalCamel(String capitalCamel) { * Get capitalCamel * @return capitalCamel */ + @JsonProperty("CapitalCamel") @Schema(name = "CapitalCamel", required = false) public String getCapitalCamel() { @@ -86,6 +82,7 @@ public Capitalization smallSnake(String smallSnake) { * Get smallSnake * @return smallSnake */ + @JsonProperty("small_Snake") @Schema(name = "small_Snake", required = false) public String getSmallSnake() { @@ -105,6 +102,7 @@ public Capitalization capitalSnake(String capitalSnake) { * Get capitalSnake * @return capitalSnake */ + @JsonProperty("Capital_Snake") @Schema(name = "Capital_Snake", required = false) public String getCapitalSnake() { @@ -124,6 +122,7 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) { * Get scAETHFlowPoints * @return scAETHFlowPoints */ + @JsonProperty("SCA_ETH_Flow_Points") @Schema(name = "SCA_ETH_Flow_Points", required = false) public String getScAETHFlowPoints() { @@ -143,6 +142,7 @@ public Capitalization ATT_NAME(String ATT_NAME) { * Name of the pet * @return ATT_NAME */ + @JsonProperty("ATT_NAME") @Schema(name = "ATT_NAME", description = "Name of the pet ", required = false) public String getATTNAME() { diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Cat.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Cat.java index afce161498ed..d1bb205b11b3 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Cat.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Cat.java @@ -35,7 +35,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Cat extends Animal { - @JsonProperty("declawed") private Boolean declawed; public Cat declawed(Boolean declawed) { @@ -47,6 +46,7 @@ public Cat declawed(Boolean declawed) { * Get declawed * @return declawed */ + @JsonProperty("declawed") @Schema(name = "declawed", required = false) public Boolean getDeclawed() { diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/CatAllOf.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/CatAllOf.java index bc83998fc4d5..b7a7ed5def6a 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/CatAllOf.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/CatAllOf.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class CatAllOf { - @JsonProperty("declawed") private Boolean declawed; public CatAllOf declawed(Boolean declawed) { @@ -35,6 +34,7 @@ public CatAllOf declawed(Boolean declawed) { * Get declawed * @return declawed */ + @JsonProperty("declawed") @Schema(name = "declawed", required = false) public Boolean getDeclawed() { diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Category.java index 586658c922c5..9b1acc5a5c07 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Category.java @@ -21,10 +21,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name = "default-name"; public Category id(Long id) { @@ -36,6 +34,7 @@ public Category id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -55,6 +54,7 @@ public Category name(String name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @Schema(name = "name", required = true) public String getName() { diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ClassModel.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ClassModel.java index d3d25d6df8cd..20f5e2de16dd 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ClassModel.java @@ -22,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ClassModel { - @JsonProperty("_class") private String propertyClass; public ClassModel propertyClass(String propertyClass) { @@ -34,6 +33,7 @@ public ClassModel propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ + @JsonProperty("_class") @Schema(name = "_class", required = false) public String getPropertyClass() { diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Client.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Client.java index 7ed5fbaae188..11ed7ead459c 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Client.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Client.java @@ -21,7 +21,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Client { - @JsonProperty("client") private String client; public Client client(String client) { @@ -33,6 +32,7 @@ public Client client(String client) { * Get client * @return client */ + @JsonProperty("client") @Schema(name = "client", required = false) public String getClient() { diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Dog.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Dog.java index 738b9fbffc6c..b0f901978716 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Dog.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Dog.java @@ -26,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Dog extends Animal { - @JsonProperty("breed") private String breed; public Dog breed(String breed) { @@ -38,6 +37,7 @@ public Dog breed(String breed) { * Get breed * @return breed */ + @JsonProperty("breed") @Schema(name = "breed", required = false) public String getBreed() { diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/DogAllOf.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/DogAllOf.java index fbcd7127e41b..097dc159ee65 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/DogAllOf.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/DogAllOf.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class DogAllOf { - @JsonProperty("breed") private String breed; public DogAllOf breed(String breed) { @@ -35,6 +34,7 @@ public DogAllOf breed(String breed) { * Get breed * @return breed */ + @JsonProperty("breed") @Schema(name = "breed", required = false) public String getBreed() { diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumArrays.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumArrays.java index 3c18fc1189fe..cb84a65b9e1c 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumArrays.java @@ -59,7 +59,6 @@ public static JustSymbolEnum fromValue(String value) { } } - @JsonProperty("just_symbol") private JustSymbolEnum justSymbol; /** @@ -97,7 +96,6 @@ public static ArrayEnumEnum fromValue(String value) { } } - @JsonProperty("array_enum") @Valid private List arrayEnum = null; @@ -110,6 +108,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) { * Get justSymbol * @return justSymbol */ + @JsonProperty("just_symbol") @Schema(name = "just_symbol", required = false) public JustSymbolEnum getJustSymbol() { @@ -137,6 +136,7 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) { * Get arrayEnum * @return arrayEnum */ + @JsonProperty("array_enum") @Schema(name = "array_enum", required = false) public List getArrayEnum() { diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumTest.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumTest.java index dc15f99afe84..2243d0fb1b8b 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumTest.java @@ -62,7 +62,6 @@ public static EnumStringEnum fromValue(String value) { } } - @JsonProperty("enum_string") private EnumStringEnum enumString; /** @@ -102,7 +101,6 @@ public static EnumStringRequiredEnum fromValue(String value) { } } - @JsonProperty("enum_string_required") private EnumStringRequiredEnum enumStringRequired; /** @@ -140,7 +138,6 @@ public static EnumIntegerEnum fromValue(Integer value) { } } - @JsonProperty("enum_integer") private EnumIntegerEnum enumInteger; /** @@ -178,10 +175,8 @@ public static EnumNumberEnum fromValue(Double value) { } } - @JsonProperty("enum_number") private EnumNumberEnum enumNumber; - @JsonProperty("outerEnum") private OuterEnum outerEnum; public EnumTest enumString(EnumStringEnum enumString) { @@ -193,6 +188,7 @@ public EnumTest enumString(EnumStringEnum enumString) { * Get enumString * @return enumString */ + @JsonProperty("enum_string") @Schema(name = "enum_string", required = false) public EnumStringEnum getEnumString() { @@ -212,6 +208,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) { * Get enumStringRequired * @return enumStringRequired */ + @JsonProperty("enum_string_required") @NotNull @Schema(name = "enum_string_required", required = true) public EnumStringRequiredEnum getEnumStringRequired() { @@ -231,6 +228,7 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) { * Get enumInteger * @return enumInteger */ + @JsonProperty("enum_integer") @Schema(name = "enum_integer", required = false) public EnumIntegerEnum getEnumInteger() { @@ -250,6 +248,7 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) { * Get enumNumber * @return enumNumber */ + @JsonProperty("enum_number") @Schema(name = "enum_number", required = false) public EnumNumberEnum getEnumNumber() { @@ -269,6 +268,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) { * Get outerEnum * @return outerEnum */ + @JsonProperty("outerEnum") @Valid @Schema(name = "outerEnum", required = false) public OuterEnum getOuterEnum() { diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/File.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/File.java index d9a8ab4aa1f2..7d0f08137a62 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/File.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/File.java @@ -22,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class File { - @JsonProperty("sourceURI") private String sourceURI; public File sourceURI(String sourceURI) { @@ -34,6 +33,7 @@ public File sourceURI(String sourceURI) { * Test capitalization * @return sourceURI */ + @JsonProperty("sourceURI") @Schema(name = "sourceURI", description = "Test capitalization", required = false) public String getSourceURI() { diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 5794883ff564..50df4bf463a8 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -24,10 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FileSchemaTestClass { - @JsonProperty("file") private File file; - @JsonProperty("files") @Valid private List files = null; @@ -40,6 +38,7 @@ public FileSchemaTestClass file(File file) { * Get file * @return file */ + @JsonProperty("file") @Valid @Schema(name = "file", required = false) public File getFile() { @@ -67,6 +66,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) { * Get files * @return files */ + @JsonProperty("files") @Valid @Schema(name = "files", required = false) public List getFiles() { 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 c4bacc257a36..c9ae6ace8274 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 @@ -29,48 +29,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FormatTest { - @JsonProperty("integer") private Integer integer; - @JsonProperty("int32") private Integer int32; - @JsonProperty("int64") private Long int64; - @JsonProperty("number") private BigDecimal number; - @JsonProperty("float") private Float _float; - @JsonProperty("double") private Double _double; - @JsonProperty("string") private String string; - @JsonProperty("byte") private byte[] _byte; - @JsonProperty("binary") private org.springframework.core.io.Resource binary; - @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("password") private String password; - @JsonProperty("BigDecimal") private BigDecimal bigDecimal; public FormatTest integer(Integer integer) { @@ -84,6 +70,7 @@ public FormatTest integer(Integer integer) { * maximum: 100 * @return integer */ + @JsonProperty("integer") @Min(10) @Max(100) @Schema(name = "integer", required = false) public Integer getInteger() { @@ -105,6 +92,7 @@ public FormatTest int32(Integer int32) { * maximum: 200 * @return int32 */ + @JsonProperty("int32") @Min(20) @Max(200) @Schema(name = "int32", required = false) public Integer getInt32() { @@ -124,6 +112,7 @@ public FormatTest int64(Long int64) { * Get int64 * @return int64 */ + @JsonProperty("int64") @Schema(name = "int64", required = false) public Long getInt64() { @@ -145,6 +134,7 @@ public FormatTest number(BigDecimal number) { * maximum: 543.2 * @return number */ + @JsonProperty("number") @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") @Schema(name = "number", required = true) public BigDecimal getNumber() { @@ -166,6 +156,7 @@ public FormatTest _float(Float _float) { * maximum: 987.6 * @return _float */ + @JsonProperty("float") @DecimalMin("54.3") @DecimalMax("987.6") @Schema(name = "float", required = false) public Float getFloat() { @@ -187,6 +178,7 @@ public FormatTest _double(Double _double) { * maximum: 123.4 * @return _double */ + @JsonProperty("double") @DecimalMin("67.8") @DecimalMax("123.4") @Schema(name = "double", required = false) public Double getDouble() { @@ -206,6 +198,7 @@ public FormatTest string(String string) { * Get string * @return string */ + @JsonProperty("string") @Pattern(regexp = "/[a-z]/i") @Schema(name = "string", required = false) public String getString() { @@ -225,6 +218,7 @@ public FormatTest _byte(byte[] _byte) { * Get _byte * @return _byte */ + @JsonProperty("byte") @NotNull @Schema(name = "byte", required = true) public byte[] getByte() { @@ -244,6 +238,7 @@ public FormatTest binary(org.springframework.core.io.Resource binary) { * Get binary * @return binary */ + @JsonProperty("binary") @Valid @Schema(name = "binary", required = false) public org.springframework.core.io.Resource getBinary() { @@ -263,6 +258,7 @@ public FormatTest date(LocalDate date) { * Get date * @return date */ + @JsonProperty("date") @NotNull @Valid @Schema(name = "date", required = true) public LocalDate getDate() { @@ -282,6 +278,7 @@ public FormatTest dateTime(OffsetDateTime dateTime) { * Get dateTime * @return dateTime */ + @JsonProperty("dateTime") @Valid @Schema(name = "dateTime", required = false) public OffsetDateTime getDateTime() { @@ -301,6 +298,7 @@ public FormatTest uuid(UUID uuid) { * Get uuid * @return uuid */ + @JsonProperty("uuid") @Valid @Schema(name = "uuid", example = "72f98069-206d-4f12-9f12-3d1e525a8e84", required = false) public UUID getUuid() { @@ -320,6 +318,7 @@ public FormatTest password(String password) { * Get password * @return password */ + @JsonProperty("password") @NotNull @Size(min = 10, max = 64) @Schema(name = "password", required = true) public String getPassword() { @@ -339,6 +338,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) { * Get bigDecimal * @return bigDecimal */ + @JsonProperty("BigDecimal") @Valid @Schema(name = "BigDecimal", required = false) public BigDecimal getBigDecimal() { diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index d817048f2a75..aa8c3ee2514a 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -23,10 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class HasOnlyReadOnly { - @JsonProperty("bar") private String bar; - @JsonProperty("foo") private String foo; public HasOnlyReadOnly bar(String bar) { @@ -38,6 +36,7 @@ public HasOnlyReadOnly bar(String bar) { * Get bar * @return bar */ + @JsonProperty("bar") @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, required = false) public String getBar() { @@ -57,6 +56,7 @@ public HasOnlyReadOnly foo(String foo) { * Get foo * @return foo */ + @JsonProperty("foo") @Schema(name = "foo", accessMode = Schema.AccessMode.READ_ONLY, required = false) public String getFoo() { diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MapTest.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MapTest.java index 55a10cdf8d08..594021c36d2d 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MapTest.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MapTest { - @JsonProperty("map_map_of_string") @Valid private Map> mapMapOfString = null; @@ -63,15 +62,12 @@ public static InnerEnum fromValue(String value) { } } - @JsonProperty("map_of_enum_string") @Valid private Map mapOfEnumString = null; - @JsonProperty("direct_map") @Valid private Map directMap = null; - @JsonProperty("indirect_map") @Valid private Map indirectMap = null; @@ -92,6 +88,7 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapMapOfString * @return mapMapOfString */ + @JsonProperty("map_map_of_string") @Valid @Schema(name = "map_map_of_string", required = false) public Map> getMapMapOfString() { @@ -119,6 +116,7 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) * Get mapOfEnumString * @return mapOfEnumString */ + @JsonProperty("map_of_enum_string") @Schema(name = "map_of_enum_string", required = false) public Map getMapOfEnumString() { @@ -146,6 +144,7 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) { * Get directMap * @return directMap */ + @JsonProperty("direct_map") @Schema(name = "direct_map", required = false) public Map getDirectMap() { @@ -173,6 +172,7 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) { * Get indirectMap * @return indirectMap */ + @JsonProperty("indirect_map") @Schema(name = "indirect_map", required = false) public Map getIndirectMap() { diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index d58ed97c15d2..af4644ee1fd8 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -27,14 +27,11 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("map") @Valid private Map map = null; @@ -47,6 +44,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { * Get uuid * @return uuid */ + @JsonProperty("uuid") @Valid @Schema(name = "uuid", required = false) public UUID getUuid() { @@ -66,6 +64,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT * Get dateTime * @return dateTime */ + @JsonProperty("dateTime") @Valid @Schema(name = "dateTime", required = false) public OffsetDateTime getDateTime() { @@ -93,6 +92,7 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * Get map * @return map */ + @JsonProperty("map") @Valid @Schema(name = "map", required = false) public Map getMap() { diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Model200Response.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Model200Response.java index 80ff3f1fc638..329840fd1cd5 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Model200Response.java @@ -24,10 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Model200Response { - @JsonProperty("name") private Integer name; - @JsonProperty("class") private String propertyClass; public Model200Response name(Integer name) { @@ -39,6 +37,7 @@ public Model200Response name(Integer name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public Integer getName() { @@ -58,6 +57,7 @@ public Model200Response propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ + @JsonProperty("class") @Schema(name = "class", required = false) public String getPropertyClass() { diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java index ed829bcb62cd..14ea90b13917 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -23,13 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -41,6 +38,7 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ + @JsonProperty("code") @Schema(name = "code", required = false) public Integer getCode() { @@ -60,6 +58,7 @@ public ModelApiResponse type(String type) { * Get type * @return type */ + @JsonProperty("type") @Schema(name = "type", required = false) public String getType() { @@ -79,6 +78,7 @@ public ModelApiResponse message(String message) { * Get message * @return message */ + @JsonProperty("message") @Schema(name = "message", required = false) public String getMessage() { diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelList.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelList.java index 56e79c554452..1e0bcffc220c 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelList.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelList { - @JsonProperty("123-list") private String _123list; public ModelList _123list(String _123list) { @@ -35,6 +34,7 @@ public ModelList _123list(String _123list) { * Get _123list * @return _123list */ + @JsonProperty("123-list") @Schema(name = "123-list", required = false) public String get123list() { diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelReturn.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelReturn.java index d95ce3f15491..90b17a6d6850 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelReturn.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelReturn { - @JsonProperty("return") private Integer _return; public ModelReturn _return(Integer _return) { @@ -36,6 +35,7 @@ public ModelReturn _return(Integer _return) { * Get _return * @return _return */ + @JsonProperty("return") @Schema(name = "return", required = false) public Integer getReturn() { diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Name.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Name.java index 32cec75d981d..bcbb5aab0f79 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Name.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Name.java @@ -22,16 +22,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Name { - @JsonProperty("name") private Integer name; - @JsonProperty("snake_case") private Integer snakeCase; - @JsonProperty("property") private String property; - @JsonProperty("123Number") private Integer _123number; public Name name(Integer name) { @@ -43,6 +39,7 @@ public Name name(Integer name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @Schema(name = "name", required = true) public Integer getName() { @@ -62,6 +59,7 @@ public Name snakeCase(Integer snakeCase) { * Get snakeCase * @return snakeCase */ + @JsonProperty("snake_case") @Schema(name = "snake_case", accessMode = Schema.AccessMode.READ_ONLY, required = false) public Integer getSnakeCase() { @@ -81,6 +79,7 @@ public Name property(String property) { * Get property * @return property */ + @JsonProperty("property") @Schema(name = "property", required = false) public String getProperty() { @@ -100,6 +99,7 @@ public Name _123number(Integer _123number) { * Get _123number * @return _123number */ + @JsonProperty("123Number") @Schema(name = "123Number", accessMode = Schema.AccessMode.READ_ONLY, required = false) public Integer get123number() { diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NumberOnly.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NumberOnly.java index 14fb6641f919..a597943a3ef7 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NumberOnly.java @@ -22,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class NumberOnly { - @JsonProperty("JustNumber") private BigDecimal justNumber; public NumberOnly justNumber(BigDecimal justNumber) { @@ -34,6 +33,7 @@ public NumberOnly justNumber(BigDecimal justNumber) { * Get justNumber * @return justNumber */ + @JsonProperty("JustNumber") @Valid @Schema(name = "JustNumber", required = false) public BigDecimal getJustNumber() { diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Order.java index 9b54a719dbae..10e257004cf9 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Order.java @@ -24,16 +24,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -74,10 +70,8 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -89,6 +83,7 @@ public Order id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -108,6 +103,7 @@ public Order petId(Long petId) { * Get petId * @return petId */ + @JsonProperty("petId") @Schema(name = "petId", required = false) public Long getPetId() { @@ -127,6 +123,7 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ + @JsonProperty("quantity") @Schema(name = "quantity", required = false) public Integer getQuantity() { @@ -146,6 +143,7 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ + @JsonProperty("shipDate") @Valid @Schema(name = "shipDate", required = false) public OffsetDateTime getShipDate() { @@ -165,6 +163,7 @@ public Order status(StatusEnum status) { * Order Status * @return status */ + @JsonProperty("status") @Schema(name = "status", description = "Order Status", required = false) public StatusEnum getStatus() { @@ -184,6 +183,7 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ + @JsonProperty("complete") @Schema(name = "complete", required = false) public Boolean getComplete() { diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/OuterComposite.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/OuterComposite.java index 461f98baa866..da3403158231 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/OuterComposite.java @@ -22,13 +22,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class OuterComposite { - @JsonProperty("my_number") private BigDecimal myNumber; - @JsonProperty("my_string") private String myString; - @JsonProperty("my_boolean") private Boolean myBoolean; public OuterComposite myNumber(BigDecimal myNumber) { @@ -40,6 +37,7 @@ public OuterComposite myNumber(BigDecimal myNumber) { * Get myNumber * @return myNumber */ + @JsonProperty("my_number") @Valid @Schema(name = "my_number", required = false) public BigDecimal getMyNumber() { @@ -59,6 +57,7 @@ public OuterComposite myString(String myString) { * Get myString * @return myString */ + @JsonProperty("my_string") @Schema(name = "my_string", required = false) public String getMyString() { @@ -78,6 +77,7 @@ public OuterComposite myBoolean(Boolean myBoolean) { * Get myBoolean * @return myBoolean */ + @JsonProperty("my_boolean") @Schema(name = "my_boolean", required = false) public Boolean getMyBoolean() { diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java index c137885adb7f..edfea99a4441 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java @@ -29,20 +29,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private Set photoUrls = new LinkedHashSet<>(); - @JsonProperty("tags") @Valid private List tags = null; @@ -83,7 +78,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; public Pet id(Long id) { @@ -95,6 +89,7 @@ public Pet id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -114,6 +109,7 @@ public Pet category(Category category) { * Get category * @return category */ + @JsonProperty("category") @Valid @Schema(name = "category", required = false) public Category getCategory() { @@ -133,6 +129,7 @@ public Pet name(String name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @Schema(name = "name", example = "doggie", required = true) public String getName() { @@ -157,6 +154,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ + @JsonProperty("photoUrls") @NotNull @Schema(name = "photoUrls", required = true) public Set getPhotoUrls() { @@ -185,6 +183,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ + @JsonProperty("tags") @Valid @Schema(name = "tags", required = false) public List getTags() { @@ -204,6 +203,7 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ + @JsonProperty("status") @Schema(name = "status", description = "pet status in the store", required = false) public StatusEnum getStatus() { diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java index 39862919e7c7..5bb864fdfdf9 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -21,10 +21,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ReadOnlyFirst { - @JsonProperty("bar") private String bar; - @JsonProperty("baz") private String baz; public ReadOnlyFirst bar(String bar) { @@ -36,6 +34,7 @@ public ReadOnlyFirst bar(String bar) { * Get bar * @return bar */ + @JsonProperty("bar") @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, required = false) public String getBar() { @@ -55,6 +54,7 @@ public ReadOnlyFirst baz(String baz) { * Get baz * @return baz */ + @JsonProperty("baz") @Schema(name = "baz", required = false) public String getBaz() { diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/SpecialModelName.java index fb431f59071a..d30f01ffd4ce 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/SpecialModelName.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class SpecialModelName { - @JsonProperty("$special[property.name]") private Long $specialPropertyName; public SpecialModelName $specialPropertyName(Long $specialPropertyName) { @@ -35,6 +34,7 @@ public class SpecialModelName { * Get $specialPropertyName * @return $specialPropertyName */ + @JsonProperty("$special[property.name]") @Schema(name = "$special[property.name]", required = false) public Long get$SpecialPropertyName() { diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Tag.java index 75f3df1d0e17..7e0f150664d9 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Tag.java @@ -21,10 +21,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -36,6 +34,7 @@ public Tag id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -55,6 +54,7 @@ public Tag name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java index 4d939d69a1e7..151d7623b25f 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -24,19 +24,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderDefault { - @JsonProperty("string_item") private String stringItem = "what"; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem = true; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -49,6 +44,7 @@ public TypeHolderDefault stringItem(String stringItem) { * Get stringItem * @return stringItem */ + @JsonProperty("string_item") @NotNull @Schema(name = "string_item", required = true) public String getStringItem() { @@ -68,6 +64,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ + @JsonProperty("number_item") @NotNull @Valid @Schema(name = "number_item", required = true) public BigDecimal getNumberItem() { @@ -87,6 +84,7 @@ public TypeHolderDefault integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ + @JsonProperty("integer_item") @NotNull @Schema(name = "integer_item", required = true) public Integer getIntegerItem() { @@ -106,6 +104,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ + @JsonProperty("bool_item") @NotNull @Schema(name = "bool_item", required = true) public Boolean getBoolItem() { @@ -130,6 +129,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ + @JsonProperty("array_item") @NotNull @Schema(name = "array_item", required = true) public List getArrayItem() { diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java index c9b40aac5fa1..7239836800df 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -24,22 +24,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderExample { - @JsonProperty("string_item") private String stringItem; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("float_item") private Float floatItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -52,6 +46,7 @@ public TypeHolderExample stringItem(String stringItem) { * Get stringItem * @return stringItem */ + @JsonProperty("string_item") @NotNull @Schema(name = "string_item", example = "what", required = true) public String getStringItem() { @@ -71,6 +66,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ + @JsonProperty("number_item") @NotNull @Valid @Schema(name = "number_item", example = "1.234", required = true) public BigDecimal getNumberItem() { @@ -90,6 +86,7 @@ public TypeHolderExample floatItem(Float floatItem) { * Get floatItem * @return floatItem */ + @JsonProperty("float_item") @NotNull @Schema(name = "float_item", example = "1.234", required = true) public Float getFloatItem() { @@ -109,6 +106,7 @@ public TypeHolderExample integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ + @JsonProperty("integer_item") @NotNull @Schema(name = "integer_item", example = "-2", required = true) public Integer getIntegerItem() { @@ -128,6 +126,7 @@ public TypeHolderExample boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ + @JsonProperty("bool_item") @NotNull @Schema(name = "bool_item", example = "true", required = true) public Boolean getBoolItem() { @@ -152,6 +151,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ + @JsonProperty("array_item") @NotNull @Schema(name = "array_item", example = "[0, 1, 2, 3]", required = true) public List getArrayItem() { diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/User.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/User.java index 9df36d407748..eb52ac9bab84 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/User.java @@ -21,28 +21,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -54,6 +46,7 @@ public User id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -73,6 +66,7 @@ public User username(String username) { * Get username * @return username */ + @JsonProperty("username") @Schema(name = "username", required = false) public String getUsername() { @@ -92,6 +86,7 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ + @JsonProperty("firstName") @Schema(name = "firstName", required = false) public String getFirstName() { @@ -111,6 +106,7 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ + @JsonProperty("lastName") @Schema(name = "lastName", required = false) public String getLastName() { @@ -130,6 +126,7 @@ public User email(String email) { * Get email * @return email */ + @JsonProperty("email") @Schema(name = "email", required = false) public String getEmail() { @@ -149,6 +146,7 @@ public User password(String password) { * Get password * @return password */ + @JsonProperty("password") @Schema(name = "password", required = false) public String getPassword() { @@ -168,6 +166,7 @@ public User phone(String phone) { * Get phone * @return phone */ + @JsonProperty("phone") @Schema(name = "phone", required = false) public String getPhone() { @@ -187,6 +186,7 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ + @JsonProperty("userStatus") @Schema(name = "userStatus", description = "User Status", required = false) public Integer getUserStatus() { diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/XmlItem.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/XmlItem.java index 3b3593e71797..4b287492cc75 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/XmlItem.java @@ -24,99 +24,70 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class XmlItem { - @JsonProperty("attribute_string") private String attributeString; - @JsonProperty("attribute_number") private BigDecimal attributeNumber; - @JsonProperty("attribute_integer") private Integer attributeInteger; - @JsonProperty("attribute_boolean") private Boolean attributeBoolean; - @JsonProperty("wrapped_array") @Valid private List wrappedArray = null; - @JsonProperty("name_string") private String nameString; - @JsonProperty("name_number") private BigDecimal nameNumber; - @JsonProperty("name_integer") private Integer nameInteger; - @JsonProperty("name_boolean") private Boolean nameBoolean; - @JsonProperty("name_array") @Valid private List nameArray = null; - @JsonProperty("name_wrapped_array") @Valid private List nameWrappedArray = null; - @JsonProperty("prefix_string") private String prefixString; - @JsonProperty("prefix_number") private BigDecimal prefixNumber; - @JsonProperty("prefix_integer") private Integer prefixInteger; - @JsonProperty("prefix_boolean") private Boolean prefixBoolean; - @JsonProperty("prefix_array") @Valid private List prefixArray = null; - @JsonProperty("prefix_wrapped_array") @Valid private List prefixWrappedArray = null; - @JsonProperty("namespace_string") private String namespaceString; - @JsonProperty("namespace_number") private BigDecimal namespaceNumber; - @JsonProperty("namespace_integer") private Integer namespaceInteger; - @JsonProperty("namespace_boolean") private Boolean namespaceBoolean; - @JsonProperty("namespace_array") @Valid private List namespaceArray = null; - @JsonProperty("namespace_wrapped_array") @Valid private List namespaceWrappedArray = null; - @JsonProperty("prefix_ns_string") private String prefixNsString; - @JsonProperty("prefix_ns_number") private BigDecimal prefixNsNumber; - @JsonProperty("prefix_ns_integer") private Integer prefixNsInteger; - @JsonProperty("prefix_ns_boolean") private Boolean prefixNsBoolean; - @JsonProperty("prefix_ns_array") @Valid private List prefixNsArray = null; - @JsonProperty("prefix_ns_wrapped_array") @Valid private List prefixNsWrappedArray = null; @@ -129,6 +100,7 @@ public XmlItem attributeString(String attributeString) { * Get attributeString * @return attributeString */ + @JsonProperty("attribute_string") @Schema(name = "attribute_string", example = "string", required = false) public String getAttributeString() { @@ -148,6 +120,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) { * Get attributeNumber * @return attributeNumber */ + @JsonProperty("attribute_number") @Valid @Schema(name = "attribute_number", example = "1.234", required = false) public BigDecimal getAttributeNumber() { @@ -167,6 +140,7 @@ public XmlItem attributeInteger(Integer attributeInteger) { * Get attributeInteger * @return attributeInteger */ + @JsonProperty("attribute_integer") @Schema(name = "attribute_integer", example = "-2", required = false) public Integer getAttributeInteger() { @@ -186,6 +160,7 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) { * Get attributeBoolean * @return attributeBoolean */ + @JsonProperty("attribute_boolean") @Schema(name = "attribute_boolean", example = "true", required = false) public Boolean getAttributeBoolean() { @@ -213,6 +188,7 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) { * Get wrappedArray * @return wrappedArray */ + @JsonProperty("wrapped_array") @Schema(name = "wrapped_array", required = false) public List getWrappedArray() { @@ -232,6 +208,7 @@ public XmlItem nameString(String nameString) { * Get nameString * @return nameString */ + @JsonProperty("name_string") @Schema(name = "name_string", example = "string", required = false) public String getNameString() { @@ -251,6 +228,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) { * Get nameNumber * @return nameNumber */ + @JsonProperty("name_number") @Valid @Schema(name = "name_number", example = "1.234", required = false) public BigDecimal getNameNumber() { @@ -270,6 +248,7 @@ public XmlItem nameInteger(Integer nameInteger) { * Get nameInteger * @return nameInteger */ + @JsonProperty("name_integer") @Schema(name = "name_integer", example = "-2", required = false) public Integer getNameInteger() { @@ -289,6 +268,7 @@ public XmlItem nameBoolean(Boolean nameBoolean) { * Get nameBoolean * @return nameBoolean */ + @JsonProperty("name_boolean") @Schema(name = "name_boolean", example = "true", required = false) public Boolean getNameBoolean() { @@ -316,6 +296,7 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) { * Get nameArray * @return nameArray */ + @JsonProperty("name_array") @Schema(name = "name_array", required = false) public List getNameArray() { @@ -343,6 +324,7 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) { * Get nameWrappedArray * @return nameWrappedArray */ + @JsonProperty("name_wrapped_array") @Schema(name = "name_wrapped_array", required = false) public List getNameWrappedArray() { @@ -362,6 +344,7 @@ public XmlItem prefixString(String prefixString) { * Get prefixString * @return prefixString */ + @JsonProperty("prefix_string") @Schema(name = "prefix_string", example = "string", required = false) public String getPrefixString() { @@ -381,6 +364,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) { * Get prefixNumber * @return prefixNumber */ + @JsonProperty("prefix_number") @Valid @Schema(name = "prefix_number", example = "1.234", required = false) public BigDecimal getPrefixNumber() { @@ -400,6 +384,7 @@ public XmlItem prefixInteger(Integer prefixInteger) { * Get prefixInteger * @return prefixInteger */ + @JsonProperty("prefix_integer") @Schema(name = "prefix_integer", example = "-2", required = false) public Integer getPrefixInteger() { @@ -419,6 +404,7 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) { * Get prefixBoolean * @return prefixBoolean */ + @JsonProperty("prefix_boolean") @Schema(name = "prefix_boolean", example = "true", required = false) public Boolean getPrefixBoolean() { @@ -446,6 +432,7 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) { * Get prefixArray * @return prefixArray */ + @JsonProperty("prefix_array") @Schema(name = "prefix_array", required = false) public List getPrefixArray() { @@ -473,6 +460,7 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) { * Get prefixWrappedArray * @return prefixWrappedArray */ + @JsonProperty("prefix_wrapped_array") @Schema(name = "prefix_wrapped_array", required = false) public List getPrefixWrappedArray() { @@ -492,6 +480,7 @@ public XmlItem namespaceString(String namespaceString) { * Get namespaceString * @return namespaceString */ + @JsonProperty("namespace_string") @Schema(name = "namespace_string", example = "string", required = false) public String getNamespaceString() { @@ -511,6 +500,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) { * Get namespaceNumber * @return namespaceNumber */ + @JsonProperty("namespace_number") @Valid @Schema(name = "namespace_number", example = "1.234", required = false) public BigDecimal getNamespaceNumber() { @@ -530,6 +520,7 @@ public XmlItem namespaceInteger(Integer namespaceInteger) { * Get namespaceInteger * @return namespaceInteger */ + @JsonProperty("namespace_integer") @Schema(name = "namespace_integer", example = "-2", required = false) public Integer getNamespaceInteger() { @@ -549,6 +540,7 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) { * Get namespaceBoolean * @return namespaceBoolean */ + @JsonProperty("namespace_boolean") @Schema(name = "namespace_boolean", example = "true", required = false) public Boolean getNamespaceBoolean() { @@ -576,6 +568,7 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) { * Get namespaceArray * @return namespaceArray */ + @JsonProperty("namespace_array") @Schema(name = "namespace_array", required = false) public List getNamespaceArray() { @@ -603,6 +596,7 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) { * Get namespaceWrappedArray * @return namespaceWrappedArray */ + @JsonProperty("namespace_wrapped_array") @Schema(name = "namespace_wrapped_array", required = false) public List getNamespaceWrappedArray() { @@ -622,6 +616,7 @@ public XmlItem prefixNsString(String prefixNsString) { * Get prefixNsString * @return prefixNsString */ + @JsonProperty("prefix_ns_string") @Schema(name = "prefix_ns_string", example = "string", required = false) public String getPrefixNsString() { @@ -641,6 +636,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) { * Get prefixNsNumber * @return prefixNsNumber */ + @JsonProperty("prefix_ns_number") @Valid @Schema(name = "prefix_ns_number", example = "1.234", required = false) public BigDecimal getPrefixNsNumber() { @@ -660,6 +656,7 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) { * Get prefixNsInteger * @return prefixNsInteger */ + @JsonProperty("prefix_ns_integer") @Schema(name = "prefix_ns_integer", example = "-2", required = false) public Integer getPrefixNsInteger() { @@ -679,6 +676,7 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) { * Get prefixNsBoolean * @return prefixNsBoolean */ + @JsonProperty("prefix_ns_boolean") @Schema(name = "prefix_ns_boolean", example = "true", required = false) public Boolean getPrefixNsBoolean() { @@ -706,6 +704,7 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) { * Get prefixNsArray * @return prefixNsArray */ + @JsonProperty("prefix_ns_array") @Schema(name = "prefix_ns_array", required = false) public List getPrefixNsArray() { @@ -733,6 +732,7 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) { * Get prefixNsWrappedArray * @return prefixNsWrappedArray */ + @JsonProperty("prefix_ns_wrapped_array") @Schema(name = "prefix_ns_wrapped_array", required = false) public List getPrefixNsWrappedArray() { diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Category.java index 0d2e56dfa3d9..870578890cac 100644 --- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Category.java @@ -20,10 +20,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Category id(Long id) { @@ -35,6 +33,7 @@ public Category id(Long id) { * Get id * @return id */ + @JsonProperty("id") public Long getId() { return id; @@ -53,6 +52,7 @@ public Category name(String name) { * Get name * @return name */ + @JsonProperty("name") @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") public String getName() { return name; diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/ModelApiResponse.java index f66ed8b59413..6fb2e932dade 100644 --- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -22,13 +22,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -40,6 +37,7 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ + @JsonProperty("code") public Integer getCode() { return code; @@ -58,6 +56,7 @@ public ModelApiResponse type(String type) { * Get type * @return type */ + @JsonProperty("type") public String getType() { return type; @@ -76,6 +75,7 @@ public ModelApiResponse message(String message) { * Get message * @return message */ + @JsonProperty("message") public String getMessage() { return message; diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Order.java index aafcfc0cc192..55aefcfb7441 100644 --- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Order.java @@ -23,16 +23,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -73,10 +69,8 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -88,6 +82,7 @@ public Order id(Long id) { * Get id * @return id */ + @JsonProperty("id") public Long getId() { return id; @@ -106,6 +101,7 @@ public Order petId(Long petId) { * Get petId * @return petId */ + @JsonProperty("petId") public Long getPetId() { return petId; @@ -124,6 +120,7 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ + @JsonProperty("quantity") public Integer getQuantity() { return quantity; @@ -142,6 +139,7 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ + @JsonProperty("shipDate") @Valid public OffsetDateTime getShipDate() { return shipDate; @@ -160,6 +158,7 @@ public Order status(StatusEnum status) { * Order Status * @return status */ + @JsonProperty("status") public StatusEnum getStatus() { return status; @@ -178,6 +177,7 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ + @JsonProperty("complete") public Boolean getComplete() { return complete; diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Pet.java index c857f5804afd..0180283859c6 100644 --- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Pet.java @@ -25,20 +25,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private List photoUrls = new ArrayList<>(); - @JsonProperty("tags") @Valid private List tags = null; @@ -79,7 +74,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; public Pet id(Long id) { @@ -91,6 +85,7 @@ public Pet id(Long id) { * Get id * @return id */ + @JsonProperty("id") public Long getId() { return id; @@ -109,6 +104,7 @@ public Pet category(Category category) { * Get category * @return category */ + @JsonProperty("category") @Valid public Category getCategory() { return category; @@ -127,6 +123,7 @@ public Pet name(String name) { * Get name * @return name */ + @JsonProperty("name") @NotNull public String getName() { return name; @@ -150,6 +147,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ + @JsonProperty("photoUrls") @NotNull public List getPhotoUrls() { return photoUrls; @@ -176,6 +174,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ + @JsonProperty("tags") @Valid public List getTags() { return tags; @@ -194,6 +193,7 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ + @JsonProperty("status") public StatusEnum getStatus() { return status; diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Tag.java index 32f55514e089..430014eecc26 100644 --- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Tag.java @@ -20,10 +20,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -35,6 +33,7 @@ public Tag id(Long id) { * Get id * @return id */ + @JsonProperty("id") public Long getId() { return id; @@ -53,6 +52,7 @@ public Tag name(String name) { * Get name * @return name */ + @JsonProperty("name") public String getName() { return name; diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/User.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/User.java index 16f35830e845..6e3daf33b33c 100644 --- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/User.java @@ -20,28 +20,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -53,6 +45,7 @@ public User id(Long id) { * Get id * @return id */ + @JsonProperty("id") public Long getId() { return id; @@ -71,6 +64,7 @@ public User username(String username) { * Get username * @return username */ + @JsonProperty("username") public String getUsername() { return username; @@ -89,6 +83,7 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ + @JsonProperty("firstName") public String getFirstName() { return firstName; @@ -107,6 +102,7 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ + @JsonProperty("lastName") public String getLastName() { return lastName; @@ -125,6 +121,7 @@ public User email(String email) { * Get email * @return email */ + @JsonProperty("email") public String getEmail() { return email; @@ -143,6 +140,7 @@ public User password(String password) { * Get password * @return password */ + @JsonProperty("password") public String getPassword() { return password; @@ -161,6 +159,7 @@ public User phone(String phone) { * Get phone * @return phone */ + @JsonProperty("phone") public String getPhone() { return phone; @@ -179,6 +178,7 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 0d95d7f91b29..e45a52c7a8af 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesAnyType extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesAnyType name(String name) { @@ -35,6 +34,7 @@ public AdditionalPropertiesAnyType name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 0a45cd0d195e..ff8e902ab955 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesArray extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesArray name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesArray name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index c53b449a5070..c21068182c49 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesBoolean extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesBoolean name(String name) { @@ -35,6 +34,7 @@ public AdditionalPropertiesBoolean name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index ae060d44dc4d..c43432f178b1 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -25,45 +25,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesClass { - @JsonProperty("map_string") @Valid private Map mapString = null; - @JsonProperty("map_number") @Valid private Map mapNumber = null; - @JsonProperty("map_integer") @Valid private Map mapInteger = null; - @JsonProperty("map_boolean") @Valid private Map mapBoolean = null; - @JsonProperty("map_array_integer") @Valid private Map> mapArrayInteger = null; - @JsonProperty("map_array_anytype") @Valid private Map> mapArrayAnytype = null; - @JsonProperty("map_map_string") @Valid private Map> mapMapString = null; - @JsonProperty("map_map_anytype") @Valid private Map> mapMapAnytype = null; - @JsonProperty("anytype_1") private Object anytype1; - @JsonProperty("anytype_2") private Object anytype2; - @JsonProperty("anytype_3") private Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { @@ -83,6 +72,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt * Get mapString * @return mapString */ + @JsonProperty("map_string") @Schema(name = "map_string", required = false) public Map getMapString() { @@ -110,6 +100,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * Get mapNumber * @return mapNumber */ + @JsonProperty("map_number") @Valid @Schema(name = "map_number", required = false) public Map getMapNumber() { @@ -137,6 +128,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege * Get mapInteger * @return mapInteger */ + @JsonProperty("map_integer") @Schema(name = "map_integer", required = false) public Map getMapInteger() { @@ -164,6 +156,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea * Get mapBoolean * @return mapBoolean */ + @JsonProperty("map_boolean") @Schema(name = "map_boolean", required = false) public Map getMapBoolean() { @@ -191,6 +184,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { @@ -218,6 +212,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * Get mapArrayAnytype * @return mapArrayAnytype */ + @JsonProperty("map_array_anytype") @Valid @Schema(name = "map_array_anytype", required = false) public Map> getMapArrayAnytype() { @@ -245,6 +240,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { @@ -272,6 +268,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { @@ -291,6 +288,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) { * Get anytype1 * @return anytype1 */ + @JsonProperty("anytype_1") @Schema(name = "anytype_1", required = false) public Object getAnytype1() { @@ -310,6 +308,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) { * Get anytype2 * @return anytype2 */ + @JsonProperty("anytype_2") @Schema(name = "anytype_2", required = false) public Object getAnytype2() { @@ -329,6 +328,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) { * Get anytype3 * @return anytype3 */ + @JsonProperty("anytype_3") @Schema(name = "anytype_3", required = false) public Object getAnytype3() { diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 87a903f3e7f2..d4fe82193e30 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesInteger extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesInteger name(String name) { @@ -35,6 +34,7 @@ public AdditionalPropertiesInteger name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 873d1c9c229e..11f9dda21f3f 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesNumber extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesNumber name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesNumber name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 97827d22d963..ce4f9f1ff862 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesObject extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesObject name(String name) { @@ -35,6 +34,7 @@ public AdditionalPropertiesObject name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 53967d619036..2669a2e08d51 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesString extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesString name(String name) { @@ -35,6 +34,7 @@ public AdditionalPropertiesString name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Animal.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Animal.java index 8b3225fee193..50eb6fe3c62b 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Animal.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Animal.java @@ -38,10 +38,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Animal { - @JsonProperty("className") private String className; - @JsonProperty("color") private String color = "red"; public Animal className(String className) { @@ -53,6 +51,7 @@ public Animal className(String className) { * Get className * @return className */ + @JsonProperty("className") @NotNull @Schema(name = "className", required = true) public String getClassName() { @@ -72,6 +71,7 @@ public Animal color(String color) { * Get color * @return color */ + @JsonProperty("color") @Schema(name = "color", required = false) public String getColor() { diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 4fc6a6447db5..99f5ef3aa439 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfArrayOfNumberOnly { - @JsonProperty("ArrayArrayNumber") @Valid private List> arrayArrayNumber = null; @@ -45,6 +44,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * Get arrayArrayNumber * @return arrayArrayNumber */ + @JsonProperty("ArrayArrayNumber") @Valid @Schema(name = "ArrayArrayNumber", required = false) public List> getArrayArrayNumber() { diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index da4dc071cfdf..563d0dc0f933 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfNumberOnly { - @JsonProperty("ArrayNumber") @Valid private List arrayNumber = null; @@ -45,6 +44,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ + @JsonProperty("ArrayNumber") @Valid @Schema(name = "ArrayNumber", required = false) public List getArrayNumber() { diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java index 03052a955e3b..839cf3ac40ab 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java @@ -24,15 +24,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayTest { - @JsonProperty("array_of_string") @Valid private List arrayOfString = null; - @JsonProperty("array_array_of_integer") @Valid private List> arrayArrayOfInteger = null; - @JsonProperty("array_array_of_model") @Valid private List> arrayArrayOfModel = null; @@ -53,6 +50,7 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) { * Get arrayOfString * @return arrayOfString */ + @JsonProperty("array_of_string") @Schema(name = "array_of_string", required = false) public List getArrayOfString() { @@ -80,6 +78,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ + @JsonProperty("array_array_of_integer") @Valid @Schema(name = "array_array_of_integer", required = false) public List> getArrayArrayOfInteger() { @@ -107,6 +106,7 @@ public ArrayTest addArrayArrayOfModelItem(List arrayArrayOfModelI * Get arrayArrayOfModel * @return arrayArrayOfModel */ + @JsonProperty("array_array_of_model") @Valid @Schema(name = "array_array_of_model", required = false) public List> getArrayArrayOfModel() { diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java index 344818cd160a..e0b22753e9e8 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java @@ -66,7 +66,6 @@ public static KindEnum fromValue(String value) { } } - @JsonProperty("kind") private KindEnum kind; public BigCat kind(KindEnum kind) { @@ -78,6 +77,7 @@ public BigCat kind(KindEnum kind) { * Get kind * @return kind */ + @JsonProperty("kind") @Schema(name = "kind", required = false) public KindEnum getKind() { diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCatAllOf.java index 96ddb1f49cd8..3b0788b0b304 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCatAllOf.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCatAllOf.java @@ -63,7 +63,6 @@ public static KindEnum fromValue(String value) { } } - @JsonProperty("kind") private KindEnum kind; public BigCatAllOf kind(KindEnum kind) { @@ -75,6 +74,7 @@ public BigCatAllOf kind(KindEnum kind) { * Get kind * @return kind */ + @JsonProperty("kind") @Schema(name = "kind", required = false) public KindEnum getKind() { diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Capitalization.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Capitalization.java index e7f3b66e4814..7270c14a949f 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Capitalization.java @@ -21,22 +21,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Capitalization { - @JsonProperty("smallCamel") private String smallCamel; - @JsonProperty("CapitalCamel") private String capitalCamel; - @JsonProperty("small_Snake") private String smallSnake; - @JsonProperty("Capital_Snake") private String capitalSnake; - @JsonProperty("SCA_ETH_Flow_Points") private String scAETHFlowPoints; - @JsonProperty("ATT_NAME") private String ATT_NAME; public Capitalization smallCamel(String smallCamel) { @@ -48,6 +42,7 @@ public Capitalization smallCamel(String smallCamel) { * Get smallCamel * @return smallCamel */ + @JsonProperty("smallCamel") @Schema(name = "smallCamel", required = false) public String getSmallCamel() { @@ -67,6 +62,7 @@ public Capitalization capitalCamel(String capitalCamel) { * Get capitalCamel * @return capitalCamel */ + @JsonProperty("CapitalCamel") @Schema(name = "CapitalCamel", required = false) public String getCapitalCamel() { @@ -86,6 +82,7 @@ public Capitalization smallSnake(String smallSnake) { * Get smallSnake * @return smallSnake */ + @JsonProperty("small_Snake") @Schema(name = "small_Snake", required = false) public String getSmallSnake() { @@ -105,6 +102,7 @@ public Capitalization capitalSnake(String capitalSnake) { * Get capitalSnake * @return capitalSnake */ + @JsonProperty("Capital_Snake") @Schema(name = "Capital_Snake", required = false) public String getCapitalSnake() { @@ -124,6 +122,7 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) { * Get scAETHFlowPoints * @return scAETHFlowPoints */ + @JsonProperty("SCA_ETH_Flow_Points") @Schema(name = "SCA_ETH_Flow_Points", required = false) public String getScAETHFlowPoints() { @@ -143,6 +142,7 @@ public Capitalization ATT_NAME(String ATT_NAME) { * Name of the pet * @return ATT_NAME */ + @JsonProperty("ATT_NAME") @Schema(name = "ATT_NAME", description = "Name of the pet ", required = false) public String getATTNAME() { diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java index afce161498ed..d1bb205b11b3 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java @@ -35,7 +35,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Cat extends Animal { - @JsonProperty("declawed") private Boolean declawed; public Cat declawed(Boolean declawed) { @@ -47,6 +46,7 @@ public Cat declawed(Boolean declawed) { * Get declawed * @return declawed */ + @JsonProperty("declawed") @Schema(name = "declawed", required = false) public Boolean getDeclawed() { diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/CatAllOf.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/CatAllOf.java index bc83998fc4d5..b7a7ed5def6a 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/CatAllOf.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/CatAllOf.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class CatAllOf { - @JsonProperty("declawed") private Boolean declawed; public CatAllOf declawed(Boolean declawed) { @@ -35,6 +34,7 @@ public CatAllOf declawed(Boolean declawed) { * Get declawed * @return declawed */ + @JsonProperty("declawed") @Schema(name = "declawed", required = false) public Boolean getDeclawed() { diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Category.java index 586658c922c5..9b1acc5a5c07 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Category.java @@ -21,10 +21,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name = "default-name"; public Category id(Long id) { @@ -36,6 +34,7 @@ public Category id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -55,6 +54,7 @@ public Category name(String name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @Schema(name = "name", required = true) public String getName() { diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ClassModel.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ClassModel.java index d3d25d6df8cd..20f5e2de16dd 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ClassModel.java @@ -22,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ClassModel { - @JsonProperty("_class") private String propertyClass; public ClassModel propertyClass(String propertyClass) { @@ -34,6 +33,7 @@ public ClassModel propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ + @JsonProperty("_class") @Schema(name = "_class", required = false) public String getPropertyClass() { diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Client.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Client.java index 7ed5fbaae188..11ed7ead459c 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Client.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Client.java @@ -21,7 +21,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Client { - @JsonProperty("client") private String client; public Client client(String client) { @@ -33,6 +32,7 @@ public Client client(String client) { * Get client * @return client */ + @JsonProperty("client") @Schema(name = "client", required = false) public String getClient() { diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Dog.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Dog.java index 738b9fbffc6c..b0f901978716 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Dog.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Dog.java @@ -26,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Dog extends Animal { - @JsonProperty("breed") private String breed; public Dog breed(String breed) { @@ -38,6 +37,7 @@ public Dog breed(String breed) { * Get breed * @return breed */ + @JsonProperty("breed") @Schema(name = "breed", required = false) public String getBreed() { diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/DogAllOf.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/DogAllOf.java index fbcd7127e41b..097dc159ee65 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/DogAllOf.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/DogAllOf.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class DogAllOf { - @JsonProperty("breed") private String breed; public DogAllOf breed(String breed) { @@ -35,6 +34,7 @@ public DogAllOf breed(String breed) { * Get breed * @return breed */ + @JsonProperty("breed") @Schema(name = "breed", required = false) public String getBreed() { diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java index 3c18fc1189fe..cb84a65b9e1c 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java @@ -59,7 +59,6 @@ public static JustSymbolEnum fromValue(String value) { } } - @JsonProperty("just_symbol") private JustSymbolEnum justSymbol; /** @@ -97,7 +96,6 @@ public static ArrayEnumEnum fromValue(String value) { } } - @JsonProperty("array_enum") @Valid private List arrayEnum = null; @@ -110,6 +108,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) { * Get justSymbol * @return justSymbol */ + @JsonProperty("just_symbol") @Schema(name = "just_symbol", required = false) public JustSymbolEnum getJustSymbol() { @@ -137,6 +136,7 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) { * Get arrayEnum * @return arrayEnum */ + @JsonProperty("array_enum") @Schema(name = "array_enum", required = false) public List getArrayEnum() { diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java index dc15f99afe84..2243d0fb1b8b 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java @@ -62,7 +62,6 @@ public static EnumStringEnum fromValue(String value) { } } - @JsonProperty("enum_string") private EnumStringEnum enumString; /** @@ -102,7 +101,6 @@ public static EnumStringRequiredEnum fromValue(String value) { } } - @JsonProperty("enum_string_required") private EnumStringRequiredEnum enumStringRequired; /** @@ -140,7 +138,6 @@ public static EnumIntegerEnum fromValue(Integer value) { } } - @JsonProperty("enum_integer") private EnumIntegerEnum enumInteger; /** @@ -178,10 +175,8 @@ public static EnumNumberEnum fromValue(Double value) { } } - @JsonProperty("enum_number") private EnumNumberEnum enumNumber; - @JsonProperty("outerEnum") private OuterEnum outerEnum; public EnumTest enumString(EnumStringEnum enumString) { @@ -193,6 +188,7 @@ public EnumTest enumString(EnumStringEnum enumString) { * Get enumString * @return enumString */ + @JsonProperty("enum_string") @Schema(name = "enum_string", required = false) public EnumStringEnum getEnumString() { @@ -212,6 +208,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) { * Get enumStringRequired * @return enumStringRequired */ + @JsonProperty("enum_string_required") @NotNull @Schema(name = "enum_string_required", required = true) public EnumStringRequiredEnum getEnumStringRequired() { @@ -231,6 +228,7 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) { * Get enumInteger * @return enumInteger */ + @JsonProperty("enum_integer") @Schema(name = "enum_integer", required = false) public EnumIntegerEnum getEnumInteger() { @@ -250,6 +248,7 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) { * Get enumNumber * @return enumNumber */ + @JsonProperty("enum_number") @Schema(name = "enum_number", required = false) public EnumNumberEnum getEnumNumber() { @@ -269,6 +268,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) { * Get outerEnum * @return outerEnum */ + @JsonProperty("outerEnum") @Valid @Schema(name = "outerEnum", required = false) public OuterEnum getOuterEnum() { diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/File.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/File.java index d9a8ab4aa1f2..7d0f08137a62 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/File.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/File.java @@ -22,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class File { - @JsonProperty("sourceURI") private String sourceURI; public File sourceURI(String sourceURI) { @@ -34,6 +33,7 @@ public File sourceURI(String sourceURI) { * Test capitalization * @return sourceURI */ + @JsonProperty("sourceURI") @Schema(name = "sourceURI", description = "Test capitalization", required = false) public String getSourceURI() { diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 5794883ff564..50df4bf463a8 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -24,10 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FileSchemaTestClass { - @JsonProperty("file") private File file; - @JsonProperty("files") @Valid private List files = null; @@ -40,6 +38,7 @@ public FileSchemaTestClass file(File file) { * Get file * @return file */ + @JsonProperty("file") @Valid @Schema(name = "file", required = false) public File getFile() { @@ -67,6 +66,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) { * Get files * @return files */ + @JsonProperty("files") @Valid @Schema(name = "files", required = false) public List getFiles() { 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 c4bacc257a36..c9ae6ace8274 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 @@ -29,48 +29,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FormatTest { - @JsonProperty("integer") private Integer integer; - @JsonProperty("int32") private Integer int32; - @JsonProperty("int64") private Long int64; - @JsonProperty("number") private BigDecimal number; - @JsonProperty("float") private Float _float; - @JsonProperty("double") private Double _double; - @JsonProperty("string") private String string; - @JsonProperty("byte") private byte[] _byte; - @JsonProperty("binary") private org.springframework.core.io.Resource binary; - @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("password") private String password; - @JsonProperty("BigDecimal") private BigDecimal bigDecimal; public FormatTest integer(Integer integer) { @@ -84,6 +70,7 @@ public FormatTest integer(Integer integer) { * maximum: 100 * @return integer */ + @JsonProperty("integer") @Min(10) @Max(100) @Schema(name = "integer", required = false) public Integer getInteger() { @@ -105,6 +92,7 @@ public FormatTest int32(Integer int32) { * maximum: 200 * @return int32 */ + @JsonProperty("int32") @Min(20) @Max(200) @Schema(name = "int32", required = false) public Integer getInt32() { @@ -124,6 +112,7 @@ public FormatTest int64(Long int64) { * Get int64 * @return int64 */ + @JsonProperty("int64") @Schema(name = "int64", required = false) public Long getInt64() { @@ -145,6 +134,7 @@ public FormatTest number(BigDecimal number) { * maximum: 543.2 * @return number */ + @JsonProperty("number") @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") @Schema(name = "number", required = true) public BigDecimal getNumber() { @@ -166,6 +156,7 @@ public FormatTest _float(Float _float) { * maximum: 987.6 * @return _float */ + @JsonProperty("float") @DecimalMin("54.3") @DecimalMax("987.6") @Schema(name = "float", required = false) public Float getFloat() { @@ -187,6 +178,7 @@ public FormatTest _double(Double _double) { * maximum: 123.4 * @return _double */ + @JsonProperty("double") @DecimalMin("67.8") @DecimalMax("123.4") @Schema(name = "double", required = false) public Double getDouble() { @@ -206,6 +198,7 @@ public FormatTest string(String string) { * Get string * @return string */ + @JsonProperty("string") @Pattern(regexp = "/[a-z]/i") @Schema(name = "string", required = false) public String getString() { @@ -225,6 +218,7 @@ public FormatTest _byte(byte[] _byte) { * Get _byte * @return _byte */ + @JsonProperty("byte") @NotNull @Schema(name = "byte", required = true) public byte[] getByte() { @@ -244,6 +238,7 @@ public FormatTest binary(org.springframework.core.io.Resource binary) { * Get binary * @return binary */ + @JsonProperty("binary") @Valid @Schema(name = "binary", required = false) public org.springframework.core.io.Resource getBinary() { @@ -263,6 +258,7 @@ public FormatTest date(LocalDate date) { * Get date * @return date */ + @JsonProperty("date") @NotNull @Valid @Schema(name = "date", required = true) public LocalDate getDate() { @@ -282,6 +278,7 @@ public FormatTest dateTime(OffsetDateTime dateTime) { * Get dateTime * @return dateTime */ + @JsonProperty("dateTime") @Valid @Schema(name = "dateTime", required = false) public OffsetDateTime getDateTime() { @@ -301,6 +298,7 @@ public FormatTest uuid(UUID uuid) { * Get uuid * @return uuid */ + @JsonProperty("uuid") @Valid @Schema(name = "uuid", example = "72f98069-206d-4f12-9f12-3d1e525a8e84", required = false) public UUID getUuid() { @@ -320,6 +318,7 @@ public FormatTest password(String password) { * Get password * @return password */ + @JsonProperty("password") @NotNull @Size(min = 10, max = 64) @Schema(name = "password", required = true) public String getPassword() { @@ -339,6 +338,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) { * Get bigDecimal * @return bigDecimal */ + @JsonProperty("BigDecimal") @Valid @Schema(name = "BigDecimal", required = false) public BigDecimal getBigDecimal() { diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index d817048f2a75..aa8c3ee2514a 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -23,10 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class HasOnlyReadOnly { - @JsonProperty("bar") private String bar; - @JsonProperty("foo") private String foo; public HasOnlyReadOnly bar(String bar) { @@ -38,6 +36,7 @@ public HasOnlyReadOnly bar(String bar) { * Get bar * @return bar */ + @JsonProperty("bar") @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, required = false) public String getBar() { @@ -57,6 +56,7 @@ public HasOnlyReadOnly foo(String foo) { * Get foo * @return foo */ + @JsonProperty("foo") @Schema(name = "foo", accessMode = Schema.AccessMode.READ_ONLY, required = false) public String getFoo() { diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MapTest.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MapTest.java index 55a10cdf8d08..594021c36d2d 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MapTest.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MapTest { - @JsonProperty("map_map_of_string") @Valid private Map> mapMapOfString = null; @@ -63,15 +62,12 @@ public static InnerEnum fromValue(String value) { } } - @JsonProperty("map_of_enum_string") @Valid private Map mapOfEnumString = null; - @JsonProperty("direct_map") @Valid private Map directMap = null; - @JsonProperty("indirect_map") @Valid private Map indirectMap = null; @@ -92,6 +88,7 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapMapOfString * @return mapMapOfString */ + @JsonProperty("map_map_of_string") @Valid @Schema(name = "map_map_of_string", required = false) public Map> getMapMapOfString() { @@ -119,6 +116,7 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) * Get mapOfEnumString * @return mapOfEnumString */ + @JsonProperty("map_of_enum_string") @Schema(name = "map_of_enum_string", required = false) public Map getMapOfEnumString() { @@ -146,6 +144,7 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) { * Get directMap * @return directMap */ + @JsonProperty("direct_map") @Schema(name = "direct_map", required = false) public Map getDirectMap() { @@ -173,6 +172,7 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) { * Get indirectMap * @return indirectMap */ + @JsonProperty("indirect_map") @Schema(name = "indirect_map", required = false) public Map getIndirectMap() { diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index d58ed97c15d2..af4644ee1fd8 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -27,14 +27,11 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("map") @Valid private Map map = null; @@ -47,6 +44,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { * Get uuid * @return uuid */ + @JsonProperty("uuid") @Valid @Schema(name = "uuid", required = false) public UUID getUuid() { @@ -66,6 +64,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT * Get dateTime * @return dateTime */ + @JsonProperty("dateTime") @Valid @Schema(name = "dateTime", required = false) public OffsetDateTime getDateTime() { @@ -93,6 +92,7 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * Get map * @return map */ + @JsonProperty("map") @Valid @Schema(name = "map", required = false) public Map getMap() { diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Model200Response.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Model200Response.java index 80ff3f1fc638..329840fd1cd5 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Model200Response.java @@ -24,10 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Model200Response { - @JsonProperty("name") private Integer name; - @JsonProperty("class") private String propertyClass; public Model200Response name(Integer name) { @@ -39,6 +37,7 @@ public Model200Response name(Integer name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public Integer getName() { @@ -58,6 +57,7 @@ public Model200Response propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ + @JsonProperty("class") @Schema(name = "class", required = false) public String getPropertyClass() { diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelApiResponse.java index ed829bcb62cd..14ea90b13917 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -23,13 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -41,6 +38,7 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ + @JsonProperty("code") @Schema(name = "code", required = false) public Integer getCode() { @@ -60,6 +58,7 @@ public ModelApiResponse type(String type) { * Get type * @return type */ + @JsonProperty("type") @Schema(name = "type", required = false) public String getType() { @@ -79,6 +78,7 @@ public ModelApiResponse message(String message) { * Get message * @return message */ + @JsonProperty("message") @Schema(name = "message", required = false) public String getMessage() { diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelList.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelList.java index 56e79c554452..1e0bcffc220c 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelList.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelList { - @JsonProperty("123-list") private String _123list; public ModelList _123list(String _123list) { @@ -35,6 +34,7 @@ public ModelList _123list(String _123list) { * Get _123list * @return _123list */ + @JsonProperty("123-list") @Schema(name = "123-list", required = false) public String get123list() { diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelReturn.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelReturn.java index d95ce3f15491..90b17a6d6850 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelReturn.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelReturn { - @JsonProperty("return") private Integer _return; public ModelReturn _return(Integer _return) { @@ -36,6 +35,7 @@ public ModelReturn _return(Integer _return) { * Get _return * @return _return */ + @JsonProperty("return") @Schema(name = "return", required = false) public Integer getReturn() { diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Name.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Name.java index 32cec75d981d..bcbb5aab0f79 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Name.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Name.java @@ -22,16 +22,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Name { - @JsonProperty("name") private Integer name; - @JsonProperty("snake_case") private Integer snakeCase; - @JsonProperty("property") private String property; - @JsonProperty("123Number") private Integer _123number; public Name name(Integer name) { @@ -43,6 +39,7 @@ public Name name(Integer name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @Schema(name = "name", required = true) public Integer getName() { @@ -62,6 +59,7 @@ public Name snakeCase(Integer snakeCase) { * Get snakeCase * @return snakeCase */ + @JsonProperty("snake_case") @Schema(name = "snake_case", accessMode = Schema.AccessMode.READ_ONLY, required = false) public Integer getSnakeCase() { @@ -81,6 +79,7 @@ public Name property(String property) { * Get property * @return property */ + @JsonProperty("property") @Schema(name = "property", required = false) public String getProperty() { @@ -100,6 +99,7 @@ public Name _123number(Integer _123number) { * Get _123number * @return _123number */ + @JsonProperty("123Number") @Schema(name = "123Number", accessMode = Schema.AccessMode.READ_ONLY, required = false) public Integer get123number() { diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NumberOnly.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NumberOnly.java index 14fb6641f919..a597943a3ef7 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NumberOnly.java @@ -22,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class NumberOnly { - @JsonProperty("JustNumber") private BigDecimal justNumber; public NumberOnly justNumber(BigDecimal justNumber) { @@ -34,6 +33,7 @@ public NumberOnly justNumber(BigDecimal justNumber) { * Get justNumber * @return justNumber */ + @JsonProperty("JustNumber") @Valid @Schema(name = "JustNumber", required = false) public BigDecimal getJustNumber() { diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Order.java index 9b54a719dbae..10e257004cf9 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Order.java @@ -24,16 +24,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -74,10 +70,8 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -89,6 +83,7 @@ public Order id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -108,6 +103,7 @@ public Order petId(Long petId) { * Get petId * @return petId */ + @JsonProperty("petId") @Schema(name = "petId", required = false) public Long getPetId() { @@ -127,6 +123,7 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ + @JsonProperty("quantity") @Schema(name = "quantity", required = false) public Integer getQuantity() { @@ -146,6 +143,7 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ + @JsonProperty("shipDate") @Valid @Schema(name = "shipDate", required = false) public OffsetDateTime getShipDate() { @@ -165,6 +163,7 @@ public Order status(StatusEnum status) { * Order Status * @return status */ + @JsonProperty("status") @Schema(name = "status", description = "Order Status", required = false) public StatusEnum getStatus() { @@ -184,6 +183,7 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ + @JsonProperty("complete") @Schema(name = "complete", required = false) public Boolean getComplete() { diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/OuterComposite.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/OuterComposite.java index 461f98baa866..da3403158231 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/OuterComposite.java @@ -22,13 +22,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class OuterComposite { - @JsonProperty("my_number") private BigDecimal myNumber; - @JsonProperty("my_string") private String myString; - @JsonProperty("my_boolean") private Boolean myBoolean; public OuterComposite myNumber(BigDecimal myNumber) { @@ -40,6 +37,7 @@ public OuterComposite myNumber(BigDecimal myNumber) { * Get myNumber * @return myNumber */ + @JsonProperty("my_number") @Valid @Schema(name = "my_number", required = false) public BigDecimal getMyNumber() { @@ -59,6 +57,7 @@ public OuterComposite myString(String myString) { * Get myString * @return myString */ + @JsonProperty("my_string") @Schema(name = "my_string", required = false) public String getMyString() { @@ -78,6 +77,7 @@ public OuterComposite myBoolean(Boolean myBoolean) { * Get myBoolean * @return myBoolean */ + @JsonProperty("my_boolean") @Schema(name = "my_boolean", required = false) public Boolean getMyBoolean() { diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java index c137885adb7f..edfea99a4441 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java @@ -29,20 +29,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private Set photoUrls = new LinkedHashSet<>(); - @JsonProperty("tags") @Valid private List tags = null; @@ -83,7 +78,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; public Pet id(Long id) { @@ -95,6 +89,7 @@ public Pet id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -114,6 +109,7 @@ public Pet category(Category category) { * Get category * @return category */ + @JsonProperty("category") @Valid @Schema(name = "category", required = false) public Category getCategory() { @@ -133,6 +129,7 @@ public Pet name(String name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @Schema(name = "name", example = "doggie", required = true) public String getName() { @@ -157,6 +154,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ + @JsonProperty("photoUrls") @NotNull @Schema(name = "photoUrls", required = true) public Set getPhotoUrls() { @@ -185,6 +183,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ + @JsonProperty("tags") @Valid @Schema(name = "tags", required = false) public List getTags() { @@ -204,6 +203,7 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ + @JsonProperty("status") @Schema(name = "status", description = "pet status in the store", required = false) public StatusEnum getStatus() { diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ReadOnlyFirst.java index 39862919e7c7..5bb864fdfdf9 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -21,10 +21,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ReadOnlyFirst { - @JsonProperty("bar") private String bar; - @JsonProperty("baz") private String baz; public ReadOnlyFirst bar(String bar) { @@ -36,6 +34,7 @@ public ReadOnlyFirst bar(String bar) { * Get bar * @return bar */ + @JsonProperty("bar") @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, required = false) public String getBar() { @@ -55,6 +54,7 @@ public ReadOnlyFirst baz(String baz) { * Get baz * @return baz */ + @JsonProperty("baz") @Schema(name = "baz", required = false) public String getBaz() { diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/SpecialModelName.java index fb431f59071a..d30f01ffd4ce 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/SpecialModelName.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class SpecialModelName { - @JsonProperty("$special[property.name]") private Long $specialPropertyName; public SpecialModelName $specialPropertyName(Long $specialPropertyName) { @@ -35,6 +34,7 @@ public class SpecialModelName { * Get $specialPropertyName * @return $specialPropertyName */ + @JsonProperty("$special[property.name]") @Schema(name = "$special[property.name]", required = false) public Long get$SpecialPropertyName() { diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Tag.java index 75f3df1d0e17..7e0f150664d9 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Tag.java @@ -21,10 +21,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -36,6 +34,7 @@ public Tag id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -55,6 +54,7 @@ public Tag name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java index 4d939d69a1e7..151d7623b25f 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -24,19 +24,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderDefault { - @JsonProperty("string_item") private String stringItem = "what"; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem = true; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -49,6 +44,7 @@ public TypeHolderDefault stringItem(String stringItem) { * Get stringItem * @return stringItem */ + @JsonProperty("string_item") @NotNull @Schema(name = "string_item", required = true) public String getStringItem() { @@ -68,6 +64,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ + @JsonProperty("number_item") @NotNull @Valid @Schema(name = "number_item", required = true) public BigDecimal getNumberItem() { @@ -87,6 +84,7 @@ public TypeHolderDefault integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ + @JsonProperty("integer_item") @NotNull @Schema(name = "integer_item", required = true) public Integer getIntegerItem() { @@ -106,6 +104,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ + @JsonProperty("bool_item") @NotNull @Schema(name = "bool_item", required = true) public Boolean getBoolItem() { @@ -130,6 +129,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ + @JsonProperty("array_item") @NotNull @Schema(name = "array_item", required = true) public List getArrayItem() { diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java index c9b40aac5fa1..7239836800df 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -24,22 +24,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderExample { - @JsonProperty("string_item") private String stringItem; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("float_item") private Float floatItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -52,6 +46,7 @@ public TypeHolderExample stringItem(String stringItem) { * Get stringItem * @return stringItem */ + @JsonProperty("string_item") @NotNull @Schema(name = "string_item", example = "what", required = true) public String getStringItem() { @@ -71,6 +66,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ + @JsonProperty("number_item") @NotNull @Valid @Schema(name = "number_item", example = "1.234", required = true) public BigDecimal getNumberItem() { @@ -90,6 +86,7 @@ public TypeHolderExample floatItem(Float floatItem) { * Get floatItem * @return floatItem */ + @JsonProperty("float_item") @NotNull @Schema(name = "float_item", example = "1.234", required = true) public Float getFloatItem() { @@ -109,6 +106,7 @@ public TypeHolderExample integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ + @JsonProperty("integer_item") @NotNull @Schema(name = "integer_item", example = "-2", required = true) public Integer getIntegerItem() { @@ -128,6 +126,7 @@ public TypeHolderExample boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ + @JsonProperty("bool_item") @NotNull @Schema(name = "bool_item", example = "true", required = true) public Boolean getBoolItem() { @@ -152,6 +151,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ + @JsonProperty("array_item") @NotNull @Schema(name = "array_item", example = "[0, 1, 2, 3]", required = true) public List getArrayItem() { diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/User.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/User.java index 9df36d407748..eb52ac9bab84 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/User.java @@ -21,28 +21,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -54,6 +46,7 @@ public User id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -73,6 +66,7 @@ public User username(String username) { * Get username * @return username */ + @JsonProperty("username") @Schema(name = "username", required = false) public String getUsername() { @@ -92,6 +86,7 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ + @JsonProperty("firstName") @Schema(name = "firstName", required = false) public String getFirstName() { @@ -111,6 +106,7 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ + @JsonProperty("lastName") @Schema(name = "lastName", required = false) public String getLastName() { @@ -130,6 +126,7 @@ public User email(String email) { * Get email * @return email */ + @JsonProperty("email") @Schema(name = "email", required = false) public String getEmail() { @@ -149,6 +146,7 @@ public User password(String password) { * Get password * @return password */ + @JsonProperty("password") @Schema(name = "password", required = false) public String getPassword() { @@ -168,6 +166,7 @@ public User phone(String phone) { * Get phone * @return phone */ + @JsonProperty("phone") @Schema(name = "phone", required = false) public String getPhone() { @@ -187,6 +186,7 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ + @JsonProperty("userStatus") @Schema(name = "userStatus", description = "User Status", required = false) public Integer getUserStatus() { diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java index 3b3593e71797..4b287492cc75 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java @@ -24,99 +24,70 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class XmlItem { - @JsonProperty("attribute_string") private String attributeString; - @JsonProperty("attribute_number") private BigDecimal attributeNumber; - @JsonProperty("attribute_integer") private Integer attributeInteger; - @JsonProperty("attribute_boolean") private Boolean attributeBoolean; - @JsonProperty("wrapped_array") @Valid private List wrappedArray = null; - @JsonProperty("name_string") private String nameString; - @JsonProperty("name_number") private BigDecimal nameNumber; - @JsonProperty("name_integer") private Integer nameInteger; - @JsonProperty("name_boolean") private Boolean nameBoolean; - @JsonProperty("name_array") @Valid private List nameArray = null; - @JsonProperty("name_wrapped_array") @Valid private List nameWrappedArray = null; - @JsonProperty("prefix_string") private String prefixString; - @JsonProperty("prefix_number") private BigDecimal prefixNumber; - @JsonProperty("prefix_integer") private Integer prefixInteger; - @JsonProperty("prefix_boolean") private Boolean prefixBoolean; - @JsonProperty("prefix_array") @Valid private List prefixArray = null; - @JsonProperty("prefix_wrapped_array") @Valid private List prefixWrappedArray = null; - @JsonProperty("namespace_string") private String namespaceString; - @JsonProperty("namespace_number") private BigDecimal namespaceNumber; - @JsonProperty("namespace_integer") private Integer namespaceInteger; - @JsonProperty("namespace_boolean") private Boolean namespaceBoolean; - @JsonProperty("namespace_array") @Valid private List namespaceArray = null; - @JsonProperty("namespace_wrapped_array") @Valid private List namespaceWrappedArray = null; - @JsonProperty("prefix_ns_string") private String prefixNsString; - @JsonProperty("prefix_ns_number") private BigDecimal prefixNsNumber; - @JsonProperty("prefix_ns_integer") private Integer prefixNsInteger; - @JsonProperty("prefix_ns_boolean") private Boolean prefixNsBoolean; - @JsonProperty("prefix_ns_array") @Valid private List prefixNsArray = null; - @JsonProperty("prefix_ns_wrapped_array") @Valid private List prefixNsWrappedArray = null; @@ -129,6 +100,7 @@ public XmlItem attributeString(String attributeString) { * Get attributeString * @return attributeString */ + @JsonProperty("attribute_string") @Schema(name = "attribute_string", example = "string", required = false) public String getAttributeString() { @@ -148,6 +120,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) { * Get attributeNumber * @return attributeNumber */ + @JsonProperty("attribute_number") @Valid @Schema(name = "attribute_number", example = "1.234", required = false) public BigDecimal getAttributeNumber() { @@ -167,6 +140,7 @@ public XmlItem attributeInteger(Integer attributeInteger) { * Get attributeInteger * @return attributeInteger */ + @JsonProperty("attribute_integer") @Schema(name = "attribute_integer", example = "-2", required = false) public Integer getAttributeInteger() { @@ -186,6 +160,7 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) { * Get attributeBoolean * @return attributeBoolean */ + @JsonProperty("attribute_boolean") @Schema(name = "attribute_boolean", example = "true", required = false) public Boolean getAttributeBoolean() { @@ -213,6 +188,7 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) { * Get wrappedArray * @return wrappedArray */ + @JsonProperty("wrapped_array") @Schema(name = "wrapped_array", required = false) public List getWrappedArray() { @@ -232,6 +208,7 @@ public XmlItem nameString(String nameString) { * Get nameString * @return nameString */ + @JsonProperty("name_string") @Schema(name = "name_string", example = "string", required = false) public String getNameString() { @@ -251,6 +228,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) { * Get nameNumber * @return nameNumber */ + @JsonProperty("name_number") @Valid @Schema(name = "name_number", example = "1.234", required = false) public BigDecimal getNameNumber() { @@ -270,6 +248,7 @@ public XmlItem nameInteger(Integer nameInteger) { * Get nameInteger * @return nameInteger */ + @JsonProperty("name_integer") @Schema(name = "name_integer", example = "-2", required = false) public Integer getNameInteger() { @@ -289,6 +268,7 @@ public XmlItem nameBoolean(Boolean nameBoolean) { * Get nameBoolean * @return nameBoolean */ + @JsonProperty("name_boolean") @Schema(name = "name_boolean", example = "true", required = false) public Boolean getNameBoolean() { @@ -316,6 +296,7 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) { * Get nameArray * @return nameArray */ + @JsonProperty("name_array") @Schema(name = "name_array", required = false) public List getNameArray() { @@ -343,6 +324,7 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) { * Get nameWrappedArray * @return nameWrappedArray */ + @JsonProperty("name_wrapped_array") @Schema(name = "name_wrapped_array", required = false) public List getNameWrappedArray() { @@ -362,6 +344,7 @@ public XmlItem prefixString(String prefixString) { * Get prefixString * @return prefixString */ + @JsonProperty("prefix_string") @Schema(name = "prefix_string", example = "string", required = false) public String getPrefixString() { @@ -381,6 +364,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) { * Get prefixNumber * @return prefixNumber */ + @JsonProperty("prefix_number") @Valid @Schema(name = "prefix_number", example = "1.234", required = false) public BigDecimal getPrefixNumber() { @@ -400,6 +384,7 @@ public XmlItem prefixInteger(Integer prefixInteger) { * Get prefixInteger * @return prefixInteger */ + @JsonProperty("prefix_integer") @Schema(name = "prefix_integer", example = "-2", required = false) public Integer getPrefixInteger() { @@ -419,6 +404,7 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) { * Get prefixBoolean * @return prefixBoolean */ + @JsonProperty("prefix_boolean") @Schema(name = "prefix_boolean", example = "true", required = false) public Boolean getPrefixBoolean() { @@ -446,6 +432,7 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) { * Get prefixArray * @return prefixArray */ + @JsonProperty("prefix_array") @Schema(name = "prefix_array", required = false) public List getPrefixArray() { @@ -473,6 +460,7 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) { * Get prefixWrappedArray * @return prefixWrappedArray */ + @JsonProperty("prefix_wrapped_array") @Schema(name = "prefix_wrapped_array", required = false) public List getPrefixWrappedArray() { @@ -492,6 +480,7 @@ public XmlItem namespaceString(String namespaceString) { * Get namespaceString * @return namespaceString */ + @JsonProperty("namespace_string") @Schema(name = "namespace_string", example = "string", required = false) public String getNamespaceString() { @@ -511,6 +500,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) { * Get namespaceNumber * @return namespaceNumber */ + @JsonProperty("namespace_number") @Valid @Schema(name = "namespace_number", example = "1.234", required = false) public BigDecimal getNamespaceNumber() { @@ -530,6 +520,7 @@ public XmlItem namespaceInteger(Integer namespaceInteger) { * Get namespaceInteger * @return namespaceInteger */ + @JsonProperty("namespace_integer") @Schema(name = "namespace_integer", example = "-2", required = false) public Integer getNamespaceInteger() { @@ -549,6 +540,7 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) { * Get namespaceBoolean * @return namespaceBoolean */ + @JsonProperty("namespace_boolean") @Schema(name = "namespace_boolean", example = "true", required = false) public Boolean getNamespaceBoolean() { @@ -576,6 +568,7 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) { * Get namespaceArray * @return namespaceArray */ + @JsonProperty("namespace_array") @Schema(name = "namespace_array", required = false) public List getNamespaceArray() { @@ -603,6 +596,7 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) { * Get namespaceWrappedArray * @return namespaceWrappedArray */ + @JsonProperty("namespace_wrapped_array") @Schema(name = "namespace_wrapped_array", required = false) public List getNamespaceWrappedArray() { @@ -622,6 +616,7 @@ public XmlItem prefixNsString(String prefixNsString) { * Get prefixNsString * @return prefixNsString */ + @JsonProperty("prefix_ns_string") @Schema(name = "prefix_ns_string", example = "string", required = false) public String getPrefixNsString() { @@ -641,6 +636,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) { * Get prefixNsNumber * @return prefixNsNumber */ + @JsonProperty("prefix_ns_number") @Valid @Schema(name = "prefix_ns_number", example = "1.234", required = false) public BigDecimal getPrefixNsNumber() { @@ -660,6 +656,7 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) { * Get prefixNsInteger * @return prefixNsInteger */ + @JsonProperty("prefix_ns_integer") @Schema(name = "prefix_ns_integer", example = "-2", required = false) public Integer getPrefixNsInteger() { @@ -679,6 +676,7 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) { * Get prefixNsBoolean * @return prefixNsBoolean */ + @JsonProperty("prefix_ns_boolean") @Schema(name = "prefix_ns_boolean", example = "true", required = false) public Boolean getPrefixNsBoolean() { @@ -706,6 +704,7 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) { * Get prefixNsArray * @return prefixNsArray */ + @JsonProperty("prefix_ns_array") @Schema(name = "prefix_ns_array", required = false) public List getPrefixNsArray() { @@ -733,6 +732,7 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) { * Get prefixNsWrappedArray * @return prefixNsWrappedArray */ + @JsonProperty("prefix_ns_wrapped_array") @Schema(name = "prefix_ns_wrapped_array", required = false) public List getPrefixNsWrappedArray() { diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Category.java index 24264bce8b2d..59ab132dc0b5 100644 --- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Category.java @@ -22,10 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Category id(Long id) { @@ -37,6 +35,7 @@ public Category id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -56,6 +55,7 @@ public Category name(String name) { * Get name * @return name */ + @JsonProperty("name") @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/ModelApiResponse.java index 18e0004c3354..5d93139025d0 100644 --- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -24,13 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -42,6 +39,7 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ + @JsonProperty("code") @Schema(name = "code", required = false) public Integer getCode() { @@ -61,6 +59,7 @@ public ModelApiResponse type(String type) { * Get type * @return type */ + @JsonProperty("type") @Schema(name = "type", required = false) public String getType() { @@ -80,6 +79,7 @@ public ModelApiResponse message(String message) { * Get message * @return message */ + @JsonProperty("message") @Schema(name = "message", required = false) public String getMessage() { diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Order.java index 04bee348f98e..57e02c6a0658 100644 --- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Order.java @@ -25,16 +25,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -75,10 +71,8 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -90,6 +84,7 @@ public Order id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -109,6 +104,7 @@ public Order petId(Long petId) { * Get petId * @return petId */ + @JsonProperty("petId") @Schema(name = "petId", required = false) public Long getPetId() { @@ -128,6 +124,7 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ + @JsonProperty("quantity") @Schema(name = "quantity", required = false) public Integer getQuantity() { @@ -147,6 +144,7 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ + @JsonProperty("shipDate") @Valid @Schema(name = "shipDate", required = false) public OffsetDateTime getShipDate() { @@ -166,6 +164,7 @@ public Order status(StatusEnum status) { * Order Status * @return status */ + @JsonProperty("status") @Schema(name = "status", description = "Order Status", required = false) public StatusEnum getStatus() { @@ -185,6 +184,7 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ + @JsonProperty("complete") @Schema(name = "complete", required = false) public Boolean getComplete() { diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java index f702d09a1a82..935a9242ca57 100644 --- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java @@ -27,20 +27,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private List photoUrls = new ArrayList<>(); - @JsonProperty("tags") @Valid private List tags = null; @@ -81,7 +76,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; public Pet id(Long id) { @@ -93,6 +87,7 @@ public Pet id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -112,6 +107,7 @@ public Pet category(Category category) { * Get category * @return category */ + @JsonProperty("category") @Valid @Schema(name = "category", required = false) public Category getCategory() { @@ -131,6 +127,7 @@ public Pet name(String name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @Schema(name = "name", example = "doggie", required = true) public String getName() { @@ -155,6 +152,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ + @JsonProperty("photoUrls") @NotNull @Schema(name = "photoUrls", required = true) public List getPhotoUrls() { @@ -182,6 +180,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ + @JsonProperty("tags") @Valid @Schema(name = "tags", required = false) public List getTags() { @@ -201,6 +200,7 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ + @JsonProperty("status") @Schema(name = "status", description = "pet status in the store", required = false) public StatusEnum getStatus() { diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Tag.java index b4d9d7b0a13b..657e04be1aae 100644 --- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Tag.java @@ -22,10 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -37,6 +35,7 @@ public Tag id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -56,6 +55,7 @@ public Tag name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/User.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/User.java index 01b7db75ca7a..c51537754aff 100644 --- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/User.java @@ -22,28 +22,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -55,6 +47,7 @@ public User id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -74,6 +67,7 @@ public User username(String username) { * Get username * @return username */ + @JsonProperty("username") @Schema(name = "username", required = false) public String getUsername() { @@ -93,6 +87,7 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ + @JsonProperty("firstName") @Schema(name = "firstName", required = false) public String getFirstName() { @@ -112,6 +107,7 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ + @JsonProperty("lastName") @Schema(name = "lastName", required = false) public String getLastName() { @@ -131,6 +127,7 @@ public User email(String email) { * Get email * @return email */ + @JsonProperty("email") @Schema(name = "email", required = false) public String getEmail() { @@ -150,6 +147,7 @@ public User password(String password) { * Get password * @return password */ + @JsonProperty("password") @Schema(name = "password", required = false) public String getPassword() { @@ -169,6 +167,7 @@ public User phone(String phone) { * Get phone * @return phone */ + @JsonProperty("phone") @Schema(name = "phone", required = false) public String getPhone() { @@ -188,6 +187,7 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ + @JsonProperty("userStatus") @Schema(name = "userStatus", description = "User Status", required = false) public Integer getUserStatus() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 0d95d7f91b29..e45a52c7a8af 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesAnyType extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesAnyType name(String name) { @@ -35,6 +34,7 @@ public AdditionalPropertiesAnyType name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 0a45cd0d195e..ff8e902ab955 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesArray extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesArray name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesArray name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index c53b449a5070..c21068182c49 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesBoolean extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesBoolean name(String name) { @@ -35,6 +34,7 @@ public AdditionalPropertiesBoolean name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index ae060d44dc4d..c43432f178b1 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -25,45 +25,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesClass { - @JsonProperty("map_string") @Valid private Map mapString = null; - @JsonProperty("map_number") @Valid private Map mapNumber = null; - @JsonProperty("map_integer") @Valid private Map mapInteger = null; - @JsonProperty("map_boolean") @Valid private Map mapBoolean = null; - @JsonProperty("map_array_integer") @Valid private Map> mapArrayInteger = null; - @JsonProperty("map_array_anytype") @Valid private Map> mapArrayAnytype = null; - @JsonProperty("map_map_string") @Valid private Map> mapMapString = null; - @JsonProperty("map_map_anytype") @Valid private Map> mapMapAnytype = null; - @JsonProperty("anytype_1") private Object anytype1; - @JsonProperty("anytype_2") private Object anytype2; - @JsonProperty("anytype_3") private Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { @@ -83,6 +72,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt * Get mapString * @return mapString */ + @JsonProperty("map_string") @Schema(name = "map_string", required = false) public Map getMapString() { @@ -110,6 +100,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * Get mapNumber * @return mapNumber */ + @JsonProperty("map_number") @Valid @Schema(name = "map_number", required = false) public Map getMapNumber() { @@ -137,6 +128,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege * Get mapInteger * @return mapInteger */ + @JsonProperty("map_integer") @Schema(name = "map_integer", required = false) public Map getMapInteger() { @@ -164,6 +156,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea * Get mapBoolean * @return mapBoolean */ + @JsonProperty("map_boolean") @Schema(name = "map_boolean", required = false) public Map getMapBoolean() { @@ -191,6 +184,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { @@ -218,6 +212,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * Get mapArrayAnytype * @return mapArrayAnytype */ + @JsonProperty("map_array_anytype") @Valid @Schema(name = "map_array_anytype", required = false) public Map> getMapArrayAnytype() { @@ -245,6 +240,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { @@ -272,6 +268,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { @@ -291,6 +288,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) { * Get anytype1 * @return anytype1 */ + @JsonProperty("anytype_1") @Schema(name = "anytype_1", required = false) public Object getAnytype1() { @@ -310,6 +308,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) { * Get anytype2 * @return anytype2 */ + @JsonProperty("anytype_2") @Schema(name = "anytype_2", required = false) public Object getAnytype2() { @@ -329,6 +328,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) { * Get anytype3 * @return anytype3 */ + @JsonProperty("anytype_3") @Schema(name = "anytype_3", required = false) public Object getAnytype3() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 87a903f3e7f2..d4fe82193e30 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesInteger extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesInteger name(String name) { @@ -35,6 +34,7 @@ public AdditionalPropertiesInteger name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 873d1c9c229e..11f9dda21f3f 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesNumber extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesNumber name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesNumber name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 97827d22d963..ce4f9f1ff862 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesObject extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesObject name(String name) { @@ -35,6 +34,7 @@ public AdditionalPropertiesObject name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 53967d619036..2669a2e08d51 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesString extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesString name(String name) { @@ -35,6 +34,7 @@ public AdditionalPropertiesString name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Animal.java index 8b3225fee193..50eb6fe3c62b 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Animal.java @@ -38,10 +38,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Animal { - @JsonProperty("className") private String className; - @JsonProperty("color") private String color = "red"; public Animal className(String className) { @@ -53,6 +51,7 @@ public Animal className(String className) { * Get className * @return className */ + @JsonProperty("className") @NotNull @Schema(name = "className", required = true) public String getClassName() { @@ -72,6 +71,7 @@ public Animal color(String color) { * Get color * @return color */ + @JsonProperty("color") @Schema(name = "color", required = false) public String getColor() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 4fc6a6447db5..99f5ef3aa439 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfArrayOfNumberOnly { - @JsonProperty("ArrayArrayNumber") @Valid private List> arrayArrayNumber = null; @@ -45,6 +44,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * Get arrayArrayNumber * @return arrayArrayNumber */ + @JsonProperty("ArrayArrayNumber") @Valid @Schema(name = "ArrayArrayNumber", required = false) public List> getArrayArrayNumber() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index da4dc071cfdf..563d0dc0f933 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfNumberOnly { - @JsonProperty("ArrayNumber") @Valid private List arrayNumber = null; @@ -45,6 +44,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ + @JsonProperty("ArrayNumber") @Valid @Schema(name = "ArrayNumber", required = false) public List getArrayNumber() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayTest.java index 03052a955e3b..839cf3ac40ab 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayTest.java @@ -24,15 +24,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayTest { - @JsonProperty("array_of_string") @Valid private List arrayOfString = null; - @JsonProperty("array_array_of_integer") @Valid private List> arrayArrayOfInteger = null; - @JsonProperty("array_array_of_model") @Valid private List> arrayArrayOfModel = null; @@ -53,6 +50,7 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) { * Get arrayOfString * @return arrayOfString */ + @JsonProperty("array_of_string") @Schema(name = "array_of_string", required = false) public List getArrayOfString() { @@ -80,6 +78,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ + @JsonProperty("array_array_of_integer") @Valid @Schema(name = "array_array_of_integer", required = false) public List> getArrayArrayOfInteger() { @@ -107,6 +106,7 @@ public ArrayTest addArrayArrayOfModelItem(List arrayArrayOfModelI * Get arrayArrayOfModel * @return arrayArrayOfModel */ + @JsonProperty("array_array_of_model") @Valid @Schema(name = "array_array_of_model", required = false) public List> getArrayArrayOfModel() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/BigCat.java index 344818cd160a..e0b22753e9e8 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/BigCat.java @@ -66,7 +66,6 @@ public static KindEnum fromValue(String value) { } } - @JsonProperty("kind") private KindEnum kind; public BigCat kind(KindEnum kind) { @@ -78,6 +77,7 @@ public BigCat kind(KindEnum kind) { * Get kind * @return kind */ + @JsonProperty("kind") @Schema(name = "kind", required = false) public KindEnum getKind() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/BigCatAllOf.java index 96ddb1f49cd8..3b0788b0b304 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/BigCatAllOf.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/BigCatAllOf.java @@ -63,7 +63,6 @@ public static KindEnum fromValue(String value) { } } - @JsonProperty("kind") private KindEnum kind; public BigCatAllOf kind(KindEnum kind) { @@ -75,6 +74,7 @@ public BigCatAllOf kind(KindEnum kind) { * Get kind * @return kind */ + @JsonProperty("kind") @Schema(name = "kind", required = false) public KindEnum getKind() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Capitalization.java index e7f3b66e4814..7270c14a949f 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Capitalization.java @@ -21,22 +21,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Capitalization { - @JsonProperty("smallCamel") private String smallCamel; - @JsonProperty("CapitalCamel") private String capitalCamel; - @JsonProperty("small_Snake") private String smallSnake; - @JsonProperty("Capital_Snake") private String capitalSnake; - @JsonProperty("SCA_ETH_Flow_Points") private String scAETHFlowPoints; - @JsonProperty("ATT_NAME") private String ATT_NAME; public Capitalization smallCamel(String smallCamel) { @@ -48,6 +42,7 @@ public Capitalization smallCamel(String smallCamel) { * Get smallCamel * @return smallCamel */ + @JsonProperty("smallCamel") @Schema(name = "smallCamel", required = false) public String getSmallCamel() { @@ -67,6 +62,7 @@ public Capitalization capitalCamel(String capitalCamel) { * Get capitalCamel * @return capitalCamel */ + @JsonProperty("CapitalCamel") @Schema(name = "CapitalCamel", required = false) public String getCapitalCamel() { @@ -86,6 +82,7 @@ public Capitalization smallSnake(String smallSnake) { * Get smallSnake * @return smallSnake */ + @JsonProperty("small_Snake") @Schema(name = "small_Snake", required = false) public String getSmallSnake() { @@ -105,6 +102,7 @@ public Capitalization capitalSnake(String capitalSnake) { * Get capitalSnake * @return capitalSnake */ + @JsonProperty("Capital_Snake") @Schema(name = "Capital_Snake", required = false) public String getCapitalSnake() { @@ -124,6 +122,7 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) { * Get scAETHFlowPoints * @return scAETHFlowPoints */ + @JsonProperty("SCA_ETH_Flow_Points") @Schema(name = "SCA_ETH_Flow_Points", required = false) public String getScAETHFlowPoints() { @@ -143,6 +142,7 @@ public Capitalization ATT_NAME(String ATT_NAME) { * Name of the pet * @return ATT_NAME */ + @JsonProperty("ATT_NAME") @Schema(name = "ATT_NAME", description = "Name of the pet ", required = false) public String getATTNAME() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Cat.java index afce161498ed..d1bb205b11b3 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Cat.java @@ -35,7 +35,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Cat extends Animal { - @JsonProperty("declawed") private Boolean declawed; public Cat declawed(Boolean declawed) { @@ -47,6 +46,7 @@ public Cat declawed(Boolean declawed) { * Get declawed * @return declawed */ + @JsonProperty("declawed") @Schema(name = "declawed", required = false) public Boolean getDeclawed() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/CatAllOf.java index bc83998fc4d5..b7a7ed5def6a 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/CatAllOf.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/CatAllOf.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class CatAllOf { - @JsonProperty("declawed") private Boolean declawed; public CatAllOf declawed(Boolean declawed) { @@ -35,6 +34,7 @@ public CatAllOf declawed(Boolean declawed) { * Get declawed * @return declawed */ + @JsonProperty("declawed") @Schema(name = "declawed", required = false) public Boolean getDeclawed() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Category.java index 586658c922c5..9b1acc5a5c07 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Category.java @@ -21,10 +21,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name = "default-name"; public Category id(Long id) { @@ -36,6 +34,7 @@ public Category id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -55,6 +54,7 @@ public Category name(String name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @Schema(name = "name", required = true) public String getName() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ClassModel.java index d3d25d6df8cd..20f5e2de16dd 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ClassModel.java @@ -22,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ClassModel { - @JsonProperty("_class") private String propertyClass; public ClassModel propertyClass(String propertyClass) { @@ -34,6 +33,7 @@ public ClassModel propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ + @JsonProperty("_class") @Schema(name = "_class", required = false) public String getPropertyClass() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Client.java index 7ed5fbaae188..11ed7ead459c 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Client.java @@ -21,7 +21,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Client { - @JsonProperty("client") private String client; public Client client(String client) { @@ -33,6 +32,7 @@ public Client client(String client) { * Get client * @return client */ + @JsonProperty("client") @Schema(name = "client", required = false) public String getClient() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Dog.java index 738b9fbffc6c..b0f901978716 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Dog.java @@ -26,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Dog extends Animal { - @JsonProperty("breed") private String breed; public Dog breed(String breed) { @@ -38,6 +37,7 @@ public Dog breed(String breed) { * Get breed * @return breed */ + @JsonProperty("breed") @Schema(name = "breed", required = false) public String getBreed() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/DogAllOf.java index fbcd7127e41b..097dc159ee65 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/DogAllOf.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/DogAllOf.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class DogAllOf { - @JsonProperty("breed") private String breed; public DogAllOf breed(String breed) { @@ -35,6 +34,7 @@ public DogAllOf breed(String breed) { * Get breed * @return breed */ + @JsonProperty("breed") @Schema(name = "breed", required = false) public String getBreed() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumArrays.java index 3c18fc1189fe..cb84a65b9e1c 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumArrays.java @@ -59,7 +59,6 @@ public static JustSymbolEnum fromValue(String value) { } } - @JsonProperty("just_symbol") private JustSymbolEnum justSymbol; /** @@ -97,7 +96,6 @@ public static ArrayEnumEnum fromValue(String value) { } } - @JsonProperty("array_enum") @Valid private List arrayEnum = null; @@ -110,6 +108,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) { * Get justSymbol * @return justSymbol */ + @JsonProperty("just_symbol") @Schema(name = "just_symbol", required = false) public JustSymbolEnum getJustSymbol() { @@ -137,6 +136,7 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) { * Get arrayEnum * @return arrayEnum */ + @JsonProperty("array_enum") @Schema(name = "array_enum", required = false) public List getArrayEnum() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumTest.java index dc15f99afe84..2243d0fb1b8b 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumTest.java @@ -62,7 +62,6 @@ public static EnumStringEnum fromValue(String value) { } } - @JsonProperty("enum_string") private EnumStringEnum enumString; /** @@ -102,7 +101,6 @@ public static EnumStringRequiredEnum fromValue(String value) { } } - @JsonProperty("enum_string_required") private EnumStringRequiredEnum enumStringRequired; /** @@ -140,7 +138,6 @@ public static EnumIntegerEnum fromValue(Integer value) { } } - @JsonProperty("enum_integer") private EnumIntegerEnum enumInteger; /** @@ -178,10 +175,8 @@ public static EnumNumberEnum fromValue(Double value) { } } - @JsonProperty("enum_number") private EnumNumberEnum enumNumber; - @JsonProperty("outerEnum") private OuterEnum outerEnum; public EnumTest enumString(EnumStringEnum enumString) { @@ -193,6 +188,7 @@ public EnumTest enumString(EnumStringEnum enumString) { * Get enumString * @return enumString */ + @JsonProperty("enum_string") @Schema(name = "enum_string", required = false) public EnumStringEnum getEnumString() { @@ -212,6 +208,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) { * Get enumStringRequired * @return enumStringRequired */ + @JsonProperty("enum_string_required") @NotNull @Schema(name = "enum_string_required", required = true) public EnumStringRequiredEnum getEnumStringRequired() { @@ -231,6 +228,7 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) { * Get enumInteger * @return enumInteger */ + @JsonProperty("enum_integer") @Schema(name = "enum_integer", required = false) public EnumIntegerEnum getEnumInteger() { @@ -250,6 +248,7 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) { * Get enumNumber * @return enumNumber */ + @JsonProperty("enum_number") @Schema(name = "enum_number", required = false) public EnumNumberEnum getEnumNumber() { @@ -269,6 +268,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) { * Get outerEnum * @return outerEnum */ + @JsonProperty("outerEnum") @Valid @Schema(name = "outerEnum", required = false) public OuterEnum getOuterEnum() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/File.java index d9a8ab4aa1f2..7d0f08137a62 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/File.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/File.java @@ -22,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class File { - @JsonProperty("sourceURI") private String sourceURI; public File sourceURI(String sourceURI) { @@ -34,6 +33,7 @@ public File sourceURI(String sourceURI) { * Test capitalization * @return sourceURI */ + @JsonProperty("sourceURI") @Schema(name = "sourceURI", description = "Test capitalization", required = false) public String getSourceURI() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 5794883ff564..50df4bf463a8 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -24,10 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FileSchemaTestClass { - @JsonProperty("file") private File file; - @JsonProperty("files") @Valid private List files = null; @@ -40,6 +38,7 @@ public FileSchemaTestClass file(File file) { * Get file * @return file */ + @JsonProperty("file") @Valid @Schema(name = "file", required = false) public File getFile() { @@ -67,6 +66,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) { * Get files * @return files */ + @JsonProperty("files") @Valid @Schema(name = "files", required = false) public List getFiles() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FormatTest.java index c4bacc257a36..c9ae6ace8274 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FormatTest.java @@ -29,48 +29,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FormatTest { - @JsonProperty("integer") private Integer integer; - @JsonProperty("int32") private Integer int32; - @JsonProperty("int64") private Long int64; - @JsonProperty("number") private BigDecimal number; - @JsonProperty("float") private Float _float; - @JsonProperty("double") private Double _double; - @JsonProperty("string") private String string; - @JsonProperty("byte") private byte[] _byte; - @JsonProperty("binary") private org.springframework.core.io.Resource binary; - @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("password") private String password; - @JsonProperty("BigDecimal") private BigDecimal bigDecimal; public FormatTest integer(Integer integer) { @@ -84,6 +70,7 @@ public FormatTest integer(Integer integer) { * maximum: 100 * @return integer */ + @JsonProperty("integer") @Min(10) @Max(100) @Schema(name = "integer", required = false) public Integer getInteger() { @@ -105,6 +92,7 @@ public FormatTest int32(Integer int32) { * maximum: 200 * @return int32 */ + @JsonProperty("int32") @Min(20) @Max(200) @Schema(name = "int32", required = false) public Integer getInt32() { @@ -124,6 +112,7 @@ public FormatTest int64(Long int64) { * Get int64 * @return int64 */ + @JsonProperty("int64") @Schema(name = "int64", required = false) public Long getInt64() { @@ -145,6 +134,7 @@ public FormatTest number(BigDecimal number) { * maximum: 543.2 * @return number */ + @JsonProperty("number") @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") @Schema(name = "number", required = true) public BigDecimal getNumber() { @@ -166,6 +156,7 @@ public FormatTest _float(Float _float) { * maximum: 987.6 * @return _float */ + @JsonProperty("float") @DecimalMin("54.3") @DecimalMax("987.6") @Schema(name = "float", required = false) public Float getFloat() { @@ -187,6 +178,7 @@ public FormatTest _double(Double _double) { * maximum: 123.4 * @return _double */ + @JsonProperty("double") @DecimalMin("67.8") @DecimalMax("123.4") @Schema(name = "double", required = false) public Double getDouble() { @@ -206,6 +198,7 @@ public FormatTest string(String string) { * Get string * @return string */ + @JsonProperty("string") @Pattern(regexp = "/[a-z]/i") @Schema(name = "string", required = false) public String getString() { @@ -225,6 +218,7 @@ public FormatTest _byte(byte[] _byte) { * Get _byte * @return _byte */ + @JsonProperty("byte") @NotNull @Schema(name = "byte", required = true) public byte[] getByte() { @@ -244,6 +238,7 @@ public FormatTest binary(org.springframework.core.io.Resource binary) { * Get binary * @return binary */ + @JsonProperty("binary") @Valid @Schema(name = "binary", required = false) public org.springframework.core.io.Resource getBinary() { @@ -263,6 +258,7 @@ public FormatTest date(LocalDate date) { * Get date * @return date */ + @JsonProperty("date") @NotNull @Valid @Schema(name = "date", required = true) public LocalDate getDate() { @@ -282,6 +278,7 @@ public FormatTest dateTime(OffsetDateTime dateTime) { * Get dateTime * @return dateTime */ + @JsonProperty("dateTime") @Valid @Schema(name = "dateTime", required = false) public OffsetDateTime getDateTime() { @@ -301,6 +298,7 @@ public FormatTest uuid(UUID uuid) { * Get uuid * @return uuid */ + @JsonProperty("uuid") @Valid @Schema(name = "uuid", example = "72f98069-206d-4f12-9f12-3d1e525a8e84", required = false) public UUID getUuid() { @@ -320,6 +318,7 @@ public FormatTest password(String password) { * Get password * @return password */ + @JsonProperty("password") @NotNull @Size(min = 10, max = 64) @Schema(name = "password", required = true) public String getPassword() { @@ -339,6 +338,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) { * Get bigDecimal * @return bigDecimal */ + @JsonProperty("BigDecimal") @Valid @Schema(name = "BigDecimal", required = false) public BigDecimal getBigDecimal() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index d817048f2a75..aa8c3ee2514a 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -23,10 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class HasOnlyReadOnly { - @JsonProperty("bar") private String bar; - @JsonProperty("foo") private String foo; public HasOnlyReadOnly bar(String bar) { @@ -38,6 +36,7 @@ public HasOnlyReadOnly bar(String bar) { * Get bar * @return bar */ + @JsonProperty("bar") @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, required = false) public String getBar() { @@ -57,6 +56,7 @@ public HasOnlyReadOnly foo(String foo) { * Get foo * @return foo */ + @JsonProperty("foo") @Schema(name = "foo", accessMode = Schema.AccessMode.READ_ONLY, required = false) public String getFoo() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MapTest.java index 55a10cdf8d08..594021c36d2d 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MapTest.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MapTest { - @JsonProperty("map_map_of_string") @Valid private Map> mapMapOfString = null; @@ -63,15 +62,12 @@ public static InnerEnum fromValue(String value) { } } - @JsonProperty("map_of_enum_string") @Valid private Map mapOfEnumString = null; - @JsonProperty("direct_map") @Valid private Map directMap = null; - @JsonProperty("indirect_map") @Valid private Map indirectMap = null; @@ -92,6 +88,7 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapMapOfString * @return mapMapOfString */ + @JsonProperty("map_map_of_string") @Valid @Schema(name = "map_map_of_string", required = false) public Map> getMapMapOfString() { @@ -119,6 +116,7 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) * Get mapOfEnumString * @return mapOfEnumString */ + @JsonProperty("map_of_enum_string") @Schema(name = "map_of_enum_string", required = false) public Map getMapOfEnumString() { @@ -146,6 +144,7 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) { * Get directMap * @return directMap */ + @JsonProperty("direct_map") @Schema(name = "direct_map", required = false) public Map getDirectMap() { @@ -173,6 +172,7 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) { * Get indirectMap * @return indirectMap */ + @JsonProperty("indirect_map") @Schema(name = "indirect_map", required = false) public Map getIndirectMap() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index d58ed97c15d2..af4644ee1fd8 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -27,14 +27,11 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("map") @Valid private Map map = null; @@ -47,6 +44,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { * Get uuid * @return uuid */ + @JsonProperty("uuid") @Valid @Schema(name = "uuid", required = false) public UUID getUuid() { @@ -66,6 +64,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT * Get dateTime * @return dateTime */ + @JsonProperty("dateTime") @Valid @Schema(name = "dateTime", required = false) public OffsetDateTime getDateTime() { @@ -93,6 +92,7 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * Get map * @return map */ + @JsonProperty("map") @Valid @Schema(name = "map", required = false) public Map getMap() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Model200Response.java index 80ff3f1fc638..329840fd1cd5 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Model200Response.java @@ -24,10 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Model200Response { - @JsonProperty("name") private Integer name; - @JsonProperty("class") private String propertyClass; public Model200Response name(Integer name) { @@ -39,6 +37,7 @@ public Model200Response name(Integer name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public Integer getName() { @@ -58,6 +57,7 @@ public Model200Response propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ + @JsonProperty("class") @Schema(name = "class", required = false) public String getPropertyClass() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelApiResponse.java index ed829bcb62cd..14ea90b13917 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -23,13 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -41,6 +38,7 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ + @JsonProperty("code") @Schema(name = "code", required = false) public Integer getCode() { @@ -60,6 +58,7 @@ public ModelApiResponse type(String type) { * Get type * @return type */ + @JsonProperty("type") @Schema(name = "type", required = false) public String getType() { @@ -79,6 +78,7 @@ public ModelApiResponse message(String message) { * Get message * @return message */ + @JsonProperty("message") @Schema(name = "message", required = false) public String getMessage() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelList.java index 56e79c554452..1e0bcffc220c 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelList.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelList { - @JsonProperty("123-list") private String _123list; public ModelList _123list(String _123list) { @@ -35,6 +34,7 @@ public ModelList _123list(String _123list) { * Get _123list * @return _123list */ + @JsonProperty("123-list") @Schema(name = "123-list", required = false) public String get123list() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelReturn.java index d95ce3f15491..90b17a6d6850 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelReturn.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelReturn { - @JsonProperty("return") private Integer _return; public ModelReturn _return(Integer _return) { @@ -36,6 +35,7 @@ public ModelReturn _return(Integer _return) { * Get _return * @return _return */ + @JsonProperty("return") @Schema(name = "return", required = false) public Integer getReturn() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Name.java index 32cec75d981d..bcbb5aab0f79 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Name.java @@ -22,16 +22,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Name { - @JsonProperty("name") private Integer name; - @JsonProperty("snake_case") private Integer snakeCase; - @JsonProperty("property") private String property; - @JsonProperty("123Number") private Integer _123number; public Name name(Integer name) { @@ -43,6 +39,7 @@ public Name name(Integer name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @Schema(name = "name", required = true) public Integer getName() { @@ -62,6 +59,7 @@ public Name snakeCase(Integer snakeCase) { * Get snakeCase * @return snakeCase */ + @JsonProperty("snake_case") @Schema(name = "snake_case", accessMode = Schema.AccessMode.READ_ONLY, required = false) public Integer getSnakeCase() { @@ -81,6 +79,7 @@ public Name property(String property) { * Get property * @return property */ + @JsonProperty("property") @Schema(name = "property", required = false) public String getProperty() { @@ -100,6 +99,7 @@ public Name _123number(Integer _123number) { * Get _123number * @return _123number */ + @JsonProperty("123Number") @Schema(name = "123Number", accessMode = Schema.AccessMode.READ_ONLY, required = false) public Integer get123number() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/NumberOnly.java index 14fb6641f919..a597943a3ef7 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/NumberOnly.java @@ -22,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class NumberOnly { - @JsonProperty("JustNumber") private BigDecimal justNumber; public NumberOnly justNumber(BigDecimal justNumber) { @@ -34,6 +33,7 @@ public NumberOnly justNumber(BigDecimal justNumber) { * Get justNumber * @return justNumber */ + @JsonProperty("JustNumber") @Valid @Schema(name = "JustNumber", required = false) public BigDecimal getJustNumber() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Order.java index 9b54a719dbae..10e257004cf9 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Order.java @@ -24,16 +24,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -74,10 +70,8 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -89,6 +83,7 @@ public Order id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -108,6 +103,7 @@ public Order petId(Long petId) { * Get petId * @return petId */ + @JsonProperty("petId") @Schema(name = "petId", required = false) public Long getPetId() { @@ -127,6 +123,7 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ + @JsonProperty("quantity") @Schema(name = "quantity", required = false) public Integer getQuantity() { @@ -146,6 +143,7 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ + @JsonProperty("shipDate") @Valid @Schema(name = "shipDate", required = false) public OffsetDateTime getShipDate() { @@ -165,6 +163,7 @@ public Order status(StatusEnum status) { * Order Status * @return status */ + @JsonProperty("status") @Schema(name = "status", description = "Order Status", required = false) public StatusEnum getStatus() { @@ -184,6 +183,7 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ + @JsonProperty("complete") @Schema(name = "complete", required = false) public Boolean getComplete() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/OuterComposite.java index 461f98baa866..da3403158231 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/OuterComposite.java @@ -22,13 +22,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class OuterComposite { - @JsonProperty("my_number") private BigDecimal myNumber; - @JsonProperty("my_string") private String myString; - @JsonProperty("my_boolean") private Boolean myBoolean; public OuterComposite myNumber(BigDecimal myNumber) { @@ -40,6 +37,7 @@ public OuterComposite myNumber(BigDecimal myNumber) { * Get myNumber * @return myNumber */ + @JsonProperty("my_number") @Valid @Schema(name = "my_number", required = false) public BigDecimal getMyNumber() { @@ -59,6 +57,7 @@ public OuterComposite myString(String myString) { * Get myString * @return myString */ + @JsonProperty("my_string") @Schema(name = "my_string", required = false) public String getMyString() { @@ -78,6 +77,7 @@ public OuterComposite myBoolean(Boolean myBoolean) { * Get myBoolean * @return myBoolean */ + @JsonProperty("my_boolean") @Schema(name = "my_boolean", required = false) public Boolean getMyBoolean() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Pet.java index c137885adb7f..edfea99a4441 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Pet.java @@ -29,20 +29,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private Set photoUrls = new LinkedHashSet<>(); - @JsonProperty("tags") @Valid private List tags = null; @@ -83,7 +78,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; public Pet id(Long id) { @@ -95,6 +89,7 @@ public Pet id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -114,6 +109,7 @@ public Pet category(Category category) { * Get category * @return category */ + @JsonProperty("category") @Valid @Schema(name = "category", required = false) public Category getCategory() { @@ -133,6 +129,7 @@ public Pet name(String name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @Schema(name = "name", example = "doggie", required = true) public String getName() { @@ -157,6 +154,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ + @JsonProperty("photoUrls") @NotNull @Schema(name = "photoUrls", required = true) public Set getPhotoUrls() { @@ -185,6 +183,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ + @JsonProperty("tags") @Valid @Schema(name = "tags", required = false) public List getTags() { @@ -204,6 +203,7 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ + @JsonProperty("status") @Schema(name = "status", description = "pet status in the store", required = false) public StatusEnum getStatus() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ReadOnlyFirst.java index 39862919e7c7..5bb864fdfdf9 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -21,10 +21,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ReadOnlyFirst { - @JsonProperty("bar") private String bar; - @JsonProperty("baz") private String baz; public ReadOnlyFirst bar(String bar) { @@ -36,6 +34,7 @@ public ReadOnlyFirst bar(String bar) { * Get bar * @return bar */ + @JsonProperty("bar") @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, required = false) public String getBar() { @@ -55,6 +54,7 @@ public ReadOnlyFirst baz(String baz) { * Get baz * @return baz */ + @JsonProperty("baz") @Schema(name = "baz", required = false) public String getBaz() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/SpecialModelName.java index fb431f59071a..d30f01ffd4ce 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/SpecialModelName.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class SpecialModelName { - @JsonProperty("$special[property.name]") private Long $specialPropertyName; public SpecialModelName $specialPropertyName(Long $specialPropertyName) { @@ -35,6 +34,7 @@ public class SpecialModelName { * Get $specialPropertyName * @return $specialPropertyName */ + @JsonProperty("$special[property.name]") @Schema(name = "$special[property.name]", required = false) public Long get$SpecialPropertyName() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Tag.java index 75f3df1d0e17..7e0f150664d9 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Tag.java @@ -21,10 +21,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -36,6 +34,7 @@ public Tag id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -55,6 +54,7 @@ public Tag name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderDefault.java index 4d939d69a1e7..151d7623b25f 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -24,19 +24,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderDefault { - @JsonProperty("string_item") private String stringItem = "what"; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem = true; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -49,6 +44,7 @@ public TypeHolderDefault stringItem(String stringItem) { * Get stringItem * @return stringItem */ + @JsonProperty("string_item") @NotNull @Schema(name = "string_item", required = true) public String getStringItem() { @@ -68,6 +64,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ + @JsonProperty("number_item") @NotNull @Valid @Schema(name = "number_item", required = true) public BigDecimal getNumberItem() { @@ -87,6 +84,7 @@ public TypeHolderDefault integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ + @JsonProperty("integer_item") @NotNull @Schema(name = "integer_item", required = true) public Integer getIntegerItem() { @@ -106,6 +104,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ + @JsonProperty("bool_item") @NotNull @Schema(name = "bool_item", required = true) public Boolean getBoolItem() { @@ -130,6 +129,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ + @JsonProperty("array_item") @NotNull @Schema(name = "array_item", required = true) public List getArrayItem() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderExample.java index c9b40aac5fa1..7239836800df 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -24,22 +24,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderExample { - @JsonProperty("string_item") private String stringItem; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("float_item") private Float floatItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -52,6 +46,7 @@ public TypeHolderExample stringItem(String stringItem) { * Get stringItem * @return stringItem */ + @JsonProperty("string_item") @NotNull @Schema(name = "string_item", example = "what", required = true) public String getStringItem() { @@ -71,6 +66,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ + @JsonProperty("number_item") @NotNull @Valid @Schema(name = "number_item", example = "1.234", required = true) public BigDecimal getNumberItem() { @@ -90,6 +86,7 @@ public TypeHolderExample floatItem(Float floatItem) { * Get floatItem * @return floatItem */ + @JsonProperty("float_item") @NotNull @Schema(name = "float_item", example = "1.234", required = true) public Float getFloatItem() { @@ -109,6 +106,7 @@ public TypeHolderExample integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ + @JsonProperty("integer_item") @NotNull @Schema(name = "integer_item", example = "-2", required = true) public Integer getIntegerItem() { @@ -128,6 +126,7 @@ public TypeHolderExample boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ + @JsonProperty("bool_item") @NotNull @Schema(name = "bool_item", example = "true", required = true) public Boolean getBoolItem() { @@ -152,6 +151,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ + @JsonProperty("array_item") @NotNull @Schema(name = "array_item", example = "[0, 1, 2, 3]", required = true) public List getArrayItem() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/User.java index 9df36d407748..eb52ac9bab84 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/User.java @@ -21,28 +21,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -54,6 +46,7 @@ public User id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -73,6 +66,7 @@ public User username(String username) { * Get username * @return username */ + @JsonProperty("username") @Schema(name = "username", required = false) public String getUsername() { @@ -92,6 +86,7 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ + @JsonProperty("firstName") @Schema(name = "firstName", required = false) public String getFirstName() { @@ -111,6 +106,7 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ + @JsonProperty("lastName") @Schema(name = "lastName", required = false) public String getLastName() { @@ -130,6 +126,7 @@ public User email(String email) { * Get email * @return email */ + @JsonProperty("email") @Schema(name = "email", required = false) public String getEmail() { @@ -149,6 +146,7 @@ public User password(String password) { * Get password * @return password */ + @JsonProperty("password") @Schema(name = "password", required = false) public String getPassword() { @@ -168,6 +166,7 @@ public User phone(String phone) { * Get phone * @return phone */ + @JsonProperty("phone") @Schema(name = "phone", required = false) public String getPhone() { @@ -187,6 +186,7 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ + @JsonProperty("userStatus") @Schema(name = "userStatus", description = "User Status", required = false) public Integer getUserStatus() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/XmlItem.java index 3b3593e71797..4b287492cc75 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/XmlItem.java @@ -24,99 +24,70 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class XmlItem { - @JsonProperty("attribute_string") private String attributeString; - @JsonProperty("attribute_number") private BigDecimal attributeNumber; - @JsonProperty("attribute_integer") private Integer attributeInteger; - @JsonProperty("attribute_boolean") private Boolean attributeBoolean; - @JsonProperty("wrapped_array") @Valid private List wrappedArray = null; - @JsonProperty("name_string") private String nameString; - @JsonProperty("name_number") private BigDecimal nameNumber; - @JsonProperty("name_integer") private Integer nameInteger; - @JsonProperty("name_boolean") private Boolean nameBoolean; - @JsonProperty("name_array") @Valid private List nameArray = null; - @JsonProperty("name_wrapped_array") @Valid private List nameWrappedArray = null; - @JsonProperty("prefix_string") private String prefixString; - @JsonProperty("prefix_number") private BigDecimal prefixNumber; - @JsonProperty("prefix_integer") private Integer prefixInteger; - @JsonProperty("prefix_boolean") private Boolean prefixBoolean; - @JsonProperty("prefix_array") @Valid private List prefixArray = null; - @JsonProperty("prefix_wrapped_array") @Valid private List prefixWrappedArray = null; - @JsonProperty("namespace_string") private String namespaceString; - @JsonProperty("namespace_number") private BigDecimal namespaceNumber; - @JsonProperty("namespace_integer") private Integer namespaceInteger; - @JsonProperty("namespace_boolean") private Boolean namespaceBoolean; - @JsonProperty("namespace_array") @Valid private List namespaceArray = null; - @JsonProperty("namespace_wrapped_array") @Valid private List namespaceWrappedArray = null; - @JsonProperty("prefix_ns_string") private String prefixNsString; - @JsonProperty("prefix_ns_number") private BigDecimal prefixNsNumber; - @JsonProperty("prefix_ns_integer") private Integer prefixNsInteger; - @JsonProperty("prefix_ns_boolean") private Boolean prefixNsBoolean; - @JsonProperty("prefix_ns_array") @Valid private List prefixNsArray = null; - @JsonProperty("prefix_ns_wrapped_array") @Valid private List prefixNsWrappedArray = null; @@ -129,6 +100,7 @@ public XmlItem attributeString(String attributeString) { * Get attributeString * @return attributeString */ + @JsonProperty("attribute_string") @Schema(name = "attribute_string", example = "string", required = false) public String getAttributeString() { @@ -148,6 +120,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) { * Get attributeNumber * @return attributeNumber */ + @JsonProperty("attribute_number") @Valid @Schema(name = "attribute_number", example = "1.234", required = false) public BigDecimal getAttributeNumber() { @@ -167,6 +140,7 @@ public XmlItem attributeInteger(Integer attributeInteger) { * Get attributeInteger * @return attributeInteger */ + @JsonProperty("attribute_integer") @Schema(name = "attribute_integer", example = "-2", required = false) public Integer getAttributeInteger() { @@ -186,6 +160,7 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) { * Get attributeBoolean * @return attributeBoolean */ + @JsonProperty("attribute_boolean") @Schema(name = "attribute_boolean", example = "true", required = false) public Boolean getAttributeBoolean() { @@ -213,6 +188,7 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) { * Get wrappedArray * @return wrappedArray */ + @JsonProperty("wrapped_array") @Schema(name = "wrapped_array", required = false) public List getWrappedArray() { @@ -232,6 +208,7 @@ public XmlItem nameString(String nameString) { * Get nameString * @return nameString */ + @JsonProperty("name_string") @Schema(name = "name_string", example = "string", required = false) public String getNameString() { @@ -251,6 +228,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) { * Get nameNumber * @return nameNumber */ + @JsonProperty("name_number") @Valid @Schema(name = "name_number", example = "1.234", required = false) public BigDecimal getNameNumber() { @@ -270,6 +248,7 @@ public XmlItem nameInteger(Integer nameInteger) { * Get nameInteger * @return nameInteger */ + @JsonProperty("name_integer") @Schema(name = "name_integer", example = "-2", required = false) public Integer getNameInteger() { @@ -289,6 +268,7 @@ public XmlItem nameBoolean(Boolean nameBoolean) { * Get nameBoolean * @return nameBoolean */ + @JsonProperty("name_boolean") @Schema(name = "name_boolean", example = "true", required = false) public Boolean getNameBoolean() { @@ -316,6 +296,7 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) { * Get nameArray * @return nameArray */ + @JsonProperty("name_array") @Schema(name = "name_array", required = false) public List getNameArray() { @@ -343,6 +324,7 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) { * Get nameWrappedArray * @return nameWrappedArray */ + @JsonProperty("name_wrapped_array") @Schema(name = "name_wrapped_array", required = false) public List getNameWrappedArray() { @@ -362,6 +344,7 @@ public XmlItem prefixString(String prefixString) { * Get prefixString * @return prefixString */ + @JsonProperty("prefix_string") @Schema(name = "prefix_string", example = "string", required = false) public String getPrefixString() { @@ -381,6 +364,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) { * Get prefixNumber * @return prefixNumber */ + @JsonProperty("prefix_number") @Valid @Schema(name = "prefix_number", example = "1.234", required = false) public BigDecimal getPrefixNumber() { @@ -400,6 +384,7 @@ public XmlItem prefixInteger(Integer prefixInteger) { * Get prefixInteger * @return prefixInteger */ + @JsonProperty("prefix_integer") @Schema(name = "prefix_integer", example = "-2", required = false) public Integer getPrefixInteger() { @@ -419,6 +404,7 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) { * Get prefixBoolean * @return prefixBoolean */ + @JsonProperty("prefix_boolean") @Schema(name = "prefix_boolean", example = "true", required = false) public Boolean getPrefixBoolean() { @@ -446,6 +432,7 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) { * Get prefixArray * @return prefixArray */ + @JsonProperty("prefix_array") @Schema(name = "prefix_array", required = false) public List getPrefixArray() { @@ -473,6 +460,7 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) { * Get prefixWrappedArray * @return prefixWrappedArray */ + @JsonProperty("prefix_wrapped_array") @Schema(name = "prefix_wrapped_array", required = false) public List getPrefixWrappedArray() { @@ -492,6 +480,7 @@ public XmlItem namespaceString(String namespaceString) { * Get namespaceString * @return namespaceString */ + @JsonProperty("namespace_string") @Schema(name = "namespace_string", example = "string", required = false) public String getNamespaceString() { @@ -511,6 +500,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) { * Get namespaceNumber * @return namespaceNumber */ + @JsonProperty("namespace_number") @Valid @Schema(name = "namespace_number", example = "1.234", required = false) public BigDecimal getNamespaceNumber() { @@ -530,6 +520,7 @@ public XmlItem namespaceInteger(Integer namespaceInteger) { * Get namespaceInteger * @return namespaceInteger */ + @JsonProperty("namespace_integer") @Schema(name = "namespace_integer", example = "-2", required = false) public Integer getNamespaceInteger() { @@ -549,6 +540,7 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) { * Get namespaceBoolean * @return namespaceBoolean */ + @JsonProperty("namespace_boolean") @Schema(name = "namespace_boolean", example = "true", required = false) public Boolean getNamespaceBoolean() { @@ -576,6 +568,7 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) { * Get namespaceArray * @return namespaceArray */ + @JsonProperty("namespace_array") @Schema(name = "namespace_array", required = false) public List getNamespaceArray() { @@ -603,6 +596,7 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) { * Get namespaceWrappedArray * @return namespaceWrappedArray */ + @JsonProperty("namespace_wrapped_array") @Schema(name = "namespace_wrapped_array", required = false) public List getNamespaceWrappedArray() { @@ -622,6 +616,7 @@ public XmlItem prefixNsString(String prefixNsString) { * Get prefixNsString * @return prefixNsString */ + @JsonProperty("prefix_ns_string") @Schema(name = "prefix_ns_string", example = "string", required = false) public String getPrefixNsString() { @@ -641,6 +636,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) { * Get prefixNsNumber * @return prefixNsNumber */ + @JsonProperty("prefix_ns_number") @Valid @Schema(name = "prefix_ns_number", example = "1.234", required = false) public BigDecimal getPrefixNsNumber() { @@ -660,6 +656,7 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) { * Get prefixNsInteger * @return prefixNsInteger */ + @JsonProperty("prefix_ns_integer") @Schema(name = "prefix_ns_integer", example = "-2", required = false) public Integer getPrefixNsInteger() { @@ -679,6 +676,7 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) { * Get prefixNsBoolean * @return prefixNsBoolean */ + @JsonProperty("prefix_ns_boolean") @Schema(name = "prefix_ns_boolean", example = "true", required = false) public Boolean getPrefixNsBoolean() { @@ -706,6 +704,7 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) { * Get prefixNsArray * @return prefixNsArray */ + @JsonProperty("prefix_ns_array") @Schema(name = "prefix_ns_array", required = false) public List getPrefixNsArray() { @@ -733,6 +732,7 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) { * Get prefixNsWrappedArray * @return prefixNsWrappedArray */ + @JsonProperty("prefix_ns_wrapped_array") @Schema(name = "prefix_ns_wrapped_array", required = false) public List getPrefixNsWrappedArray() { diff --git a/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/model/ObjectWithUniqueItems.java b/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/model/ObjectWithUniqueItems.java index a322f8ae1564..7052f8d7cfeb 100644 --- a/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/model/ObjectWithUniqueItems.java +++ b/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/model/ObjectWithUniqueItems.java @@ -31,27 +31,21 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ObjectWithUniqueItems { - @JsonProperty("nullSet") @Valid private JsonNullable> nullSet = JsonNullable.undefined(); - @JsonProperty("notNullSet") @Valid private Set notNullSet = null; - @JsonProperty("nullList") @Valid private JsonNullable> nullList = JsonNullable.undefined(); - @JsonProperty("notNullList") @Valid private List notNullList = null; - @JsonProperty("notNullDateField") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime notNullDateField; - @JsonProperty("nullDateField") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime nullDateField; @@ -72,6 +66,7 @@ public ObjectWithUniqueItems addNullSetItem(String nullSetItem) { * Get nullSet * @return nullSet */ + @JsonProperty("nullSet") @Schema(name = "nullSet", required = false) public JsonNullable> getNullSet() { @@ -99,6 +94,7 @@ public ObjectWithUniqueItems addNotNullSetItem(String notNullSetItem) { * Get notNullSet * @return notNullSet */ + @JsonProperty("notNullSet") @Schema(name = "notNullSet", required = false) public Set getNotNullSet() { @@ -127,6 +123,7 @@ public ObjectWithUniqueItems addNullListItem(String nullListItem) { * Get nullList * @return nullList */ + @JsonProperty("nullList") @Schema(name = "nullList", required = false) public JsonNullable> getNullList() { @@ -154,6 +151,7 @@ public ObjectWithUniqueItems addNotNullListItem(String notNullListItem) { * Get notNullList * @return notNullList */ + @JsonProperty("notNullList") @Schema(name = "notNullList", required = false) public List getNotNullList() { @@ -173,6 +171,7 @@ public ObjectWithUniqueItems notNullDateField(OffsetDateTime notNullDateField) { * Get notNullDateField * @return notNullDateField */ + @JsonProperty("notNullDateField") @Valid @Schema(name = "notNullDateField", required = false) public OffsetDateTime getNotNullDateField() { @@ -192,6 +191,7 @@ public ObjectWithUniqueItems nullDateField(OffsetDateTime nullDateField) { * Get nullDateField * @return nullDateField */ + @JsonProperty("nullDateField") @Valid @Schema(name = "nullDateField", required = false) public OffsetDateTime getNullDateField() { diff --git a/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/Category.java index 9f5ef4d9f1ad..54981cbb60a9 100644 --- a/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/Category.java @@ -23,10 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Category id(Long id) { @@ -38,6 +36,7 @@ public Category id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -57,6 +56,7 @@ public Category name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/ModelApiResponse.java index 52fb11fd3cf7..2c232dc89527 100644 --- a/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -25,13 +25,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -43,6 +40,7 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ + @JsonProperty("code") @ApiModelProperty(value = "") public Integer getCode() { @@ -62,6 +60,7 @@ public ModelApiResponse type(String type) { * Get type * @return type */ + @JsonProperty("type") @ApiModelProperty(value = "") public String getType() { @@ -81,6 +80,7 @@ public ModelApiResponse message(String message) { * Get message * @return message */ + @JsonProperty("message") @ApiModelProperty(value = "") public String getMessage() { diff --git a/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/Order.java index 66d9df6dfd95..71a0b505c7f4 100644 --- a/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/Order.java @@ -26,16 +26,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -76,10 +72,8 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -91,6 +85,7 @@ public Order id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -110,6 +105,7 @@ public Order petId(Long petId) { * Get petId * @return petId */ + @JsonProperty("petId") @ApiModelProperty(value = "") public Long getPetId() { @@ -129,6 +125,7 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ + @JsonProperty("quantity") @ApiModelProperty(value = "") public Integer getQuantity() { @@ -148,6 +145,7 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ + @JsonProperty("shipDate") @Valid @ApiModelProperty(value = "") public OffsetDateTime getShipDate() { @@ -167,6 +165,7 @@ public Order status(StatusEnum status) { * Order Status * @return status */ + @JsonProperty("status") @ApiModelProperty(value = "Order Status") public StatusEnum getStatus() { @@ -186,6 +185,7 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ + @JsonProperty("complete") @ApiModelProperty(value = "") public Boolean getComplete() { diff --git a/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java index 1962262aea94..3041d644634e 100644 --- a/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java @@ -28,20 +28,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private List photoUrls = new ArrayList<>(); - @JsonProperty("tags") @Valid private List tags = null; @@ -82,7 +77,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; public Pet id(Long id) { @@ -94,6 +88,7 @@ public Pet id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -113,6 +108,7 @@ public Pet category(Category category) { * Get category * @return category */ + @JsonProperty("category") @Valid @ApiModelProperty(value = "") public Category getCategory() { @@ -132,6 +128,7 @@ public Pet name(String name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") public String getName() { @@ -156,6 +153,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ + @JsonProperty("photoUrls") @NotNull @ApiModelProperty(required = true, value = "") public List getPhotoUrls() { @@ -183,6 +181,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ + @JsonProperty("tags") @Valid @ApiModelProperty(value = "") public List getTags() { @@ -202,6 +201,7 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ + @JsonProperty("status") @ApiModelProperty(value = "pet status in the store") public StatusEnum getStatus() { diff --git a/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/Tag.java index b30aa3fd9a2c..397f28ba4b4f 100644 --- a/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/Tag.java @@ -23,10 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -38,6 +36,7 @@ public Tag id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -57,6 +56,7 @@ public Tag name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/User.java index 8d71f0fcc040..42b2a02dc443 100644 --- a/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/User.java @@ -23,28 +23,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -56,6 +48,7 @@ public User id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -75,6 +68,7 @@ public User username(String username) { * Get username * @return username */ + @JsonProperty("username") @ApiModelProperty(value = "") public String getUsername() { @@ -94,6 +88,7 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ + @JsonProperty("firstName") @ApiModelProperty(value = "") public String getFirstName() { @@ -113,6 +108,7 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ + @JsonProperty("lastName") @ApiModelProperty(value = "") public String getLastName() { @@ -132,6 +128,7 @@ public User email(String email) { * Get email * @return email */ + @JsonProperty("email") @ApiModelProperty(value = "") public String getEmail() { @@ -151,6 +148,7 @@ public User password(String password) { * Get password * @return password */ + @JsonProperty("password") @ApiModelProperty(value = "") public String getPassword() { @@ -170,6 +168,7 @@ public User phone(String phone) { * Get phone * @return phone */ + @JsonProperty("phone") @ApiModelProperty(value = "") public String getPhone() { @@ -189,6 +188,7 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ + @JsonProperty("userStatus") @ApiModelProperty(value = "User Status") public Integer getUserStatus() { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 32dc0c3fd933..805450697b7a 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesAnyType extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesAnyType name(String name) { @@ -35,6 +34,7 @@ public AdditionalPropertiesAnyType name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index b030575ce32b..6b55f2777621 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesArray extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesArray name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesArray name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index a0be618b483c..2cbcb1a3ea3d 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesBoolean extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesBoolean name(String name) { @@ -35,6 +34,7 @@ public AdditionalPropertiesBoolean name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 5f1460876f73..168a69386cff 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -25,45 +25,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesClass { - @JsonProperty("map_string") @Valid private Map mapString = null; - @JsonProperty("map_number") @Valid private Map mapNumber = null; - @JsonProperty("map_integer") @Valid private Map mapInteger = null; - @JsonProperty("map_boolean") @Valid private Map mapBoolean = null; - @JsonProperty("map_array_integer") @Valid private Map> mapArrayInteger = null; - @JsonProperty("map_array_anytype") @Valid private Map> mapArrayAnytype = null; - @JsonProperty("map_map_string") @Valid private Map> mapMapString = null; - @JsonProperty("map_map_anytype") @Valid private Map> mapMapAnytype = null; - @JsonProperty("anytype_1") private Object anytype1; - @JsonProperty("anytype_2") private Object anytype2; - @JsonProperty("anytype_3") private Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { @@ -83,6 +72,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt * Get mapString * @return mapString */ + @JsonProperty("map_string") @ApiModelProperty(value = "") public Map getMapString() { @@ -110,6 +100,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * Get mapNumber * @return mapNumber */ + @JsonProperty("map_number") @Valid @ApiModelProperty(value = "") public Map getMapNumber() { @@ -137,6 +128,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege * Get mapInteger * @return mapInteger */ + @JsonProperty("map_integer") @ApiModelProperty(value = "") public Map getMapInteger() { @@ -164,6 +156,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea * Get mapBoolean * @return mapBoolean */ + @JsonProperty("map_boolean") @ApiModelProperty(value = "") public Map getMapBoolean() { @@ -191,6 +184,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { @@ -218,6 +212,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * Get mapArrayAnytype * @return mapArrayAnytype */ + @JsonProperty("map_array_anytype") @Valid @ApiModelProperty(value = "") public Map> getMapArrayAnytype() { @@ -245,6 +240,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { @@ -272,6 +268,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { @@ -291,6 +288,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) { * Get anytype1 * @return anytype1 */ + @JsonProperty("anytype_1") @ApiModelProperty(value = "") public Object getAnytype1() { @@ -310,6 +308,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) { * Get anytype2 * @return anytype2 */ + @JsonProperty("anytype_2") @ApiModelProperty(value = "") public Object getAnytype2() { @@ -329,6 +328,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) { * Get anytype3 * @return anytype3 */ + @JsonProperty("anytype_3") @ApiModelProperty(value = "") public Object getAnytype3() { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 0b50eae96233..a58e94eeb4c6 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesInteger extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesInteger name(String name) { @@ -35,6 +34,7 @@ public AdditionalPropertiesInteger name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 8777da8266d9..358637b55ed5 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesNumber extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesNumber name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesNumber name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 3d723f313ba1..9323e4acc464 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesObject extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesObject name(String name) { @@ -35,6 +34,7 @@ public AdditionalPropertiesObject name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 8be627cf95e1..9e91d5ee4b1b 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesString extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesString name(String name) { @@ -35,6 +34,7 @@ public AdditionalPropertiesString name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Animal.java index eef2ae958def..047875107357 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Animal.java @@ -38,10 +38,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Animal { - @JsonProperty("className") private String className; - @JsonProperty("color") private String color = "red"; public Animal className(String className) { @@ -53,6 +51,7 @@ public Animal className(String className) { * Get className * @return className */ + @JsonProperty("className") @NotNull @ApiModelProperty(required = true, value = "") public String getClassName() { @@ -72,6 +71,7 @@ public Animal color(String color) { * Get color * @return color */ + @JsonProperty("color") @ApiModelProperty(value = "") public String getColor() { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 8eb8b8652c97..0866d16c2085 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfArrayOfNumberOnly { - @JsonProperty("ArrayArrayNumber") @Valid private List> arrayArrayNumber = null; @@ -45,6 +44,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * Get arrayArrayNumber * @return arrayArrayNumber */ + @JsonProperty("ArrayArrayNumber") @Valid @ApiModelProperty(value = "") public List> getArrayArrayNumber() { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index c5b92b31b9da..ab4a14712c8e 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfNumberOnly { - @JsonProperty("ArrayNumber") @Valid private List arrayNumber = null; @@ -45,6 +44,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ + @JsonProperty("ArrayNumber") @Valid @ApiModelProperty(value = "") public List getArrayNumber() { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java index 526bd764d159..2a06640386b1 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java @@ -24,15 +24,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayTest { - @JsonProperty("array_of_string") @Valid private List arrayOfString = null; - @JsonProperty("array_array_of_integer") @Valid private List> arrayArrayOfInteger = null; - @JsonProperty("array_array_of_model") @Valid private List> arrayArrayOfModel = null; @@ -53,6 +50,7 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) { * Get arrayOfString * @return arrayOfString */ + @JsonProperty("array_of_string") @ApiModelProperty(value = "") public List getArrayOfString() { @@ -80,6 +78,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ + @JsonProperty("array_array_of_integer") @Valid @ApiModelProperty(value = "") public List> getArrayArrayOfInteger() { @@ -107,6 +106,7 @@ public ArrayTest addArrayArrayOfModelItem(List arrayArrayOfModelI * Get arrayArrayOfModel * @return arrayArrayOfModel */ + @JsonProperty("array_array_of_model") @Valid @ApiModelProperty(value = "") public List> getArrayArrayOfModel() { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCat.java index b95757e117c6..90929d6dd21a 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCat.java @@ -66,7 +66,6 @@ public static KindEnum fromValue(String value) { } } - @JsonProperty("kind") private KindEnum kind; public BigCat kind(KindEnum kind) { @@ -78,6 +77,7 @@ public BigCat kind(KindEnum kind) { * Get kind * @return kind */ + @JsonProperty("kind") @ApiModelProperty(value = "") public KindEnum getKind() { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCatAllOf.java index 9eee7b140851..e82743a46af2 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCatAllOf.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCatAllOf.java @@ -63,7 +63,6 @@ public static KindEnum fromValue(String value) { } } - @JsonProperty("kind") private KindEnum kind; public BigCatAllOf kind(KindEnum kind) { @@ -75,6 +74,7 @@ public BigCatAllOf kind(KindEnum kind) { * Get kind * @return kind */ + @JsonProperty("kind") @ApiModelProperty(value = "") public KindEnum getKind() { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Capitalization.java index f2cd4ce28cfb..71725188bcf0 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Capitalization.java @@ -21,22 +21,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Capitalization { - @JsonProperty("smallCamel") private String smallCamel; - @JsonProperty("CapitalCamel") private String capitalCamel; - @JsonProperty("small_Snake") private String smallSnake; - @JsonProperty("Capital_Snake") private String capitalSnake; - @JsonProperty("SCA_ETH_Flow_Points") private String scAETHFlowPoints; - @JsonProperty("ATT_NAME") private String ATT_NAME; public Capitalization smallCamel(String smallCamel) { @@ -48,6 +42,7 @@ public Capitalization smallCamel(String smallCamel) { * Get smallCamel * @return smallCamel */ + @JsonProperty("smallCamel") @ApiModelProperty(value = "") public String getSmallCamel() { @@ -67,6 +62,7 @@ public Capitalization capitalCamel(String capitalCamel) { * Get capitalCamel * @return capitalCamel */ + @JsonProperty("CapitalCamel") @ApiModelProperty(value = "") public String getCapitalCamel() { @@ -86,6 +82,7 @@ public Capitalization smallSnake(String smallSnake) { * Get smallSnake * @return smallSnake */ + @JsonProperty("small_Snake") @ApiModelProperty(value = "") public String getSmallSnake() { @@ -105,6 +102,7 @@ public Capitalization capitalSnake(String capitalSnake) { * Get capitalSnake * @return capitalSnake */ + @JsonProperty("Capital_Snake") @ApiModelProperty(value = "") public String getCapitalSnake() { @@ -124,6 +122,7 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) { * Get scAETHFlowPoints * @return scAETHFlowPoints */ + @JsonProperty("SCA_ETH_Flow_Points") @ApiModelProperty(value = "") public String getScAETHFlowPoints() { @@ -143,6 +142,7 @@ public Capitalization ATT_NAME(String ATT_NAME) { * Name of the pet * @return ATT_NAME */ + @JsonProperty("ATT_NAME") @ApiModelProperty(value = "Name of the pet ") public String getATTNAME() { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Cat.java index 4adc223f0a2e..f38bef8ddffd 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Cat.java @@ -35,7 +35,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Cat extends Animal { - @JsonProperty("declawed") private Boolean declawed; public Cat declawed(Boolean declawed) { @@ -47,6 +46,7 @@ public Cat declawed(Boolean declawed) { * Get declawed * @return declawed */ + @JsonProperty("declawed") @ApiModelProperty(value = "") public Boolean getDeclawed() { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/CatAllOf.java index 649703382e4b..7aefc5712b73 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/CatAllOf.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/CatAllOf.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class CatAllOf { - @JsonProperty("declawed") private Boolean declawed; public CatAllOf declawed(Boolean declawed) { @@ -35,6 +34,7 @@ public CatAllOf declawed(Boolean declawed) { * Get declawed * @return declawed */ + @JsonProperty("declawed") @ApiModelProperty(value = "") public Boolean getDeclawed() { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Category.java index 84d42b07658e..e12f5918f918 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Category.java @@ -21,10 +21,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name = "default-name"; public Category id(Long id) { @@ -36,6 +34,7 @@ public Category id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -55,6 +54,7 @@ public Category name(String name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @ApiModelProperty(required = true, value = "") public String getName() { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ClassModel.java index 2666fe6a16d3..627307f66567 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ClassModel.java @@ -22,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ClassModel { - @JsonProperty("_class") private String propertyClass; public ClassModel propertyClass(String propertyClass) { @@ -34,6 +33,7 @@ public ClassModel propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ + @JsonProperty("_class") @ApiModelProperty(value = "") public String getPropertyClass() { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Client.java index a877f6b3ecc2..7b8131fdb4a3 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Client.java @@ -21,7 +21,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Client { - @JsonProperty("client") private String client; public Client client(String client) { @@ -33,6 +32,7 @@ public Client client(String client) { * Get client * @return client */ + @JsonProperty("client") @ApiModelProperty(value = "") public String getClient() { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Dog.java index b452c16dae45..703a2c29f33f 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Dog.java @@ -26,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Dog extends Animal { - @JsonProperty("breed") private String breed; public Dog breed(String breed) { @@ -38,6 +37,7 @@ public Dog breed(String breed) { * Get breed * @return breed */ + @JsonProperty("breed") @ApiModelProperty(value = "") public String getBreed() { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/DogAllOf.java index 6e9cc3f76c8f..4db2a11a829f 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/DogAllOf.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/DogAllOf.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class DogAllOf { - @JsonProperty("breed") private String breed; public DogAllOf breed(String breed) { @@ -35,6 +34,7 @@ public DogAllOf breed(String breed) { * Get breed * @return breed */ + @JsonProperty("breed") @ApiModelProperty(value = "") public String getBreed() { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java index 6ec78baa1738..d80a1ff5f57e 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java @@ -59,7 +59,6 @@ public static JustSymbolEnum fromValue(String value) { } } - @JsonProperty("just_symbol") private JustSymbolEnum justSymbol; /** @@ -97,7 +96,6 @@ public static ArrayEnumEnum fromValue(String value) { } } - @JsonProperty("array_enum") @Valid private List arrayEnum = null; @@ -110,6 +108,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) { * Get justSymbol * @return justSymbol */ + @JsonProperty("just_symbol") @ApiModelProperty(value = "") public JustSymbolEnum getJustSymbol() { @@ -137,6 +136,7 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) { * Get arrayEnum * @return arrayEnum */ + @JsonProperty("array_enum") @ApiModelProperty(value = "") public List getArrayEnum() { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumTest.java index 7463264a7077..b53f11641197 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumTest.java @@ -62,7 +62,6 @@ public static EnumStringEnum fromValue(String value) { } } - @JsonProperty("enum_string") private EnumStringEnum enumString; /** @@ -102,7 +101,6 @@ public static EnumStringRequiredEnum fromValue(String value) { } } - @JsonProperty("enum_string_required") private EnumStringRequiredEnum enumStringRequired; /** @@ -140,7 +138,6 @@ public static EnumIntegerEnum fromValue(Integer value) { } } - @JsonProperty("enum_integer") private EnumIntegerEnum enumInteger; /** @@ -178,10 +175,8 @@ public static EnumNumberEnum fromValue(Double value) { } } - @JsonProperty("enum_number") private EnumNumberEnum enumNumber; - @JsonProperty("outerEnum") private OuterEnum outerEnum; public EnumTest enumString(EnumStringEnum enumString) { @@ -193,6 +188,7 @@ public EnumTest enumString(EnumStringEnum enumString) { * Get enumString * @return enumString */ + @JsonProperty("enum_string") @ApiModelProperty(value = "") public EnumStringEnum getEnumString() { @@ -212,6 +208,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) { * Get enumStringRequired * @return enumStringRequired */ + @JsonProperty("enum_string_required") @NotNull @ApiModelProperty(required = true, value = "") public EnumStringRequiredEnum getEnumStringRequired() { @@ -231,6 +228,7 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) { * Get enumInteger * @return enumInteger */ + @JsonProperty("enum_integer") @ApiModelProperty(value = "") public EnumIntegerEnum getEnumInteger() { @@ -250,6 +248,7 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) { * Get enumNumber * @return enumNumber */ + @JsonProperty("enum_number") @ApiModelProperty(value = "") public EnumNumberEnum getEnumNumber() { @@ -269,6 +268,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) { * Get outerEnum * @return outerEnum */ + @JsonProperty("outerEnum") @Valid @ApiModelProperty(value = "") public OuterEnum getOuterEnum() { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/File.java index 3206bff29712..046fabe455a0 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/File.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/File.java @@ -22,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class File { - @JsonProperty("sourceURI") private String sourceURI; public File sourceURI(String sourceURI) { @@ -34,6 +33,7 @@ public File sourceURI(String sourceURI) { * Test capitalization * @return sourceURI */ + @JsonProperty("sourceURI") @ApiModelProperty(value = "Test capitalization") public String getSourceURI() { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 6b0d3744fd88..375e0f9f1f68 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -24,10 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FileSchemaTestClass { - @JsonProperty("file") private File file; - @JsonProperty("files") @Valid private List files = null; @@ -40,6 +38,7 @@ public FileSchemaTestClass file(File file) { * Get file * @return file */ + @JsonProperty("file") @Valid @ApiModelProperty(value = "") public File getFile() { @@ -67,6 +66,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) { * Get files * @return files */ + @JsonProperty("files") @Valid @ApiModelProperty(value = "") public List getFiles() { 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 c985b0b1554f..e219159eb2f6 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 @@ -29,48 +29,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FormatTest { - @JsonProperty("integer") private Integer integer; - @JsonProperty("int32") private Integer int32; - @JsonProperty("int64") private Long int64; - @JsonProperty("number") private BigDecimal number; - @JsonProperty("float") private Float _float; - @JsonProperty("double") private Double _double; - @JsonProperty("string") private String string; - @JsonProperty("byte") private byte[] _byte; - @JsonProperty("binary") private org.springframework.core.io.Resource binary; - @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("password") private String password; - @JsonProperty("BigDecimal") private BigDecimal bigDecimal; public FormatTest integer(Integer integer) { @@ -84,6 +70,7 @@ public FormatTest integer(Integer integer) { * maximum: 100 * @return integer */ + @JsonProperty("integer") @Min(10) @Max(100) @ApiModelProperty(value = "") public Integer getInteger() { @@ -105,6 +92,7 @@ public FormatTest int32(Integer int32) { * maximum: 200 * @return int32 */ + @JsonProperty("int32") @Min(20) @Max(200) @ApiModelProperty(value = "") public Integer getInt32() { @@ -124,6 +112,7 @@ public FormatTest int64(Long int64) { * Get int64 * @return int64 */ + @JsonProperty("int64") @ApiModelProperty(value = "") public Long getInt64() { @@ -145,6 +134,7 @@ public FormatTest number(BigDecimal number) { * maximum: 543.2 * @return number */ + @JsonProperty("number") @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") @ApiModelProperty(required = true, value = "") public BigDecimal getNumber() { @@ -166,6 +156,7 @@ public FormatTest _float(Float _float) { * maximum: 987.6 * @return _float */ + @JsonProperty("float") @DecimalMin("54.3") @DecimalMax("987.6") @ApiModelProperty(value = "") public Float getFloat() { @@ -187,6 +178,7 @@ public FormatTest _double(Double _double) { * maximum: 123.4 * @return _double */ + @JsonProperty("double") @DecimalMin("67.8") @DecimalMax("123.4") @ApiModelProperty(value = "") public Double getDouble() { @@ -206,6 +198,7 @@ public FormatTest string(String string) { * Get string * @return string */ + @JsonProperty("string") @Pattern(regexp = "/[a-z]/i") @ApiModelProperty(value = "") public String getString() { @@ -225,6 +218,7 @@ public FormatTest _byte(byte[] _byte) { * Get _byte * @return _byte */ + @JsonProperty("byte") @NotNull @ApiModelProperty(required = true, value = "") public byte[] getByte() { @@ -244,6 +238,7 @@ public FormatTest binary(org.springframework.core.io.Resource binary) { * Get binary * @return binary */ + @JsonProperty("binary") @Valid @ApiModelProperty(value = "") public org.springframework.core.io.Resource getBinary() { @@ -263,6 +258,7 @@ public FormatTest date(LocalDate date) { * Get date * @return date */ + @JsonProperty("date") @NotNull @Valid @ApiModelProperty(required = true, value = "") public LocalDate getDate() { @@ -282,6 +278,7 @@ public FormatTest dateTime(OffsetDateTime dateTime) { * Get dateTime * @return dateTime */ + @JsonProperty("dateTime") @Valid @ApiModelProperty(value = "") public OffsetDateTime getDateTime() { @@ -301,6 +298,7 @@ public FormatTest uuid(UUID uuid) { * Get uuid * @return uuid */ + @JsonProperty("uuid") @Valid @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") public UUID getUuid() { @@ -320,6 +318,7 @@ public FormatTest password(String password) { * Get password * @return password */ + @JsonProperty("password") @NotNull @Size(min = 10, max = 64) @ApiModelProperty(required = true, value = "") public String getPassword() { @@ -339,6 +338,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) { * Get bigDecimal * @return bigDecimal */ + @JsonProperty("BigDecimal") @Valid @ApiModelProperty(value = "") public BigDecimal getBigDecimal() { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index 36d854ff06c0..d2e2fa4ea223 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -23,10 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class HasOnlyReadOnly { - @JsonProperty("bar") private String bar; - @JsonProperty("foo") private String foo; public HasOnlyReadOnly bar(String bar) { @@ -38,6 +36,7 @@ public HasOnlyReadOnly bar(String bar) { * Get bar * @return bar */ + @JsonProperty("bar") @ApiModelProperty(readOnly = true, value = "") public String getBar() { @@ -57,6 +56,7 @@ public HasOnlyReadOnly foo(String foo) { * Get foo * @return foo */ + @JsonProperty("foo") @ApiModelProperty(readOnly = true, value = "") public String getFoo() { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MapTest.java index 7253ca7481e3..f70d3e0f791a 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MapTest.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MapTest { - @JsonProperty("map_map_of_string") @Valid private Map> mapMapOfString = null; @@ -63,15 +62,12 @@ public static InnerEnum fromValue(String value) { } } - @JsonProperty("map_of_enum_string") @Valid private Map mapOfEnumString = null; - @JsonProperty("direct_map") @Valid private Map directMap = null; - @JsonProperty("indirect_map") @Valid private Map indirectMap = null; @@ -92,6 +88,7 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapMapOfString * @return mapMapOfString */ + @JsonProperty("map_map_of_string") @Valid @ApiModelProperty(value = "") public Map> getMapMapOfString() { @@ -119,6 +116,7 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) * Get mapOfEnumString * @return mapOfEnumString */ + @JsonProperty("map_of_enum_string") @ApiModelProperty(value = "") public Map getMapOfEnumString() { @@ -146,6 +144,7 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) { * Get directMap * @return directMap */ + @JsonProperty("direct_map") @ApiModelProperty(value = "") public Map getDirectMap() { @@ -173,6 +172,7 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) { * Get indirectMap * @return indirectMap */ + @JsonProperty("indirect_map") @ApiModelProperty(value = "") public Map getIndirectMap() { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index ba027c678819..2638ea4c2b3b 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -27,14 +27,11 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("map") @Valid private Map map = null; @@ -47,6 +44,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { * Get uuid * @return uuid */ + @JsonProperty("uuid") @Valid @ApiModelProperty(value = "") public UUID getUuid() { @@ -66,6 +64,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT * Get dateTime * @return dateTime */ + @JsonProperty("dateTime") @Valid @ApiModelProperty(value = "") public OffsetDateTime getDateTime() { @@ -93,6 +92,7 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * Get map * @return map */ + @JsonProperty("map") @Valid @ApiModelProperty(value = "") public Map getMap() { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Model200Response.java index fac227135b94..2d8cbff35302 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Model200Response.java @@ -24,10 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Model200Response { - @JsonProperty("name") private Integer name; - @JsonProperty("class") private String propertyClass; public Model200Response name(Integer name) { @@ -39,6 +37,7 @@ public Model200Response name(Integer name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public Integer getName() { @@ -58,6 +57,7 @@ public Model200Response propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ + @JsonProperty("class") @ApiModelProperty(value = "") public String getPropertyClass() { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelApiResponse.java index 6efe7c8047f7..6e87a00f0fea 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -23,13 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -41,6 +38,7 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ + @JsonProperty("code") @ApiModelProperty(value = "") public Integer getCode() { @@ -60,6 +58,7 @@ public ModelApiResponse type(String type) { * Get type * @return type */ + @JsonProperty("type") @ApiModelProperty(value = "") public String getType() { @@ -79,6 +78,7 @@ public ModelApiResponse message(String message) { * Get message * @return message */ + @JsonProperty("message") @ApiModelProperty(value = "") public String getMessage() { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelList.java index dc9eb8ae5255..16e4dcfe630b 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelList.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelList { - @JsonProperty("123-list") private String _123list; public ModelList _123list(String _123list) { @@ -35,6 +34,7 @@ public ModelList _123list(String _123list) { * Get _123list * @return _123list */ + @JsonProperty("123-list") @ApiModelProperty(value = "") public String get123list() { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelReturn.java index 4622b115826f..564fe0bf61fb 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelReturn.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelReturn { - @JsonProperty("return") private Integer _return; public ModelReturn _return(Integer _return) { @@ -36,6 +35,7 @@ public ModelReturn _return(Integer _return) { * Get _return * @return _return */ + @JsonProperty("return") @ApiModelProperty(value = "") public Integer getReturn() { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Name.java index 73c079cba91c..85971ede0398 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Name.java @@ -22,16 +22,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Name { - @JsonProperty("name") private Integer name; - @JsonProperty("snake_case") private Integer snakeCase; - @JsonProperty("property") private String property; - @JsonProperty("123Number") private Integer _123number; public Name name(Integer name) { @@ -43,6 +39,7 @@ public Name name(Integer name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @ApiModelProperty(required = true, value = "") public Integer getName() { @@ -62,6 +59,7 @@ public Name snakeCase(Integer snakeCase) { * Get snakeCase * @return snakeCase */ + @JsonProperty("snake_case") @ApiModelProperty(readOnly = true, value = "") public Integer getSnakeCase() { @@ -81,6 +79,7 @@ public Name property(String property) { * Get property * @return property */ + @JsonProperty("property") @ApiModelProperty(value = "") public String getProperty() { @@ -100,6 +99,7 @@ public Name _123number(Integer _123number) { * Get _123number * @return _123number */ + @JsonProperty("123Number") @ApiModelProperty(readOnly = true, value = "") public Integer get123number() { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/NumberOnly.java index 33fadd6869b4..cf7314fcb52d 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/NumberOnly.java @@ -22,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class NumberOnly { - @JsonProperty("JustNumber") private BigDecimal justNumber; public NumberOnly justNumber(BigDecimal justNumber) { @@ -34,6 +33,7 @@ public NumberOnly justNumber(BigDecimal justNumber) { * Get justNumber * @return justNumber */ + @JsonProperty("JustNumber") @Valid @ApiModelProperty(value = "") public BigDecimal getJustNumber() { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Order.java index 1ce3810c20df..2177faf7f781 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Order.java @@ -24,16 +24,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -74,10 +70,8 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -89,6 +83,7 @@ public Order id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -108,6 +103,7 @@ public Order petId(Long petId) { * Get petId * @return petId */ + @JsonProperty("petId") @ApiModelProperty(value = "") public Long getPetId() { @@ -127,6 +123,7 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ + @JsonProperty("quantity") @ApiModelProperty(value = "") public Integer getQuantity() { @@ -146,6 +143,7 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ + @JsonProperty("shipDate") @Valid @ApiModelProperty(value = "") public OffsetDateTime getShipDate() { @@ -165,6 +163,7 @@ public Order status(StatusEnum status) { * Order Status * @return status */ + @JsonProperty("status") @ApiModelProperty(value = "Order Status") public StatusEnum getStatus() { @@ -184,6 +183,7 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ + @JsonProperty("complete") @ApiModelProperty(value = "") public Boolean getComplete() { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/OuterComposite.java index a590e26b3f1d..2cb77a6e8a9d 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/OuterComposite.java @@ -22,13 +22,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class OuterComposite { - @JsonProperty("my_number") private BigDecimal myNumber; - @JsonProperty("my_string") private String myString; - @JsonProperty("my_boolean") private Boolean myBoolean; public OuterComposite myNumber(BigDecimal myNumber) { @@ -40,6 +37,7 @@ public OuterComposite myNumber(BigDecimal myNumber) { * Get myNumber * @return myNumber */ + @JsonProperty("my_number") @Valid @ApiModelProperty(value = "") public BigDecimal getMyNumber() { @@ -59,6 +57,7 @@ public OuterComposite myString(String myString) { * Get myString * @return myString */ + @JsonProperty("my_string") @ApiModelProperty(value = "") public String getMyString() { @@ -78,6 +77,7 @@ public OuterComposite myBoolean(Boolean myBoolean) { * Get myBoolean * @return myBoolean */ + @JsonProperty("my_boolean") @ApiModelProperty(value = "") public Boolean getMyBoolean() { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java index 72dff4a24508..aea4d64318e5 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java @@ -29,20 +29,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private Set photoUrls = new LinkedHashSet<>(); - @JsonProperty("tags") @Valid private List tags = null; @@ -83,7 +78,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; public Pet id(Long id) { @@ -95,6 +89,7 @@ public Pet id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -114,6 +109,7 @@ public Pet category(Category category) { * Get category * @return category */ + @JsonProperty("category") @Valid @ApiModelProperty(value = "") public Category getCategory() { @@ -133,6 +129,7 @@ public Pet name(String name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") public String getName() { @@ -160,6 +157,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ + @JsonProperty("photoUrls") @NotNull @ApiModelProperty(required = true, value = "") public Set getPhotoUrls() { @@ -188,6 +186,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ + @JsonProperty("tags") @Valid @ApiModelProperty(value = "") public List getTags() { @@ -207,6 +206,7 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ + @JsonProperty("status") @ApiModelProperty(value = "pet status in the store") public StatusEnum getStatus() { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ReadOnlyFirst.java index c09e0076810e..94470d74ed59 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -21,10 +21,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ReadOnlyFirst { - @JsonProperty("bar") private String bar; - @JsonProperty("baz") private String baz; public ReadOnlyFirst bar(String bar) { @@ -36,6 +34,7 @@ public ReadOnlyFirst bar(String bar) { * Get bar * @return bar */ + @JsonProperty("bar") @ApiModelProperty(readOnly = true, value = "") public String getBar() { @@ -55,6 +54,7 @@ public ReadOnlyFirst baz(String baz) { * Get baz * @return baz */ + @JsonProperty("baz") @ApiModelProperty(value = "") public String getBaz() { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/SpecialModelName.java index 06b722ccf5f2..00beb2864cdd 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/SpecialModelName.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class SpecialModelName { - @JsonProperty("$special[property.name]") private Long $specialPropertyName; public SpecialModelName $specialPropertyName(Long $specialPropertyName) { @@ -35,6 +34,7 @@ public class SpecialModelName { * Get $specialPropertyName * @return $specialPropertyName */ + @JsonProperty("$special[property.name]") @ApiModelProperty(value = "") public Long get$SpecialPropertyName() { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Tag.java index 6ccb99b1e73e..cedb8790bb63 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Tag.java @@ -21,10 +21,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -36,6 +34,7 @@ public Tag id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -55,6 +54,7 @@ public Tag name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java index 675a2453ad16..c41427d3d288 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -24,19 +24,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderDefault { - @JsonProperty("string_item") private String stringItem = "what"; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem = true; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -49,6 +44,7 @@ public TypeHolderDefault stringItem(String stringItem) { * Get stringItem * @return stringItem */ + @JsonProperty("string_item") @NotNull @ApiModelProperty(required = true, value = "") public String getStringItem() { @@ -68,6 +64,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ + @JsonProperty("number_item") @NotNull @Valid @ApiModelProperty(required = true, value = "") public BigDecimal getNumberItem() { @@ -87,6 +84,7 @@ public TypeHolderDefault integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ + @JsonProperty("integer_item") @NotNull @ApiModelProperty(required = true, value = "") public Integer getIntegerItem() { @@ -106,6 +104,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ + @JsonProperty("bool_item") @NotNull @ApiModelProperty(required = true, value = "") public Boolean getBoolItem() { @@ -133,6 +132,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ + @JsonProperty("array_item") @NotNull @ApiModelProperty(required = true, value = "") public List getArrayItem() { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java index a342162fcc30..475f82dc3f76 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -24,22 +24,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderExample { - @JsonProperty("string_item") private String stringItem; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("float_item") private Float floatItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -52,6 +46,7 @@ public TypeHolderExample stringItem(String stringItem) { * Get stringItem * @return stringItem */ + @JsonProperty("string_item") @NotNull @ApiModelProperty(example = "what", required = true, value = "") public String getStringItem() { @@ -71,6 +66,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ + @JsonProperty("number_item") @NotNull @Valid @ApiModelProperty(example = "1.234", required = true, value = "") public BigDecimal getNumberItem() { @@ -90,6 +86,7 @@ public TypeHolderExample floatItem(Float floatItem) { * Get floatItem * @return floatItem */ + @JsonProperty("float_item") @NotNull @ApiModelProperty(example = "1.234", required = true, value = "") public Float getFloatItem() { @@ -109,6 +106,7 @@ public TypeHolderExample integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ + @JsonProperty("integer_item") @NotNull @ApiModelProperty(example = "-2", required = true, value = "") public Integer getIntegerItem() { @@ -128,6 +126,7 @@ public TypeHolderExample boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ + @JsonProperty("bool_item") @NotNull @ApiModelProperty(example = "true", required = true, value = "") public Boolean getBoolItem() { @@ -155,6 +154,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ + @JsonProperty("array_item") @NotNull @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "") public List getArrayItem() { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/User.java index e5180de1584e..ddf0023eb61f 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/User.java @@ -21,28 +21,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -54,6 +46,7 @@ public User id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -73,6 +66,7 @@ public User username(String username) { * Get username * @return username */ + @JsonProperty("username") @ApiModelProperty(value = "") public String getUsername() { @@ -92,6 +86,7 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ + @JsonProperty("firstName") @ApiModelProperty(value = "") public String getFirstName() { @@ -111,6 +106,7 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ + @JsonProperty("lastName") @ApiModelProperty(value = "") public String getLastName() { @@ -130,6 +126,7 @@ public User email(String email) { * Get email * @return email */ + @JsonProperty("email") @ApiModelProperty(value = "") public String getEmail() { @@ -149,6 +146,7 @@ public User password(String password) { * Get password * @return password */ + @JsonProperty("password") @ApiModelProperty(value = "") public String getPassword() { @@ -168,6 +166,7 @@ public User phone(String phone) { * Get phone * @return phone */ + @JsonProperty("phone") @ApiModelProperty(value = "") public String getPhone() { @@ -187,6 +186,7 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ + @JsonProperty("userStatus") @ApiModelProperty(value = "User Status") public Integer getUserStatus() { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java index 98a5e28e4dc9..8b6051157c9e 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java @@ -24,99 +24,70 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class XmlItem { - @JsonProperty("attribute_string") private String attributeString; - @JsonProperty("attribute_number") private BigDecimal attributeNumber; - @JsonProperty("attribute_integer") private Integer attributeInteger; - @JsonProperty("attribute_boolean") private Boolean attributeBoolean; - @JsonProperty("wrapped_array") @Valid private List wrappedArray = null; - @JsonProperty("name_string") private String nameString; - @JsonProperty("name_number") private BigDecimal nameNumber; - @JsonProperty("name_integer") private Integer nameInteger; - @JsonProperty("name_boolean") private Boolean nameBoolean; - @JsonProperty("name_array") @Valid private List nameArray = null; - @JsonProperty("name_wrapped_array") @Valid private List nameWrappedArray = null; - @JsonProperty("prefix_string") private String prefixString; - @JsonProperty("prefix_number") private BigDecimal prefixNumber; - @JsonProperty("prefix_integer") private Integer prefixInteger; - @JsonProperty("prefix_boolean") private Boolean prefixBoolean; - @JsonProperty("prefix_array") @Valid private List prefixArray = null; - @JsonProperty("prefix_wrapped_array") @Valid private List prefixWrappedArray = null; - @JsonProperty("namespace_string") private String namespaceString; - @JsonProperty("namespace_number") private BigDecimal namespaceNumber; - @JsonProperty("namespace_integer") private Integer namespaceInteger; - @JsonProperty("namespace_boolean") private Boolean namespaceBoolean; - @JsonProperty("namespace_array") @Valid private List namespaceArray = null; - @JsonProperty("namespace_wrapped_array") @Valid private List namespaceWrappedArray = null; - @JsonProperty("prefix_ns_string") private String prefixNsString; - @JsonProperty("prefix_ns_number") private BigDecimal prefixNsNumber; - @JsonProperty("prefix_ns_integer") private Integer prefixNsInteger; - @JsonProperty("prefix_ns_boolean") private Boolean prefixNsBoolean; - @JsonProperty("prefix_ns_array") @Valid private List prefixNsArray = null; - @JsonProperty("prefix_ns_wrapped_array") @Valid private List prefixNsWrappedArray = null; @@ -129,6 +100,7 @@ public XmlItem attributeString(String attributeString) { * Get attributeString * @return attributeString */ + @JsonProperty("attribute_string") @ApiModelProperty(example = "string", value = "") public String getAttributeString() { @@ -148,6 +120,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) { * Get attributeNumber * @return attributeNumber */ + @JsonProperty("attribute_number") @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getAttributeNumber() { @@ -167,6 +140,7 @@ public XmlItem attributeInteger(Integer attributeInteger) { * Get attributeInteger * @return attributeInteger */ + @JsonProperty("attribute_integer") @ApiModelProperty(example = "-2", value = "") public Integer getAttributeInteger() { @@ -186,6 +160,7 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) { * Get attributeBoolean * @return attributeBoolean */ + @JsonProperty("attribute_boolean") @ApiModelProperty(example = "true", value = "") public Boolean getAttributeBoolean() { @@ -213,6 +188,7 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) { * Get wrappedArray * @return wrappedArray */ + @JsonProperty("wrapped_array") @ApiModelProperty(value = "") public List getWrappedArray() { @@ -232,6 +208,7 @@ public XmlItem nameString(String nameString) { * Get nameString * @return nameString */ + @JsonProperty("name_string") @ApiModelProperty(example = "string", value = "") public String getNameString() { @@ -251,6 +228,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) { * Get nameNumber * @return nameNumber */ + @JsonProperty("name_number") @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getNameNumber() { @@ -270,6 +248,7 @@ public XmlItem nameInteger(Integer nameInteger) { * Get nameInteger * @return nameInteger */ + @JsonProperty("name_integer") @ApiModelProperty(example = "-2", value = "") public Integer getNameInteger() { @@ -289,6 +268,7 @@ public XmlItem nameBoolean(Boolean nameBoolean) { * Get nameBoolean * @return nameBoolean */ + @JsonProperty("name_boolean") @ApiModelProperty(example = "true", value = "") public Boolean getNameBoolean() { @@ -316,6 +296,7 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) { * Get nameArray * @return nameArray */ + @JsonProperty("name_array") @ApiModelProperty(value = "") public List getNameArray() { @@ -343,6 +324,7 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) { * Get nameWrappedArray * @return nameWrappedArray */ + @JsonProperty("name_wrapped_array") @ApiModelProperty(value = "") public List getNameWrappedArray() { @@ -362,6 +344,7 @@ public XmlItem prefixString(String prefixString) { * Get prefixString * @return prefixString */ + @JsonProperty("prefix_string") @ApiModelProperty(example = "string", value = "") public String getPrefixString() { @@ -381,6 +364,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) { * Get prefixNumber * @return prefixNumber */ + @JsonProperty("prefix_number") @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getPrefixNumber() { @@ -400,6 +384,7 @@ public XmlItem prefixInteger(Integer prefixInteger) { * Get prefixInteger * @return prefixInteger */ + @JsonProperty("prefix_integer") @ApiModelProperty(example = "-2", value = "") public Integer getPrefixInteger() { @@ -419,6 +404,7 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) { * Get prefixBoolean * @return prefixBoolean */ + @JsonProperty("prefix_boolean") @ApiModelProperty(example = "true", value = "") public Boolean getPrefixBoolean() { @@ -446,6 +432,7 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) { * Get prefixArray * @return prefixArray */ + @JsonProperty("prefix_array") @ApiModelProperty(value = "") public List getPrefixArray() { @@ -473,6 +460,7 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) { * Get prefixWrappedArray * @return prefixWrappedArray */ + @JsonProperty("prefix_wrapped_array") @ApiModelProperty(value = "") public List getPrefixWrappedArray() { @@ -492,6 +480,7 @@ public XmlItem namespaceString(String namespaceString) { * Get namespaceString * @return namespaceString */ + @JsonProperty("namespace_string") @ApiModelProperty(example = "string", value = "") public String getNamespaceString() { @@ -511,6 +500,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) { * Get namespaceNumber * @return namespaceNumber */ + @JsonProperty("namespace_number") @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getNamespaceNumber() { @@ -530,6 +520,7 @@ public XmlItem namespaceInteger(Integer namespaceInteger) { * Get namespaceInteger * @return namespaceInteger */ + @JsonProperty("namespace_integer") @ApiModelProperty(example = "-2", value = "") public Integer getNamespaceInteger() { @@ -549,6 +540,7 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) { * Get namespaceBoolean * @return namespaceBoolean */ + @JsonProperty("namespace_boolean") @ApiModelProperty(example = "true", value = "") public Boolean getNamespaceBoolean() { @@ -576,6 +568,7 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) { * Get namespaceArray * @return namespaceArray */ + @JsonProperty("namespace_array") @ApiModelProperty(value = "") public List getNamespaceArray() { @@ -603,6 +596,7 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) { * Get namespaceWrappedArray * @return namespaceWrappedArray */ + @JsonProperty("namespace_wrapped_array") @ApiModelProperty(value = "") public List getNamespaceWrappedArray() { @@ -622,6 +616,7 @@ public XmlItem prefixNsString(String prefixNsString) { * Get prefixNsString * @return prefixNsString */ + @JsonProperty("prefix_ns_string") @ApiModelProperty(example = "string", value = "") public String getPrefixNsString() { @@ -641,6 +636,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) { * Get prefixNsNumber * @return prefixNsNumber */ + @JsonProperty("prefix_ns_number") @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getPrefixNsNumber() { @@ -660,6 +656,7 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) { * Get prefixNsInteger * @return prefixNsInteger */ + @JsonProperty("prefix_ns_integer") @ApiModelProperty(example = "-2", value = "") public Integer getPrefixNsInteger() { @@ -679,6 +676,7 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) { * Get prefixNsBoolean * @return prefixNsBoolean */ + @JsonProperty("prefix_ns_boolean") @ApiModelProperty(example = "true", value = "") public Boolean getPrefixNsBoolean() { @@ -706,6 +704,7 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) { * Get prefixNsArray * @return prefixNsArray */ + @JsonProperty("prefix_ns_array") @ApiModelProperty(value = "") public List getPrefixNsArray() { @@ -733,6 +732,7 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) { * Get prefixNsWrappedArray * @return prefixNsWrappedArray */ + @JsonProperty("prefix_ns_wrapped_array") @ApiModelProperty(value = "") public List getPrefixNsWrappedArray() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 8e4c17989762..cb51920a8c28 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesAnyType extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesAnyType name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesAnyType name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 27a8f01607f1..1c66a636116f 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesArray extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesArray name(String name) { @@ -37,6 +36,7 @@ public AdditionalPropertiesArray name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index bc7b87d760a9..1dcc607639bf 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesBoolean extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesBoolean name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesBoolean name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index b5e88d5d7ccb..74250eb564ad 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -26,45 +26,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesClass { - @JsonProperty("map_string") @Valid private Map mapString = null; - @JsonProperty("map_number") @Valid private Map mapNumber = null; - @JsonProperty("map_integer") @Valid private Map mapInteger = null; - @JsonProperty("map_boolean") @Valid private Map mapBoolean = null; - @JsonProperty("map_array_integer") @Valid private Map> mapArrayInteger = null; - @JsonProperty("map_array_anytype") @Valid private Map> mapArrayAnytype = null; - @JsonProperty("map_map_string") @Valid private Map> mapMapString = null; - @JsonProperty("map_map_anytype") @Valid private Map> mapMapAnytype = null; - @JsonProperty("anytype_1") private Object anytype1; - @JsonProperty("anytype_2") private Object anytype2; - @JsonProperty("anytype_3") private Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { @@ -84,6 +73,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt * Get mapString * @return mapString */ + @JsonProperty("map_string") @ApiModelProperty(value = "") public Map getMapString() { @@ -111,6 +101,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * Get mapNumber * @return mapNumber */ + @JsonProperty("map_number") @Valid @ApiModelProperty(value = "") public Map getMapNumber() { @@ -138,6 +129,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege * Get mapInteger * @return mapInteger */ + @JsonProperty("map_integer") @ApiModelProperty(value = "") public Map getMapInteger() { @@ -165,6 +157,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea * Get mapBoolean * @return mapBoolean */ + @JsonProperty("map_boolean") @ApiModelProperty(value = "") public Map getMapBoolean() { @@ -192,6 +185,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { @@ -219,6 +213,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * Get mapArrayAnytype * @return mapArrayAnytype */ + @JsonProperty("map_array_anytype") @Valid @ApiModelProperty(value = "") public Map> getMapArrayAnytype() { @@ -246,6 +241,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { @@ -273,6 +269,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { @@ -292,6 +289,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) { * Get anytype1 * @return anytype1 */ + @JsonProperty("anytype_1") @ApiModelProperty(value = "") public Object getAnytype1() { @@ -311,6 +309,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) { * Get anytype2 * @return anytype2 */ + @JsonProperty("anytype_2") @ApiModelProperty(value = "") public Object getAnytype2() { @@ -330,6 +329,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) { * Get anytype3 * @return anytype3 */ + @JsonProperty("anytype_3") @ApiModelProperty(value = "") public Object getAnytype3() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 00b5174e93b7..ce8b8d62436c 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesInteger extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesInteger name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesInteger name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 8fec423ffb1b..dec791e0a273 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesNumber extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesNumber name(String name) { @@ -37,6 +36,7 @@ public AdditionalPropertiesNumber name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 67033332b0d6..546d0ab9216f 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesObject extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesObject name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesObject name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 993f83bb2cc1..c1f95cf62e81 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesString extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesString name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesString name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Animal.java index e11ae425d9e9..e880f829164c 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Animal.java @@ -39,10 +39,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Animal { - @JsonProperty("className") private String className; - @JsonProperty("color") private String color = "red"; public Animal className(String className) { @@ -54,6 +52,7 @@ public Animal className(String className) { * Get className * @return className */ + @JsonProperty("className") @NotNull @ApiModelProperty(required = true, value = "") public String getClassName() { @@ -73,6 +72,7 @@ public Animal color(String color) { * Get color * @return color */ + @JsonProperty("color") @ApiModelProperty(value = "") public String getColor() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index df67eda87fd1..46ab3b631960 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfArrayOfNumberOnly { - @JsonProperty("ArrayArrayNumber") @Valid private List> arrayArrayNumber = null; @@ -46,6 +45,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * Get arrayArrayNumber * @return arrayArrayNumber */ + @JsonProperty("ArrayArrayNumber") @Valid @ApiModelProperty(value = "") public List> getArrayArrayNumber() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 05f1ca376a68..cb5358905469 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfNumberOnly { - @JsonProperty("ArrayNumber") @Valid private List arrayNumber = null; @@ -46,6 +45,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ + @JsonProperty("ArrayNumber") @Valid @ApiModelProperty(value = "") public List getArrayNumber() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayTest.java index ba67885edc8a..55cc431ecde6 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayTest.java @@ -25,15 +25,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayTest { - @JsonProperty("array_of_string") @Valid private List arrayOfString = null; - @JsonProperty("array_array_of_integer") @Valid private List> arrayArrayOfInteger = null; - @JsonProperty("array_array_of_model") @Valid private List> arrayArrayOfModel = null; @@ -54,6 +51,7 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) { * Get arrayOfString * @return arrayOfString */ + @JsonProperty("array_of_string") @ApiModelProperty(value = "") public List getArrayOfString() { @@ -81,6 +79,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ + @JsonProperty("array_array_of_integer") @Valid @ApiModelProperty(value = "") public List> getArrayArrayOfInteger() { @@ -108,6 +107,7 @@ public ArrayTest addArrayArrayOfModelItem(List arrayArrayOfModelI * Get arrayArrayOfModel * @return arrayArrayOfModel */ + @JsonProperty("array_array_of_model") @Valid @ApiModelProperty(value = "") public List> getArrayArrayOfModel() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/BigCat.java index ec95c1253fad..70bbb0b93532 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/BigCat.java @@ -67,7 +67,6 @@ public static KindEnum fromValue(String value) { } } - @JsonProperty("kind") private KindEnum kind; public BigCat kind(KindEnum kind) { @@ -79,6 +78,7 @@ public BigCat kind(KindEnum kind) { * Get kind * @return kind */ + @JsonProperty("kind") @ApiModelProperty(value = "") public KindEnum getKind() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/BigCatAllOf.java index 35ae937c0009..1a86665050e6 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/BigCatAllOf.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/BigCatAllOf.java @@ -64,7 +64,6 @@ public static KindEnum fromValue(String value) { } } - @JsonProperty("kind") private KindEnum kind; public BigCatAllOf kind(KindEnum kind) { @@ -76,6 +75,7 @@ public BigCatAllOf kind(KindEnum kind) { * Get kind * @return kind */ + @JsonProperty("kind") @ApiModelProperty(value = "") public KindEnum getKind() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Capitalization.java index e9cce9de0115..e0fdbe78bae2 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Capitalization.java @@ -22,22 +22,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Capitalization { - @JsonProperty("smallCamel") private String smallCamel; - @JsonProperty("CapitalCamel") private String capitalCamel; - @JsonProperty("small_Snake") private String smallSnake; - @JsonProperty("Capital_Snake") private String capitalSnake; - @JsonProperty("SCA_ETH_Flow_Points") private String scAETHFlowPoints; - @JsonProperty("ATT_NAME") private String ATT_NAME; public Capitalization smallCamel(String smallCamel) { @@ -49,6 +43,7 @@ public Capitalization smallCamel(String smallCamel) { * Get smallCamel * @return smallCamel */ + @JsonProperty("smallCamel") @ApiModelProperty(value = "") public String getSmallCamel() { @@ -68,6 +63,7 @@ public Capitalization capitalCamel(String capitalCamel) { * Get capitalCamel * @return capitalCamel */ + @JsonProperty("CapitalCamel") @ApiModelProperty(value = "") public String getCapitalCamel() { @@ -87,6 +83,7 @@ public Capitalization smallSnake(String smallSnake) { * Get smallSnake * @return smallSnake */ + @JsonProperty("small_Snake") @ApiModelProperty(value = "") public String getSmallSnake() { @@ -106,6 +103,7 @@ public Capitalization capitalSnake(String capitalSnake) { * Get capitalSnake * @return capitalSnake */ + @JsonProperty("Capital_Snake") @ApiModelProperty(value = "") public String getCapitalSnake() { @@ -125,6 +123,7 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) { * Get scAETHFlowPoints * @return scAETHFlowPoints */ + @JsonProperty("SCA_ETH_Flow_Points") @ApiModelProperty(value = "") public String getScAETHFlowPoints() { @@ -144,6 +143,7 @@ public Capitalization ATT_NAME(String ATT_NAME) { * Name of the pet * @return ATT_NAME */ + @JsonProperty("ATT_NAME") @ApiModelProperty(value = "Name of the pet ") public String getATTNAME() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Cat.java index 097ddbef7980..958fcb2298e0 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Cat.java @@ -36,7 +36,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Cat extends Animal { - @JsonProperty("declawed") private Boolean declawed; public Cat declawed(Boolean declawed) { @@ -48,6 +47,7 @@ public Cat declawed(Boolean declawed) { * Get declawed * @return declawed */ + @JsonProperty("declawed") @ApiModelProperty(value = "") public Boolean getDeclawed() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/CatAllOf.java index eed74bea751a..63de2ad8818e 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/CatAllOf.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/CatAllOf.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class CatAllOf { - @JsonProperty("declawed") private Boolean declawed; public CatAllOf declawed(Boolean declawed) { @@ -36,6 +35,7 @@ public CatAllOf declawed(Boolean declawed) { * Get declawed * @return declawed */ + @JsonProperty("declawed") @ApiModelProperty(value = "") public Boolean getDeclawed() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Category.java index 27a4a9f25665..b63268b2c8ce 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Category.java @@ -22,10 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name = "default-name"; public Category id(Long id) { @@ -37,6 +35,7 @@ public Category id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -56,6 +55,7 @@ public Category name(String name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @ApiModelProperty(required = true, value = "") public String getName() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ClassModel.java index 69296da7e60e..976f0b01d071 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ClassModel.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ClassModel { - @JsonProperty("_class") private String propertyClass; public ClassModel propertyClass(String propertyClass) { @@ -35,6 +34,7 @@ public ClassModel propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ + @JsonProperty("_class") @ApiModelProperty(value = "") public String getPropertyClass() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Client.java index b788daea14a3..a3c4731f3339 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Client.java @@ -22,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Client { - @JsonProperty("client") private String client; public Client client(String client) { @@ -34,6 +33,7 @@ public Client client(String client) { * Get client * @return client */ + @JsonProperty("client") @ApiModelProperty(value = "") public String getClient() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Dog.java index 9b61a2fa29b6..593562fabb42 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Dog.java @@ -27,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Dog extends Animal { - @JsonProperty("breed") private String breed; public Dog breed(String breed) { @@ -39,6 +38,7 @@ public Dog breed(String breed) { * Get breed * @return breed */ + @JsonProperty("breed") @ApiModelProperty(value = "") public String getBreed() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/DogAllOf.java index 4f275e535333..7ddb24717737 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/DogAllOf.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/DogAllOf.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class DogAllOf { - @JsonProperty("breed") private String breed; public DogAllOf breed(String breed) { @@ -36,6 +35,7 @@ public DogAllOf breed(String breed) { * Get breed * @return breed */ + @JsonProperty("breed") @ApiModelProperty(value = "") public String getBreed() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumArrays.java index dba32cf2b710..04e850b1cf17 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumArrays.java @@ -60,7 +60,6 @@ public static JustSymbolEnum fromValue(String value) { } } - @JsonProperty("just_symbol") private JustSymbolEnum justSymbol; /** @@ -98,7 +97,6 @@ public static ArrayEnumEnum fromValue(String value) { } } - @JsonProperty("array_enum") @Valid private List arrayEnum = null; @@ -111,6 +109,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) { * Get justSymbol * @return justSymbol */ + @JsonProperty("just_symbol") @ApiModelProperty(value = "") public JustSymbolEnum getJustSymbol() { @@ -138,6 +137,7 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) { * Get arrayEnum * @return arrayEnum */ + @JsonProperty("array_enum") @ApiModelProperty(value = "") public List getArrayEnum() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumTest.java index c20bc1460143..49747f67dccf 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumTest.java @@ -63,7 +63,6 @@ public static EnumStringEnum fromValue(String value) { } } - @JsonProperty("enum_string") private EnumStringEnum enumString; /** @@ -103,7 +102,6 @@ public static EnumStringRequiredEnum fromValue(String value) { } } - @JsonProperty("enum_string_required") private EnumStringRequiredEnum enumStringRequired; /** @@ -141,7 +139,6 @@ public static EnumIntegerEnum fromValue(Integer value) { } } - @JsonProperty("enum_integer") private EnumIntegerEnum enumInteger; /** @@ -179,10 +176,8 @@ public static EnumNumberEnum fromValue(Double value) { } } - @JsonProperty("enum_number") private EnumNumberEnum enumNumber; - @JsonProperty("outerEnum") private OuterEnum outerEnum; public EnumTest enumString(EnumStringEnum enumString) { @@ -194,6 +189,7 @@ public EnumTest enumString(EnumStringEnum enumString) { * Get enumString * @return enumString */ + @JsonProperty("enum_string") @ApiModelProperty(value = "") public EnumStringEnum getEnumString() { @@ -213,6 +209,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) { * Get enumStringRequired * @return enumStringRequired */ + @JsonProperty("enum_string_required") @NotNull @ApiModelProperty(required = true, value = "") public EnumStringRequiredEnum getEnumStringRequired() { @@ -232,6 +229,7 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) { * Get enumInteger * @return enumInteger */ + @JsonProperty("enum_integer") @ApiModelProperty(value = "") public EnumIntegerEnum getEnumInteger() { @@ -251,6 +249,7 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) { * Get enumNumber * @return enumNumber */ + @JsonProperty("enum_number") @ApiModelProperty(value = "") public EnumNumberEnum getEnumNumber() { @@ -270,6 +269,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) { * Get outerEnum * @return outerEnum */ + @JsonProperty("outerEnum") @Valid @ApiModelProperty(value = "") public OuterEnum getOuterEnum() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/File.java index d82e4902623d..43c44fd344bb 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/File.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/File.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class File { - @JsonProperty("sourceURI") private String sourceURI; public File sourceURI(String sourceURI) { @@ -35,6 +34,7 @@ public File sourceURI(String sourceURI) { * Test capitalization * @return sourceURI */ + @JsonProperty("sourceURI") @ApiModelProperty(value = "Test capitalization") public String getSourceURI() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 2ea153bd6468..d7815943b774 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -25,10 +25,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FileSchemaTestClass { - @JsonProperty("file") private File file; - @JsonProperty("files") @Valid private List files = null; @@ -41,6 +39,7 @@ public FileSchemaTestClass file(File file) { * Get file * @return file */ + @JsonProperty("file") @Valid @ApiModelProperty(value = "") public File getFile() { @@ -68,6 +67,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) { * Get files * @return files */ + @JsonProperty("files") @Valid @ApiModelProperty(value = "") public List getFiles() { 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 0e2aeaa78a22..ffd18f0ce221 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 @@ -30,48 +30,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FormatTest { - @JsonProperty("integer") private Integer integer; - @JsonProperty("int32") private Integer int32; - @JsonProperty("int64") private Long int64; - @JsonProperty("number") private BigDecimal number; - @JsonProperty("float") private Float _float; - @JsonProperty("double") private Double _double; - @JsonProperty("string") private String string; - @JsonProperty("byte") private byte[] _byte; - @JsonProperty("binary") private org.springframework.core.io.Resource binary; - @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("password") private String password; - @JsonProperty("BigDecimal") private BigDecimal bigDecimal; public FormatTest integer(Integer integer) { @@ -85,6 +71,7 @@ public FormatTest integer(Integer integer) { * maximum: 100 * @return integer */ + @JsonProperty("integer") @Min(10) @Max(100) @ApiModelProperty(value = "") public Integer getInteger() { @@ -106,6 +93,7 @@ public FormatTest int32(Integer int32) { * maximum: 200 * @return int32 */ + @JsonProperty("int32") @Min(20) @Max(200) @ApiModelProperty(value = "") public Integer getInt32() { @@ -125,6 +113,7 @@ public FormatTest int64(Long int64) { * Get int64 * @return int64 */ + @JsonProperty("int64") @ApiModelProperty(value = "") public Long getInt64() { @@ -146,6 +135,7 @@ public FormatTest number(BigDecimal number) { * maximum: 543.2 * @return number */ + @JsonProperty("number") @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") @ApiModelProperty(required = true, value = "") public BigDecimal getNumber() { @@ -167,6 +157,7 @@ public FormatTest _float(Float _float) { * maximum: 987.6 * @return _float */ + @JsonProperty("float") @DecimalMin("54.3") @DecimalMax("987.6") @ApiModelProperty(value = "") public Float getFloat() { @@ -188,6 +179,7 @@ public FormatTest _double(Double _double) { * maximum: 123.4 * @return _double */ + @JsonProperty("double") @DecimalMin("67.8") @DecimalMax("123.4") @ApiModelProperty(value = "") public Double getDouble() { @@ -207,6 +199,7 @@ public FormatTest string(String string) { * Get string * @return string */ + @JsonProperty("string") @Pattern(regexp = "/[a-z]/i") @ApiModelProperty(value = "") public String getString() { @@ -226,6 +219,7 @@ public FormatTest _byte(byte[] _byte) { * Get _byte * @return _byte */ + @JsonProperty("byte") @NotNull @ApiModelProperty(required = true, value = "") public byte[] getByte() { @@ -245,6 +239,7 @@ public FormatTest binary(org.springframework.core.io.Resource binary) { * Get binary * @return binary */ + @JsonProperty("binary") @Valid @ApiModelProperty(value = "") public org.springframework.core.io.Resource getBinary() { @@ -264,6 +259,7 @@ public FormatTest date(LocalDate date) { * Get date * @return date */ + @JsonProperty("date") @NotNull @Valid @ApiModelProperty(required = true, value = "") public LocalDate getDate() { @@ -283,6 +279,7 @@ public FormatTest dateTime(OffsetDateTime dateTime) { * Get dateTime * @return dateTime */ + @JsonProperty("dateTime") @Valid @ApiModelProperty(value = "") public OffsetDateTime getDateTime() { @@ -302,6 +299,7 @@ public FormatTest uuid(UUID uuid) { * Get uuid * @return uuid */ + @JsonProperty("uuid") @Valid @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") public UUID getUuid() { @@ -321,6 +319,7 @@ public FormatTest password(String password) { * Get password * @return password */ + @JsonProperty("password") @NotNull @Size(min = 10, max = 64) @ApiModelProperty(required = true, value = "") public String getPassword() { @@ -340,6 +339,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) { * Get bigDecimal * @return bigDecimal */ + @JsonProperty("BigDecimal") @Valid @ApiModelProperty(value = "") public BigDecimal getBigDecimal() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index 224b16d1a2d3..948ed9a0731d 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -24,10 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class HasOnlyReadOnly { - @JsonProperty("bar") private String bar; - @JsonProperty("foo") private String foo; public HasOnlyReadOnly bar(String bar) { @@ -39,6 +37,7 @@ public HasOnlyReadOnly bar(String bar) { * Get bar * @return bar */ + @JsonProperty("bar") @ApiModelProperty(readOnly = true, value = "") public String getBar() { @@ -58,6 +57,7 @@ public HasOnlyReadOnly foo(String foo) { * Get foo * @return foo */ + @JsonProperty("foo") @ApiModelProperty(readOnly = true, value = "") public String getFoo() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MapTest.java index f2867ac50403..94d4ae9a9d56 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MapTest.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MapTest { - @JsonProperty("map_map_of_string") @Valid private Map> mapMapOfString = null; @@ -64,15 +63,12 @@ public static InnerEnum fromValue(String value) { } } - @JsonProperty("map_of_enum_string") @Valid private Map mapOfEnumString = null; - @JsonProperty("direct_map") @Valid private Map directMap = null; - @JsonProperty("indirect_map") @Valid private Map indirectMap = null; @@ -93,6 +89,7 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapMapOfString * @return mapMapOfString */ + @JsonProperty("map_map_of_string") @Valid @ApiModelProperty(value = "") public Map> getMapMapOfString() { @@ -120,6 +117,7 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) * Get mapOfEnumString * @return mapOfEnumString */ + @JsonProperty("map_of_enum_string") @ApiModelProperty(value = "") public Map getMapOfEnumString() { @@ -147,6 +145,7 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) { * Get directMap * @return directMap */ + @JsonProperty("direct_map") @ApiModelProperty(value = "") public Map getDirectMap() { @@ -174,6 +173,7 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) { * Get indirectMap * @return indirectMap */ + @JsonProperty("indirect_map") @ApiModelProperty(value = "") public Map getIndirectMap() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 901c65b2924d..89a2475d82fb 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -28,14 +28,11 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("map") @Valid private Map map = null; @@ -48,6 +45,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { * Get uuid * @return uuid */ + @JsonProperty("uuid") @Valid @ApiModelProperty(value = "") public UUID getUuid() { @@ -67,6 +65,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT * Get dateTime * @return dateTime */ + @JsonProperty("dateTime") @Valid @ApiModelProperty(value = "") public OffsetDateTime getDateTime() { @@ -94,6 +93,7 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * Get map * @return map */ + @JsonProperty("map") @Valid @ApiModelProperty(value = "") public Map getMap() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Model200Response.java index 36dfd34883e8..220b6493f31a 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Model200Response.java @@ -25,10 +25,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Model200Response { - @JsonProperty("name") private Integer name; - @JsonProperty("class") private String propertyClass; public Model200Response name(Integer name) { @@ -40,6 +38,7 @@ public Model200Response name(Integer name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public Integer getName() { @@ -59,6 +58,7 @@ public Model200Response propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ + @JsonProperty("class") @ApiModelProperty(value = "") public String getPropertyClass() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelApiResponse.java index dfba6cb672d4..29f3f43cf20e 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -24,13 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -42,6 +39,7 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ + @JsonProperty("code") @ApiModelProperty(value = "") public Integer getCode() { @@ -61,6 +59,7 @@ public ModelApiResponse type(String type) { * Get type * @return type */ + @JsonProperty("type") @ApiModelProperty(value = "") public String getType() { @@ -80,6 +79,7 @@ public ModelApiResponse message(String message) { * Get message * @return message */ + @JsonProperty("message") @ApiModelProperty(value = "") public String getMessage() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelList.java index 97ddf5359aa0..a374fe83d52a 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelList.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelList { - @JsonProperty("123-list") private String _123list; public ModelList _123list(String _123list) { @@ -36,6 +35,7 @@ public ModelList _123list(String _123list) { * Get _123list * @return _123list */ + @JsonProperty("123-list") @ApiModelProperty(value = "") public String get123list() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelReturn.java index 4505ddfeeeca..d8fc618d9dfb 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelReturn.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelReturn { - @JsonProperty("return") private Integer _return; public ModelReturn _return(Integer _return) { @@ -37,6 +36,7 @@ public ModelReturn _return(Integer _return) { * Get _return * @return _return */ + @JsonProperty("return") @ApiModelProperty(value = "") public Integer getReturn() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Name.java index 51cc37bbeea7..054901b488d6 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Name.java @@ -23,16 +23,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Name { - @JsonProperty("name") private Integer name; - @JsonProperty("snake_case") private Integer snakeCase; - @JsonProperty("property") private String property; - @JsonProperty("123Number") private Integer _123number; public Name name(Integer name) { @@ -44,6 +40,7 @@ public Name name(Integer name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @ApiModelProperty(required = true, value = "") public Integer getName() { @@ -63,6 +60,7 @@ public Name snakeCase(Integer snakeCase) { * Get snakeCase * @return snakeCase */ + @JsonProperty("snake_case") @ApiModelProperty(readOnly = true, value = "") public Integer getSnakeCase() { @@ -82,6 +80,7 @@ public Name property(String property) { * Get property * @return property */ + @JsonProperty("property") @ApiModelProperty(value = "") public String getProperty() { @@ -101,6 +100,7 @@ public Name _123number(Integer _123number) { * Get _123number * @return _123number */ + @JsonProperty("123Number") @ApiModelProperty(readOnly = true, value = "") public Integer get123number() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/NumberOnly.java index 278146bfb899..8f2f2b19b191 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/NumberOnly.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class NumberOnly { - @JsonProperty("JustNumber") private BigDecimal justNumber; public NumberOnly justNumber(BigDecimal justNumber) { @@ -35,6 +34,7 @@ public NumberOnly justNumber(BigDecimal justNumber) { * Get justNumber * @return justNumber */ + @JsonProperty("JustNumber") @Valid @ApiModelProperty(value = "") public BigDecimal getJustNumber() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Order.java index 9a9ed4f6c960..feac4d2cad8d 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Order.java @@ -25,16 +25,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -75,10 +71,8 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -90,6 +84,7 @@ public Order id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -109,6 +104,7 @@ public Order petId(Long petId) { * Get petId * @return petId */ + @JsonProperty("petId") @ApiModelProperty(value = "") public Long getPetId() { @@ -128,6 +124,7 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ + @JsonProperty("quantity") @ApiModelProperty(value = "") public Integer getQuantity() { @@ -147,6 +144,7 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ + @JsonProperty("shipDate") @Valid @ApiModelProperty(value = "") public OffsetDateTime getShipDate() { @@ -166,6 +164,7 @@ public Order status(StatusEnum status) { * Order Status * @return status */ + @JsonProperty("status") @ApiModelProperty(value = "Order Status") public StatusEnum getStatus() { @@ -185,6 +184,7 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ + @JsonProperty("complete") @ApiModelProperty(value = "") public Boolean getComplete() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/OuterComposite.java index c1a709bb26ad..00cce99097d7 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/OuterComposite.java @@ -23,13 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class OuterComposite { - @JsonProperty("my_number") private BigDecimal myNumber; - @JsonProperty("my_string") private String myString; - @JsonProperty("my_boolean") private Boolean myBoolean; public OuterComposite myNumber(BigDecimal myNumber) { @@ -41,6 +38,7 @@ public OuterComposite myNumber(BigDecimal myNumber) { * Get myNumber * @return myNumber */ + @JsonProperty("my_number") @Valid @ApiModelProperty(value = "") public BigDecimal getMyNumber() { @@ -60,6 +58,7 @@ public OuterComposite myString(String myString) { * Get myString * @return myString */ + @JsonProperty("my_string") @ApiModelProperty(value = "") public String getMyString() { @@ -79,6 +78,7 @@ public OuterComposite myBoolean(Boolean myBoolean) { * Get myBoolean * @return myBoolean */ + @JsonProperty("my_boolean") @ApiModelProperty(value = "") public Boolean getMyBoolean() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Pet.java index 4d705acedcd2..e39c22373324 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Pet.java @@ -30,20 +30,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private Set photoUrls = new LinkedHashSet<>(); - @JsonProperty("tags") @Valid private List tags = null; @@ -84,7 +79,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; public Pet id(Long id) { @@ -96,6 +90,7 @@ public Pet id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -115,6 +110,7 @@ public Pet category(Category category) { * Get category * @return category */ + @JsonProperty("category") @Valid @ApiModelProperty(value = "") public Category getCategory() { @@ -134,6 +130,7 @@ public Pet name(String name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") public String getName() { @@ -158,6 +155,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ + @JsonProperty("photoUrls") @NotNull @ApiModelProperty(required = true, value = "") public Set getPhotoUrls() { @@ -186,6 +184,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ + @JsonProperty("tags") @Valid @ApiModelProperty(value = "") public List getTags() { @@ -205,6 +204,7 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ + @JsonProperty("status") @ApiModelProperty(value = "pet status in the store") public StatusEnum getStatus() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ReadOnlyFirst.java index b7a0a416782e..d02b8c8cfd53 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -22,10 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ReadOnlyFirst { - @JsonProperty("bar") private String bar; - @JsonProperty("baz") private String baz; public ReadOnlyFirst bar(String bar) { @@ -37,6 +35,7 @@ public ReadOnlyFirst bar(String bar) { * Get bar * @return bar */ + @JsonProperty("bar") @ApiModelProperty(readOnly = true, value = "") public String getBar() { @@ -56,6 +55,7 @@ public ReadOnlyFirst baz(String baz) { * Get baz * @return baz */ + @JsonProperty("baz") @ApiModelProperty(value = "") public String getBaz() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/SpecialModelName.java index f321ab78cd56..8f176362e027 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/SpecialModelName.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class SpecialModelName { - @JsonProperty("$special[property.name]") private Long $specialPropertyName; public SpecialModelName $specialPropertyName(Long $specialPropertyName) { @@ -36,6 +35,7 @@ public class SpecialModelName { * Get $specialPropertyName * @return $specialPropertyName */ + @JsonProperty("$special[property.name]") @ApiModelProperty(value = "") public Long get$SpecialPropertyName() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Tag.java index 6161be4a9229..f7797bef2f19 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Tag.java @@ -22,10 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -37,6 +35,7 @@ public Tag id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -56,6 +55,7 @@ public Tag name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderDefault.java index f10cff73bb78..506efbf431c1 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -25,19 +25,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderDefault { - @JsonProperty("string_item") private String stringItem = "what"; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem = true; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -50,6 +45,7 @@ public TypeHolderDefault stringItem(String stringItem) { * Get stringItem * @return stringItem */ + @JsonProperty("string_item") @NotNull @ApiModelProperty(required = true, value = "") public String getStringItem() { @@ -69,6 +65,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ + @JsonProperty("number_item") @NotNull @Valid @ApiModelProperty(required = true, value = "") public BigDecimal getNumberItem() { @@ -88,6 +85,7 @@ public TypeHolderDefault integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ + @JsonProperty("integer_item") @NotNull @ApiModelProperty(required = true, value = "") public Integer getIntegerItem() { @@ -107,6 +105,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ + @JsonProperty("bool_item") @NotNull @ApiModelProperty(required = true, value = "") public Boolean getBoolItem() { @@ -131,6 +130,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ + @JsonProperty("array_item") @NotNull @ApiModelProperty(required = true, value = "") public List getArrayItem() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderExample.java index d2ae69a4e5a8..806c0c90fa18 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -25,22 +25,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderExample { - @JsonProperty("string_item") private String stringItem; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("float_item") private Float floatItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -53,6 +47,7 @@ public TypeHolderExample stringItem(String stringItem) { * Get stringItem * @return stringItem */ + @JsonProperty("string_item") @NotNull @ApiModelProperty(example = "what", required = true, value = "") public String getStringItem() { @@ -72,6 +67,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ + @JsonProperty("number_item") @NotNull @Valid @ApiModelProperty(example = "1.234", required = true, value = "") public BigDecimal getNumberItem() { @@ -91,6 +87,7 @@ public TypeHolderExample floatItem(Float floatItem) { * Get floatItem * @return floatItem */ + @JsonProperty("float_item") @NotNull @ApiModelProperty(example = "1.234", required = true, value = "") public Float getFloatItem() { @@ -110,6 +107,7 @@ public TypeHolderExample integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ + @JsonProperty("integer_item") @NotNull @ApiModelProperty(example = "-2", required = true, value = "") public Integer getIntegerItem() { @@ -129,6 +127,7 @@ public TypeHolderExample boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ + @JsonProperty("bool_item") @NotNull @ApiModelProperty(example = "true", required = true, value = "") public Boolean getBoolItem() { @@ -153,6 +152,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ + @JsonProperty("array_item") @NotNull @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "") public List getArrayItem() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/User.java index ec85459bc99a..f42832389ffe 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/User.java @@ -22,28 +22,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -55,6 +47,7 @@ public User id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -74,6 +67,7 @@ public User username(String username) { * Get username * @return username */ + @JsonProperty("username") @ApiModelProperty(value = "") public String getUsername() { @@ -93,6 +87,7 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ + @JsonProperty("firstName") @ApiModelProperty(value = "") public String getFirstName() { @@ -112,6 +107,7 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ + @JsonProperty("lastName") @ApiModelProperty(value = "") public String getLastName() { @@ -131,6 +127,7 @@ public User email(String email) { * Get email * @return email */ + @JsonProperty("email") @ApiModelProperty(value = "") public String getEmail() { @@ -150,6 +147,7 @@ public User password(String password) { * Get password * @return password */ + @JsonProperty("password") @ApiModelProperty(value = "") public String getPassword() { @@ -169,6 +167,7 @@ public User phone(String phone) { * Get phone * @return phone */ + @JsonProperty("phone") @ApiModelProperty(value = "") public String getPhone() { @@ -188,6 +187,7 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ + @JsonProperty("userStatus") @ApiModelProperty(value = "User Status") public Integer getUserStatus() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/XmlItem.java index 27d5f8282818..c795b4b85e6d 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/XmlItem.java @@ -25,99 +25,70 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class XmlItem { - @JsonProperty("attribute_string") private String attributeString; - @JsonProperty("attribute_number") private BigDecimal attributeNumber; - @JsonProperty("attribute_integer") private Integer attributeInteger; - @JsonProperty("attribute_boolean") private Boolean attributeBoolean; - @JsonProperty("wrapped_array") @Valid private List wrappedArray = null; - @JsonProperty("name_string") private String nameString; - @JsonProperty("name_number") private BigDecimal nameNumber; - @JsonProperty("name_integer") private Integer nameInteger; - @JsonProperty("name_boolean") private Boolean nameBoolean; - @JsonProperty("name_array") @Valid private List nameArray = null; - @JsonProperty("name_wrapped_array") @Valid private List nameWrappedArray = null; - @JsonProperty("prefix_string") private String prefixString; - @JsonProperty("prefix_number") private BigDecimal prefixNumber; - @JsonProperty("prefix_integer") private Integer prefixInteger; - @JsonProperty("prefix_boolean") private Boolean prefixBoolean; - @JsonProperty("prefix_array") @Valid private List prefixArray = null; - @JsonProperty("prefix_wrapped_array") @Valid private List prefixWrappedArray = null; - @JsonProperty("namespace_string") private String namespaceString; - @JsonProperty("namespace_number") private BigDecimal namespaceNumber; - @JsonProperty("namespace_integer") private Integer namespaceInteger; - @JsonProperty("namespace_boolean") private Boolean namespaceBoolean; - @JsonProperty("namespace_array") @Valid private List namespaceArray = null; - @JsonProperty("namespace_wrapped_array") @Valid private List namespaceWrappedArray = null; - @JsonProperty("prefix_ns_string") private String prefixNsString; - @JsonProperty("prefix_ns_number") private BigDecimal prefixNsNumber; - @JsonProperty("prefix_ns_integer") private Integer prefixNsInteger; - @JsonProperty("prefix_ns_boolean") private Boolean prefixNsBoolean; - @JsonProperty("prefix_ns_array") @Valid private List prefixNsArray = null; - @JsonProperty("prefix_ns_wrapped_array") @Valid private List prefixNsWrappedArray = null; @@ -130,6 +101,7 @@ public XmlItem attributeString(String attributeString) { * Get attributeString * @return attributeString */ + @JsonProperty("attribute_string") @ApiModelProperty(example = "string", value = "") public String getAttributeString() { @@ -149,6 +121,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) { * Get attributeNumber * @return attributeNumber */ + @JsonProperty("attribute_number") @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getAttributeNumber() { @@ -168,6 +141,7 @@ public XmlItem attributeInteger(Integer attributeInteger) { * Get attributeInteger * @return attributeInteger */ + @JsonProperty("attribute_integer") @ApiModelProperty(example = "-2", value = "") public Integer getAttributeInteger() { @@ -187,6 +161,7 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) { * Get attributeBoolean * @return attributeBoolean */ + @JsonProperty("attribute_boolean") @ApiModelProperty(example = "true", value = "") public Boolean getAttributeBoolean() { @@ -214,6 +189,7 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) { * Get wrappedArray * @return wrappedArray */ + @JsonProperty("wrapped_array") @ApiModelProperty(value = "") public List getWrappedArray() { @@ -233,6 +209,7 @@ public XmlItem nameString(String nameString) { * Get nameString * @return nameString */ + @JsonProperty("name_string") @ApiModelProperty(example = "string", value = "") public String getNameString() { @@ -252,6 +229,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) { * Get nameNumber * @return nameNumber */ + @JsonProperty("name_number") @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getNameNumber() { @@ -271,6 +249,7 @@ public XmlItem nameInteger(Integer nameInteger) { * Get nameInteger * @return nameInteger */ + @JsonProperty("name_integer") @ApiModelProperty(example = "-2", value = "") public Integer getNameInteger() { @@ -290,6 +269,7 @@ public XmlItem nameBoolean(Boolean nameBoolean) { * Get nameBoolean * @return nameBoolean */ + @JsonProperty("name_boolean") @ApiModelProperty(example = "true", value = "") public Boolean getNameBoolean() { @@ -317,6 +297,7 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) { * Get nameArray * @return nameArray */ + @JsonProperty("name_array") @ApiModelProperty(value = "") public List getNameArray() { @@ -344,6 +325,7 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) { * Get nameWrappedArray * @return nameWrappedArray */ + @JsonProperty("name_wrapped_array") @ApiModelProperty(value = "") public List getNameWrappedArray() { @@ -363,6 +345,7 @@ public XmlItem prefixString(String prefixString) { * Get prefixString * @return prefixString */ + @JsonProperty("prefix_string") @ApiModelProperty(example = "string", value = "") public String getPrefixString() { @@ -382,6 +365,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) { * Get prefixNumber * @return prefixNumber */ + @JsonProperty("prefix_number") @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getPrefixNumber() { @@ -401,6 +385,7 @@ public XmlItem prefixInteger(Integer prefixInteger) { * Get prefixInteger * @return prefixInteger */ + @JsonProperty("prefix_integer") @ApiModelProperty(example = "-2", value = "") public Integer getPrefixInteger() { @@ -420,6 +405,7 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) { * Get prefixBoolean * @return prefixBoolean */ + @JsonProperty("prefix_boolean") @ApiModelProperty(example = "true", value = "") public Boolean getPrefixBoolean() { @@ -447,6 +433,7 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) { * Get prefixArray * @return prefixArray */ + @JsonProperty("prefix_array") @ApiModelProperty(value = "") public List getPrefixArray() { @@ -474,6 +461,7 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) { * Get prefixWrappedArray * @return prefixWrappedArray */ + @JsonProperty("prefix_wrapped_array") @ApiModelProperty(value = "") public List getPrefixWrappedArray() { @@ -493,6 +481,7 @@ public XmlItem namespaceString(String namespaceString) { * Get namespaceString * @return namespaceString */ + @JsonProperty("namespace_string") @ApiModelProperty(example = "string", value = "") public String getNamespaceString() { @@ -512,6 +501,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) { * Get namespaceNumber * @return namespaceNumber */ + @JsonProperty("namespace_number") @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getNamespaceNumber() { @@ -531,6 +521,7 @@ public XmlItem namespaceInteger(Integer namespaceInteger) { * Get namespaceInteger * @return namespaceInteger */ + @JsonProperty("namespace_integer") @ApiModelProperty(example = "-2", value = "") public Integer getNamespaceInteger() { @@ -550,6 +541,7 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) { * Get namespaceBoolean * @return namespaceBoolean */ + @JsonProperty("namespace_boolean") @ApiModelProperty(example = "true", value = "") public Boolean getNamespaceBoolean() { @@ -577,6 +569,7 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) { * Get namespaceArray * @return namespaceArray */ + @JsonProperty("namespace_array") @ApiModelProperty(value = "") public List getNamespaceArray() { @@ -604,6 +597,7 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) { * Get namespaceWrappedArray * @return namespaceWrappedArray */ + @JsonProperty("namespace_wrapped_array") @ApiModelProperty(value = "") public List getNamespaceWrappedArray() { @@ -623,6 +617,7 @@ public XmlItem prefixNsString(String prefixNsString) { * Get prefixNsString * @return prefixNsString */ + @JsonProperty("prefix_ns_string") @ApiModelProperty(example = "string", value = "") public String getPrefixNsString() { @@ -642,6 +637,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) { * Get prefixNsNumber * @return prefixNsNumber */ + @JsonProperty("prefix_ns_number") @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getPrefixNsNumber() { @@ -661,6 +657,7 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) { * Get prefixNsInteger * @return prefixNsInteger */ + @JsonProperty("prefix_ns_integer") @ApiModelProperty(example = "-2", value = "") public Integer getPrefixNsInteger() { @@ -680,6 +677,7 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) { * Get prefixNsBoolean * @return prefixNsBoolean */ + @JsonProperty("prefix_ns_boolean") @ApiModelProperty(example = "true", value = "") public Boolean getPrefixNsBoolean() { @@ -707,6 +705,7 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) { * Get prefixNsArray * @return prefixNsArray */ + @JsonProperty("prefix_ns_array") @ApiModelProperty(value = "") public List getPrefixNsArray() { @@ -734,6 +733,7 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) { * Get prefixNsWrappedArray * @return prefixNsWrappedArray */ + @JsonProperty("prefix_ns_wrapped_array") @ApiModelProperty(value = "") public List getPrefixNsWrappedArray() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 8e4c17989762..cb51920a8c28 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesAnyType extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesAnyType name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesAnyType name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 27a8f01607f1..1c66a636116f 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesArray extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesArray name(String name) { @@ -37,6 +36,7 @@ public AdditionalPropertiesArray name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index bc7b87d760a9..1dcc607639bf 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesBoolean extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesBoolean name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesBoolean name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index b5e88d5d7ccb..74250eb564ad 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -26,45 +26,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesClass { - @JsonProperty("map_string") @Valid private Map mapString = null; - @JsonProperty("map_number") @Valid private Map mapNumber = null; - @JsonProperty("map_integer") @Valid private Map mapInteger = null; - @JsonProperty("map_boolean") @Valid private Map mapBoolean = null; - @JsonProperty("map_array_integer") @Valid private Map> mapArrayInteger = null; - @JsonProperty("map_array_anytype") @Valid private Map> mapArrayAnytype = null; - @JsonProperty("map_map_string") @Valid private Map> mapMapString = null; - @JsonProperty("map_map_anytype") @Valid private Map> mapMapAnytype = null; - @JsonProperty("anytype_1") private Object anytype1; - @JsonProperty("anytype_2") private Object anytype2; - @JsonProperty("anytype_3") private Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { @@ -84,6 +73,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt * Get mapString * @return mapString */ + @JsonProperty("map_string") @ApiModelProperty(value = "") public Map getMapString() { @@ -111,6 +101,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * Get mapNumber * @return mapNumber */ + @JsonProperty("map_number") @Valid @ApiModelProperty(value = "") public Map getMapNumber() { @@ -138,6 +129,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege * Get mapInteger * @return mapInteger */ + @JsonProperty("map_integer") @ApiModelProperty(value = "") public Map getMapInteger() { @@ -165,6 +157,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea * Get mapBoolean * @return mapBoolean */ + @JsonProperty("map_boolean") @ApiModelProperty(value = "") public Map getMapBoolean() { @@ -192,6 +185,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { @@ -219,6 +213,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * Get mapArrayAnytype * @return mapArrayAnytype */ + @JsonProperty("map_array_anytype") @Valid @ApiModelProperty(value = "") public Map> getMapArrayAnytype() { @@ -246,6 +241,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { @@ -273,6 +269,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { @@ -292,6 +289,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) { * Get anytype1 * @return anytype1 */ + @JsonProperty("anytype_1") @ApiModelProperty(value = "") public Object getAnytype1() { @@ -311,6 +309,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) { * Get anytype2 * @return anytype2 */ + @JsonProperty("anytype_2") @ApiModelProperty(value = "") public Object getAnytype2() { @@ -330,6 +329,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) { * Get anytype3 * @return anytype3 */ + @JsonProperty("anytype_3") @ApiModelProperty(value = "") public Object getAnytype3() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 00b5174e93b7..ce8b8d62436c 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesInteger extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesInteger name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesInteger name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 8fec423ffb1b..dec791e0a273 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesNumber extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesNumber name(String name) { @@ -37,6 +36,7 @@ public AdditionalPropertiesNumber name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 67033332b0d6..546d0ab9216f 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesObject extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesObject name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesObject name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 993f83bb2cc1..c1f95cf62e81 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesString extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesString name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesString name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Animal.java index e11ae425d9e9..e880f829164c 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Animal.java @@ -39,10 +39,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Animal { - @JsonProperty("className") private String className; - @JsonProperty("color") private String color = "red"; public Animal className(String className) { @@ -54,6 +52,7 @@ public Animal className(String className) { * Get className * @return className */ + @JsonProperty("className") @NotNull @ApiModelProperty(required = true, value = "") public String getClassName() { @@ -73,6 +72,7 @@ public Animal color(String color) { * Get color * @return color */ + @JsonProperty("color") @ApiModelProperty(value = "") public String getColor() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index df67eda87fd1..46ab3b631960 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfArrayOfNumberOnly { - @JsonProperty("ArrayArrayNumber") @Valid private List> arrayArrayNumber = null; @@ -46,6 +45,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * Get arrayArrayNumber * @return arrayArrayNumber */ + @JsonProperty("ArrayArrayNumber") @Valid @ApiModelProperty(value = "") public List> getArrayArrayNumber() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 05f1ca376a68..cb5358905469 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfNumberOnly { - @JsonProperty("ArrayNumber") @Valid private List arrayNumber = null; @@ -46,6 +45,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ + @JsonProperty("ArrayNumber") @Valid @ApiModelProperty(value = "") public List getArrayNumber() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayTest.java index ba67885edc8a..55cc431ecde6 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayTest.java @@ -25,15 +25,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayTest { - @JsonProperty("array_of_string") @Valid private List arrayOfString = null; - @JsonProperty("array_array_of_integer") @Valid private List> arrayArrayOfInteger = null; - @JsonProperty("array_array_of_model") @Valid private List> arrayArrayOfModel = null; @@ -54,6 +51,7 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) { * Get arrayOfString * @return arrayOfString */ + @JsonProperty("array_of_string") @ApiModelProperty(value = "") public List getArrayOfString() { @@ -81,6 +79,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ + @JsonProperty("array_array_of_integer") @Valid @ApiModelProperty(value = "") public List> getArrayArrayOfInteger() { @@ -108,6 +107,7 @@ public ArrayTest addArrayArrayOfModelItem(List arrayArrayOfModelI * Get arrayArrayOfModel * @return arrayArrayOfModel */ + @JsonProperty("array_array_of_model") @Valid @ApiModelProperty(value = "") public List> getArrayArrayOfModel() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/BigCat.java index ec95c1253fad..70bbb0b93532 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/BigCat.java @@ -67,7 +67,6 @@ public static KindEnum fromValue(String value) { } } - @JsonProperty("kind") private KindEnum kind; public BigCat kind(KindEnum kind) { @@ -79,6 +78,7 @@ public BigCat kind(KindEnum kind) { * Get kind * @return kind */ + @JsonProperty("kind") @ApiModelProperty(value = "") public KindEnum getKind() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/BigCatAllOf.java index 35ae937c0009..1a86665050e6 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/BigCatAllOf.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/BigCatAllOf.java @@ -64,7 +64,6 @@ public static KindEnum fromValue(String value) { } } - @JsonProperty("kind") private KindEnum kind; public BigCatAllOf kind(KindEnum kind) { @@ -76,6 +75,7 @@ public BigCatAllOf kind(KindEnum kind) { * Get kind * @return kind */ + @JsonProperty("kind") @ApiModelProperty(value = "") public KindEnum getKind() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Capitalization.java index e9cce9de0115..e0fdbe78bae2 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Capitalization.java @@ -22,22 +22,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Capitalization { - @JsonProperty("smallCamel") private String smallCamel; - @JsonProperty("CapitalCamel") private String capitalCamel; - @JsonProperty("small_Snake") private String smallSnake; - @JsonProperty("Capital_Snake") private String capitalSnake; - @JsonProperty("SCA_ETH_Flow_Points") private String scAETHFlowPoints; - @JsonProperty("ATT_NAME") private String ATT_NAME; public Capitalization smallCamel(String smallCamel) { @@ -49,6 +43,7 @@ public Capitalization smallCamel(String smallCamel) { * Get smallCamel * @return smallCamel */ + @JsonProperty("smallCamel") @ApiModelProperty(value = "") public String getSmallCamel() { @@ -68,6 +63,7 @@ public Capitalization capitalCamel(String capitalCamel) { * Get capitalCamel * @return capitalCamel */ + @JsonProperty("CapitalCamel") @ApiModelProperty(value = "") public String getCapitalCamel() { @@ -87,6 +83,7 @@ public Capitalization smallSnake(String smallSnake) { * Get smallSnake * @return smallSnake */ + @JsonProperty("small_Snake") @ApiModelProperty(value = "") public String getSmallSnake() { @@ -106,6 +103,7 @@ public Capitalization capitalSnake(String capitalSnake) { * Get capitalSnake * @return capitalSnake */ + @JsonProperty("Capital_Snake") @ApiModelProperty(value = "") public String getCapitalSnake() { @@ -125,6 +123,7 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) { * Get scAETHFlowPoints * @return scAETHFlowPoints */ + @JsonProperty("SCA_ETH_Flow_Points") @ApiModelProperty(value = "") public String getScAETHFlowPoints() { @@ -144,6 +143,7 @@ public Capitalization ATT_NAME(String ATT_NAME) { * Name of the pet * @return ATT_NAME */ + @JsonProperty("ATT_NAME") @ApiModelProperty(value = "Name of the pet ") public String getATTNAME() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Cat.java index 097ddbef7980..958fcb2298e0 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Cat.java @@ -36,7 +36,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Cat extends Animal { - @JsonProperty("declawed") private Boolean declawed; public Cat declawed(Boolean declawed) { @@ -48,6 +47,7 @@ public Cat declawed(Boolean declawed) { * Get declawed * @return declawed */ + @JsonProperty("declawed") @ApiModelProperty(value = "") public Boolean getDeclawed() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/CatAllOf.java index eed74bea751a..63de2ad8818e 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/CatAllOf.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/CatAllOf.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class CatAllOf { - @JsonProperty("declawed") private Boolean declawed; public CatAllOf declawed(Boolean declawed) { @@ -36,6 +35,7 @@ public CatAllOf declawed(Boolean declawed) { * Get declawed * @return declawed */ + @JsonProperty("declawed") @ApiModelProperty(value = "") public Boolean getDeclawed() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Category.java index 27a4a9f25665..b63268b2c8ce 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Category.java @@ -22,10 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name = "default-name"; public Category id(Long id) { @@ -37,6 +35,7 @@ public Category id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -56,6 +55,7 @@ public Category name(String name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @ApiModelProperty(required = true, value = "") public String getName() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ClassModel.java index 69296da7e60e..976f0b01d071 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ClassModel.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ClassModel { - @JsonProperty("_class") private String propertyClass; public ClassModel propertyClass(String propertyClass) { @@ -35,6 +34,7 @@ public ClassModel propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ + @JsonProperty("_class") @ApiModelProperty(value = "") public String getPropertyClass() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Client.java index b788daea14a3..a3c4731f3339 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Client.java @@ -22,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Client { - @JsonProperty("client") private String client; public Client client(String client) { @@ -34,6 +33,7 @@ public Client client(String client) { * Get client * @return client */ + @JsonProperty("client") @ApiModelProperty(value = "") public String getClient() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Dog.java index 9b61a2fa29b6..593562fabb42 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Dog.java @@ -27,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Dog extends Animal { - @JsonProperty("breed") private String breed; public Dog breed(String breed) { @@ -39,6 +38,7 @@ public Dog breed(String breed) { * Get breed * @return breed */ + @JsonProperty("breed") @ApiModelProperty(value = "") public String getBreed() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/DogAllOf.java index 4f275e535333..7ddb24717737 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/DogAllOf.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/DogAllOf.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class DogAllOf { - @JsonProperty("breed") private String breed; public DogAllOf breed(String breed) { @@ -36,6 +35,7 @@ public DogAllOf breed(String breed) { * Get breed * @return breed */ + @JsonProperty("breed") @ApiModelProperty(value = "") public String getBreed() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumArrays.java index dba32cf2b710..04e850b1cf17 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumArrays.java @@ -60,7 +60,6 @@ public static JustSymbolEnum fromValue(String value) { } } - @JsonProperty("just_symbol") private JustSymbolEnum justSymbol; /** @@ -98,7 +97,6 @@ public static ArrayEnumEnum fromValue(String value) { } } - @JsonProperty("array_enum") @Valid private List arrayEnum = null; @@ -111,6 +109,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) { * Get justSymbol * @return justSymbol */ + @JsonProperty("just_symbol") @ApiModelProperty(value = "") public JustSymbolEnum getJustSymbol() { @@ -138,6 +137,7 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) { * Get arrayEnum * @return arrayEnum */ + @JsonProperty("array_enum") @ApiModelProperty(value = "") public List getArrayEnum() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumTest.java index c20bc1460143..49747f67dccf 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumTest.java @@ -63,7 +63,6 @@ public static EnumStringEnum fromValue(String value) { } } - @JsonProperty("enum_string") private EnumStringEnum enumString; /** @@ -103,7 +102,6 @@ public static EnumStringRequiredEnum fromValue(String value) { } } - @JsonProperty("enum_string_required") private EnumStringRequiredEnum enumStringRequired; /** @@ -141,7 +139,6 @@ public static EnumIntegerEnum fromValue(Integer value) { } } - @JsonProperty("enum_integer") private EnumIntegerEnum enumInteger; /** @@ -179,10 +176,8 @@ public static EnumNumberEnum fromValue(Double value) { } } - @JsonProperty("enum_number") private EnumNumberEnum enumNumber; - @JsonProperty("outerEnum") private OuterEnum outerEnum; public EnumTest enumString(EnumStringEnum enumString) { @@ -194,6 +189,7 @@ public EnumTest enumString(EnumStringEnum enumString) { * Get enumString * @return enumString */ + @JsonProperty("enum_string") @ApiModelProperty(value = "") public EnumStringEnum getEnumString() { @@ -213,6 +209,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) { * Get enumStringRequired * @return enumStringRequired */ + @JsonProperty("enum_string_required") @NotNull @ApiModelProperty(required = true, value = "") public EnumStringRequiredEnum getEnumStringRequired() { @@ -232,6 +229,7 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) { * Get enumInteger * @return enumInteger */ + @JsonProperty("enum_integer") @ApiModelProperty(value = "") public EnumIntegerEnum getEnumInteger() { @@ -251,6 +249,7 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) { * Get enumNumber * @return enumNumber */ + @JsonProperty("enum_number") @ApiModelProperty(value = "") public EnumNumberEnum getEnumNumber() { @@ -270,6 +269,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) { * Get outerEnum * @return outerEnum */ + @JsonProperty("outerEnum") @Valid @ApiModelProperty(value = "") public OuterEnum getOuterEnum() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/File.java index d82e4902623d..43c44fd344bb 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/File.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/File.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class File { - @JsonProperty("sourceURI") private String sourceURI; public File sourceURI(String sourceURI) { @@ -35,6 +34,7 @@ public File sourceURI(String sourceURI) { * Test capitalization * @return sourceURI */ + @JsonProperty("sourceURI") @ApiModelProperty(value = "Test capitalization") public String getSourceURI() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 2ea153bd6468..d7815943b774 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -25,10 +25,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FileSchemaTestClass { - @JsonProperty("file") private File file; - @JsonProperty("files") @Valid private List files = null; @@ -41,6 +39,7 @@ public FileSchemaTestClass file(File file) { * Get file * @return file */ + @JsonProperty("file") @Valid @ApiModelProperty(value = "") public File getFile() { @@ -68,6 +67,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) { * Get files * @return files */ + @JsonProperty("files") @Valid @ApiModelProperty(value = "") public List getFiles() { 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 0e2aeaa78a22..ffd18f0ce221 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 @@ -30,48 +30,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FormatTest { - @JsonProperty("integer") private Integer integer; - @JsonProperty("int32") private Integer int32; - @JsonProperty("int64") private Long int64; - @JsonProperty("number") private BigDecimal number; - @JsonProperty("float") private Float _float; - @JsonProperty("double") private Double _double; - @JsonProperty("string") private String string; - @JsonProperty("byte") private byte[] _byte; - @JsonProperty("binary") private org.springframework.core.io.Resource binary; - @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("password") private String password; - @JsonProperty("BigDecimal") private BigDecimal bigDecimal; public FormatTest integer(Integer integer) { @@ -85,6 +71,7 @@ public FormatTest integer(Integer integer) { * maximum: 100 * @return integer */ + @JsonProperty("integer") @Min(10) @Max(100) @ApiModelProperty(value = "") public Integer getInteger() { @@ -106,6 +93,7 @@ public FormatTest int32(Integer int32) { * maximum: 200 * @return int32 */ + @JsonProperty("int32") @Min(20) @Max(200) @ApiModelProperty(value = "") public Integer getInt32() { @@ -125,6 +113,7 @@ public FormatTest int64(Long int64) { * Get int64 * @return int64 */ + @JsonProperty("int64") @ApiModelProperty(value = "") public Long getInt64() { @@ -146,6 +135,7 @@ public FormatTest number(BigDecimal number) { * maximum: 543.2 * @return number */ + @JsonProperty("number") @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") @ApiModelProperty(required = true, value = "") public BigDecimal getNumber() { @@ -167,6 +157,7 @@ public FormatTest _float(Float _float) { * maximum: 987.6 * @return _float */ + @JsonProperty("float") @DecimalMin("54.3") @DecimalMax("987.6") @ApiModelProperty(value = "") public Float getFloat() { @@ -188,6 +179,7 @@ public FormatTest _double(Double _double) { * maximum: 123.4 * @return _double */ + @JsonProperty("double") @DecimalMin("67.8") @DecimalMax("123.4") @ApiModelProperty(value = "") public Double getDouble() { @@ -207,6 +199,7 @@ public FormatTest string(String string) { * Get string * @return string */ + @JsonProperty("string") @Pattern(regexp = "/[a-z]/i") @ApiModelProperty(value = "") public String getString() { @@ -226,6 +219,7 @@ public FormatTest _byte(byte[] _byte) { * Get _byte * @return _byte */ + @JsonProperty("byte") @NotNull @ApiModelProperty(required = true, value = "") public byte[] getByte() { @@ -245,6 +239,7 @@ public FormatTest binary(org.springframework.core.io.Resource binary) { * Get binary * @return binary */ + @JsonProperty("binary") @Valid @ApiModelProperty(value = "") public org.springframework.core.io.Resource getBinary() { @@ -264,6 +259,7 @@ public FormatTest date(LocalDate date) { * Get date * @return date */ + @JsonProperty("date") @NotNull @Valid @ApiModelProperty(required = true, value = "") public LocalDate getDate() { @@ -283,6 +279,7 @@ public FormatTest dateTime(OffsetDateTime dateTime) { * Get dateTime * @return dateTime */ + @JsonProperty("dateTime") @Valid @ApiModelProperty(value = "") public OffsetDateTime getDateTime() { @@ -302,6 +299,7 @@ public FormatTest uuid(UUID uuid) { * Get uuid * @return uuid */ + @JsonProperty("uuid") @Valid @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") public UUID getUuid() { @@ -321,6 +319,7 @@ public FormatTest password(String password) { * Get password * @return password */ + @JsonProperty("password") @NotNull @Size(min = 10, max = 64) @ApiModelProperty(required = true, value = "") public String getPassword() { @@ -340,6 +339,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) { * Get bigDecimal * @return bigDecimal */ + @JsonProperty("BigDecimal") @Valid @ApiModelProperty(value = "") public BigDecimal getBigDecimal() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index 224b16d1a2d3..948ed9a0731d 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -24,10 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class HasOnlyReadOnly { - @JsonProperty("bar") private String bar; - @JsonProperty("foo") private String foo; public HasOnlyReadOnly bar(String bar) { @@ -39,6 +37,7 @@ public HasOnlyReadOnly bar(String bar) { * Get bar * @return bar */ + @JsonProperty("bar") @ApiModelProperty(readOnly = true, value = "") public String getBar() { @@ -58,6 +57,7 @@ public HasOnlyReadOnly foo(String foo) { * Get foo * @return foo */ + @JsonProperty("foo") @ApiModelProperty(readOnly = true, value = "") public String getFoo() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MapTest.java index f2867ac50403..94d4ae9a9d56 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MapTest.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MapTest { - @JsonProperty("map_map_of_string") @Valid private Map> mapMapOfString = null; @@ -64,15 +63,12 @@ public static InnerEnum fromValue(String value) { } } - @JsonProperty("map_of_enum_string") @Valid private Map mapOfEnumString = null; - @JsonProperty("direct_map") @Valid private Map directMap = null; - @JsonProperty("indirect_map") @Valid private Map indirectMap = null; @@ -93,6 +89,7 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapMapOfString * @return mapMapOfString */ + @JsonProperty("map_map_of_string") @Valid @ApiModelProperty(value = "") public Map> getMapMapOfString() { @@ -120,6 +117,7 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) * Get mapOfEnumString * @return mapOfEnumString */ + @JsonProperty("map_of_enum_string") @ApiModelProperty(value = "") public Map getMapOfEnumString() { @@ -147,6 +145,7 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) { * Get directMap * @return directMap */ + @JsonProperty("direct_map") @ApiModelProperty(value = "") public Map getDirectMap() { @@ -174,6 +173,7 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) { * Get indirectMap * @return indirectMap */ + @JsonProperty("indirect_map") @ApiModelProperty(value = "") public Map getIndirectMap() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 901c65b2924d..89a2475d82fb 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -28,14 +28,11 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("map") @Valid private Map map = null; @@ -48,6 +45,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { * Get uuid * @return uuid */ + @JsonProperty("uuid") @Valid @ApiModelProperty(value = "") public UUID getUuid() { @@ -67,6 +65,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT * Get dateTime * @return dateTime */ + @JsonProperty("dateTime") @Valid @ApiModelProperty(value = "") public OffsetDateTime getDateTime() { @@ -94,6 +93,7 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * Get map * @return map */ + @JsonProperty("map") @Valid @ApiModelProperty(value = "") public Map getMap() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Model200Response.java index 36dfd34883e8..220b6493f31a 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Model200Response.java @@ -25,10 +25,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Model200Response { - @JsonProperty("name") private Integer name; - @JsonProperty("class") private String propertyClass; public Model200Response name(Integer name) { @@ -40,6 +38,7 @@ public Model200Response name(Integer name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public Integer getName() { @@ -59,6 +58,7 @@ public Model200Response propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ + @JsonProperty("class") @ApiModelProperty(value = "") public String getPropertyClass() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelApiResponse.java index dfba6cb672d4..29f3f43cf20e 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -24,13 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -42,6 +39,7 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ + @JsonProperty("code") @ApiModelProperty(value = "") public Integer getCode() { @@ -61,6 +59,7 @@ public ModelApiResponse type(String type) { * Get type * @return type */ + @JsonProperty("type") @ApiModelProperty(value = "") public String getType() { @@ -80,6 +79,7 @@ public ModelApiResponse message(String message) { * Get message * @return message */ + @JsonProperty("message") @ApiModelProperty(value = "") public String getMessage() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelList.java index 97ddf5359aa0..a374fe83d52a 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelList.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelList { - @JsonProperty("123-list") private String _123list; public ModelList _123list(String _123list) { @@ -36,6 +35,7 @@ public ModelList _123list(String _123list) { * Get _123list * @return _123list */ + @JsonProperty("123-list") @ApiModelProperty(value = "") public String get123list() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelReturn.java index 4505ddfeeeca..d8fc618d9dfb 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelReturn.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelReturn { - @JsonProperty("return") private Integer _return; public ModelReturn _return(Integer _return) { @@ -37,6 +36,7 @@ public ModelReturn _return(Integer _return) { * Get _return * @return _return */ + @JsonProperty("return") @ApiModelProperty(value = "") public Integer getReturn() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Name.java index 51cc37bbeea7..054901b488d6 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Name.java @@ -23,16 +23,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Name { - @JsonProperty("name") private Integer name; - @JsonProperty("snake_case") private Integer snakeCase; - @JsonProperty("property") private String property; - @JsonProperty("123Number") private Integer _123number; public Name name(Integer name) { @@ -44,6 +40,7 @@ public Name name(Integer name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @ApiModelProperty(required = true, value = "") public Integer getName() { @@ -63,6 +60,7 @@ public Name snakeCase(Integer snakeCase) { * Get snakeCase * @return snakeCase */ + @JsonProperty("snake_case") @ApiModelProperty(readOnly = true, value = "") public Integer getSnakeCase() { @@ -82,6 +80,7 @@ public Name property(String property) { * Get property * @return property */ + @JsonProperty("property") @ApiModelProperty(value = "") public String getProperty() { @@ -101,6 +100,7 @@ public Name _123number(Integer _123number) { * Get _123number * @return _123number */ + @JsonProperty("123Number") @ApiModelProperty(readOnly = true, value = "") public Integer get123number() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/NumberOnly.java index 278146bfb899..8f2f2b19b191 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/NumberOnly.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class NumberOnly { - @JsonProperty("JustNumber") private BigDecimal justNumber; public NumberOnly justNumber(BigDecimal justNumber) { @@ -35,6 +34,7 @@ public NumberOnly justNumber(BigDecimal justNumber) { * Get justNumber * @return justNumber */ + @JsonProperty("JustNumber") @Valid @ApiModelProperty(value = "") public BigDecimal getJustNumber() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Order.java index 9a9ed4f6c960..feac4d2cad8d 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Order.java @@ -25,16 +25,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -75,10 +71,8 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -90,6 +84,7 @@ public Order id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -109,6 +104,7 @@ public Order petId(Long petId) { * Get petId * @return petId */ + @JsonProperty("petId") @ApiModelProperty(value = "") public Long getPetId() { @@ -128,6 +124,7 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ + @JsonProperty("quantity") @ApiModelProperty(value = "") public Integer getQuantity() { @@ -147,6 +144,7 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ + @JsonProperty("shipDate") @Valid @ApiModelProperty(value = "") public OffsetDateTime getShipDate() { @@ -166,6 +164,7 @@ public Order status(StatusEnum status) { * Order Status * @return status */ + @JsonProperty("status") @ApiModelProperty(value = "Order Status") public StatusEnum getStatus() { @@ -185,6 +184,7 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ + @JsonProperty("complete") @ApiModelProperty(value = "") public Boolean getComplete() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/OuterComposite.java index c1a709bb26ad..00cce99097d7 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/OuterComposite.java @@ -23,13 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class OuterComposite { - @JsonProperty("my_number") private BigDecimal myNumber; - @JsonProperty("my_string") private String myString; - @JsonProperty("my_boolean") private Boolean myBoolean; public OuterComposite myNumber(BigDecimal myNumber) { @@ -41,6 +38,7 @@ public OuterComposite myNumber(BigDecimal myNumber) { * Get myNumber * @return myNumber */ + @JsonProperty("my_number") @Valid @ApiModelProperty(value = "") public BigDecimal getMyNumber() { @@ -60,6 +58,7 @@ public OuterComposite myString(String myString) { * Get myString * @return myString */ + @JsonProperty("my_string") @ApiModelProperty(value = "") public String getMyString() { @@ -79,6 +78,7 @@ public OuterComposite myBoolean(Boolean myBoolean) { * Get myBoolean * @return myBoolean */ + @JsonProperty("my_boolean") @ApiModelProperty(value = "") public Boolean getMyBoolean() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Pet.java index 4d705acedcd2..e39c22373324 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Pet.java @@ -30,20 +30,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private Set photoUrls = new LinkedHashSet<>(); - @JsonProperty("tags") @Valid private List tags = null; @@ -84,7 +79,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; public Pet id(Long id) { @@ -96,6 +90,7 @@ public Pet id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -115,6 +110,7 @@ public Pet category(Category category) { * Get category * @return category */ + @JsonProperty("category") @Valid @ApiModelProperty(value = "") public Category getCategory() { @@ -134,6 +130,7 @@ public Pet name(String name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") public String getName() { @@ -158,6 +155,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ + @JsonProperty("photoUrls") @NotNull @ApiModelProperty(required = true, value = "") public Set getPhotoUrls() { @@ -186,6 +184,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ + @JsonProperty("tags") @Valid @ApiModelProperty(value = "") public List getTags() { @@ -205,6 +204,7 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ + @JsonProperty("status") @ApiModelProperty(value = "pet status in the store") public StatusEnum getStatus() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java index b7a0a416782e..d02b8c8cfd53 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -22,10 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ReadOnlyFirst { - @JsonProperty("bar") private String bar; - @JsonProperty("baz") private String baz; public ReadOnlyFirst bar(String bar) { @@ -37,6 +35,7 @@ public ReadOnlyFirst bar(String bar) { * Get bar * @return bar */ + @JsonProperty("bar") @ApiModelProperty(readOnly = true, value = "") public String getBar() { @@ -56,6 +55,7 @@ public ReadOnlyFirst baz(String baz) { * Get baz * @return baz */ + @JsonProperty("baz") @ApiModelProperty(value = "") public String getBaz() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/SpecialModelName.java index f321ab78cd56..8f176362e027 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/SpecialModelName.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class SpecialModelName { - @JsonProperty("$special[property.name]") private Long $specialPropertyName; public SpecialModelName $specialPropertyName(Long $specialPropertyName) { @@ -36,6 +35,7 @@ public class SpecialModelName { * Get $specialPropertyName * @return $specialPropertyName */ + @JsonProperty("$special[property.name]") @ApiModelProperty(value = "") public Long get$SpecialPropertyName() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Tag.java index 6161be4a9229..f7797bef2f19 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Tag.java @@ -22,10 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -37,6 +35,7 @@ public Tag id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -56,6 +55,7 @@ public Tag name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java index f10cff73bb78..506efbf431c1 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -25,19 +25,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderDefault { - @JsonProperty("string_item") private String stringItem = "what"; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem = true; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -50,6 +45,7 @@ public TypeHolderDefault stringItem(String stringItem) { * Get stringItem * @return stringItem */ + @JsonProperty("string_item") @NotNull @ApiModelProperty(required = true, value = "") public String getStringItem() { @@ -69,6 +65,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ + @JsonProperty("number_item") @NotNull @Valid @ApiModelProperty(required = true, value = "") public BigDecimal getNumberItem() { @@ -88,6 +85,7 @@ public TypeHolderDefault integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ + @JsonProperty("integer_item") @NotNull @ApiModelProperty(required = true, value = "") public Integer getIntegerItem() { @@ -107,6 +105,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ + @JsonProperty("bool_item") @NotNull @ApiModelProperty(required = true, value = "") public Boolean getBoolItem() { @@ -131,6 +130,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ + @JsonProperty("array_item") @NotNull @ApiModelProperty(required = true, value = "") public List getArrayItem() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderExample.java index d2ae69a4e5a8..806c0c90fa18 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -25,22 +25,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderExample { - @JsonProperty("string_item") private String stringItem; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("float_item") private Float floatItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -53,6 +47,7 @@ public TypeHolderExample stringItem(String stringItem) { * Get stringItem * @return stringItem */ + @JsonProperty("string_item") @NotNull @ApiModelProperty(example = "what", required = true, value = "") public String getStringItem() { @@ -72,6 +67,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ + @JsonProperty("number_item") @NotNull @Valid @ApiModelProperty(example = "1.234", required = true, value = "") public BigDecimal getNumberItem() { @@ -91,6 +87,7 @@ public TypeHolderExample floatItem(Float floatItem) { * Get floatItem * @return floatItem */ + @JsonProperty("float_item") @NotNull @ApiModelProperty(example = "1.234", required = true, value = "") public Float getFloatItem() { @@ -110,6 +107,7 @@ public TypeHolderExample integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ + @JsonProperty("integer_item") @NotNull @ApiModelProperty(example = "-2", required = true, value = "") public Integer getIntegerItem() { @@ -129,6 +127,7 @@ public TypeHolderExample boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ + @JsonProperty("bool_item") @NotNull @ApiModelProperty(example = "true", required = true, value = "") public Boolean getBoolItem() { @@ -153,6 +152,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ + @JsonProperty("array_item") @NotNull @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "") public List getArrayItem() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/User.java index ec85459bc99a..f42832389ffe 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/User.java @@ -22,28 +22,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -55,6 +47,7 @@ public User id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -74,6 +67,7 @@ public User username(String username) { * Get username * @return username */ + @JsonProperty("username") @ApiModelProperty(value = "") public String getUsername() { @@ -93,6 +87,7 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ + @JsonProperty("firstName") @ApiModelProperty(value = "") public String getFirstName() { @@ -112,6 +107,7 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ + @JsonProperty("lastName") @ApiModelProperty(value = "") public String getLastName() { @@ -131,6 +127,7 @@ public User email(String email) { * Get email * @return email */ + @JsonProperty("email") @ApiModelProperty(value = "") public String getEmail() { @@ -150,6 +147,7 @@ public User password(String password) { * Get password * @return password */ + @JsonProperty("password") @ApiModelProperty(value = "") public String getPassword() { @@ -169,6 +167,7 @@ public User phone(String phone) { * Get phone * @return phone */ + @JsonProperty("phone") @ApiModelProperty(value = "") public String getPhone() { @@ -188,6 +187,7 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ + @JsonProperty("userStatus") @ApiModelProperty(value = "User Status") public Integer getUserStatus() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/XmlItem.java index 27d5f8282818..c795b4b85e6d 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/XmlItem.java @@ -25,99 +25,70 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class XmlItem { - @JsonProperty("attribute_string") private String attributeString; - @JsonProperty("attribute_number") private BigDecimal attributeNumber; - @JsonProperty("attribute_integer") private Integer attributeInteger; - @JsonProperty("attribute_boolean") private Boolean attributeBoolean; - @JsonProperty("wrapped_array") @Valid private List wrappedArray = null; - @JsonProperty("name_string") private String nameString; - @JsonProperty("name_number") private BigDecimal nameNumber; - @JsonProperty("name_integer") private Integer nameInteger; - @JsonProperty("name_boolean") private Boolean nameBoolean; - @JsonProperty("name_array") @Valid private List nameArray = null; - @JsonProperty("name_wrapped_array") @Valid private List nameWrappedArray = null; - @JsonProperty("prefix_string") private String prefixString; - @JsonProperty("prefix_number") private BigDecimal prefixNumber; - @JsonProperty("prefix_integer") private Integer prefixInteger; - @JsonProperty("prefix_boolean") private Boolean prefixBoolean; - @JsonProperty("prefix_array") @Valid private List prefixArray = null; - @JsonProperty("prefix_wrapped_array") @Valid private List prefixWrappedArray = null; - @JsonProperty("namespace_string") private String namespaceString; - @JsonProperty("namespace_number") private BigDecimal namespaceNumber; - @JsonProperty("namespace_integer") private Integer namespaceInteger; - @JsonProperty("namespace_boolean") private Boolean namespaceBoolean; - @JsonProperty("namespace_array") @Valid private List namespaceArray = null; - @JsonProperty("namespace_wrapped_array") @Valid private List namespaceWrappedArray = null; - @JsonProperty("prefix_ns_string") private String prefixNsString; - @JsonProperty("prefix_ns_number") private BigDecimal prefixNsNumber; - @JsonProperty("prefix_ns_integer") private Integer prefixNsInteger; - @JsonProperty("prefix_ns_boolean") private Boolean prefixNsBoolean; - @JsonProperty("prefix_ns_array") @Valid private List prefixNsArray = null; - @JsonProperty("prefix_ns_wrapped_array") @Valid private List prefixNsWrappedArray = null; @@ -130,6 +101,7 @@ public XmlItem attributeString(String attributeString) { * Get attributeString * @return attributeString */ + @JsonProperty("attribute_string") @ApiModelProperty(example = "string", value = "") public String getAttributeString() { @@ -149,6 +121,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) { * Get attributeNumber * @return attributeNumber */ + @JsonProperty("attribute_number") @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getAttributeNumber() { @@ -168,6 +141,7 @@ public XmlItem attributeInteger(Integer attributeInteger) { * Get attributeInteger * @return attributeInteger */ + @JsonProperty("attribute_integer") @ApiModelProperty(example = "-2", value = "") public Integer getAttributeInteger() { @@ -187,6 +161,7 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) { * Get attributeBoolean * @return attributeBoolean */ + @JsonProperty("attribute_boolean") @ApiModelProperty(example = "true", value = "") public Boolean getAttributeBoolean() { @@ -214,6 +189,7 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) { * Get wrappedArray * @return wrappedArray */ + @JsonProperty("wrapped_array") @ApiModelProperty(value = "") public List getWrappedArray() { @@ -233,6 +209,7 @@ public XmlItem nameString(String nameString) { * Get nameString * @return nameString */ + @JsonProperty("name_string") @ApiModelProperty(example = "string", value = "") public String getNameString() { @@ -252,6 +229,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) { * Get nameNumber * @return nameNumber */ + @JsonProperty("name_number") @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getNameNumber() { @@ -271,6 +249,7 @@ public XmlItem nameInteger(Integer nameInteger) { * Get nameInteger * @return nameInteger */ + @JsonProperty("name_integer") @ApiModelProperty(example = "-2", value = "") public Integer getNameInteger() { @@ -290,6 +269,7 @@ public XmlItem nameBoolean(Boolean nameBoolean) { * Get nameBoolean * @return nameBoolean */ + @JsonProperty("name_boolean") @ApiModelProperty(example = "true", value = "") public Boolean getNameBoolean() { @@ -317,6 +297,7 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) { * Get nameArray * @return nameArray */ + @JsonProperty("name_array") @ApiModelProperty(value = "") public List getNameArray() { @@ -344,6 +325,7 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) { * Get nameWrappedArray * @return nameWrappedArray */ + @JsonProperty("name_wrapped_array") @ApiModelProperty(value = "") public List getNameWrappedArray() { @@ -363,6 +345,7 @@ public XmlItem prefixString(String prefixString) { * Get prefixString * @return prefixString */ + @JsonProperty("prefix_string") @ApiModelProperty(example = "string", value = "") public String getPrefixString() { @@ -382,6 +365,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) { * Get prefixNumber * @return prefixNumber */ + @JsonProperty("prefix_number") @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getPrefixNumber() { @@ -401,6 +385,7 @@ public XmlItem prefixInteger(Integer prefixInteger) { * Get prefixInteger * @return prefixInteger */ + @JsonProperty("prefix_integer") @ApiModelProperty(example = "-2", value = "") public Integer getPrefixInteger() { @@ -420,6 +405,7 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) { * Get prefixBoolean * @return prefixBoolean */ + @JsonProperty("prefix_boolean") @ApiModelProperty(example = "true", value = "") public Boolean getPrefixBoolean() { @@ -447,6 +433,7 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) { * Get prefixArray * @return prefixArray */ + @JsonProperty("prefix_array") @ApiModelProperty(value = "") public List getPrefixArray() { @@ -474,6 +461,7 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) { * Get prefixWrappedArray * @return prefixWrappedArray */ + @JsonProperty("prefix_wrapped_array") @ApiModelProperty(value = "") public List getPrefixWrappedArray() { @@ -493,6 +481,7 @@ public XmlItem namespaceString(String namespaceString) { * Get namespaceString * @return namespaceString */ + @JsonProperty("namespace_string") @ApiModelProperty(example = "string", value = "") public String getNamespaceString() { @@ -512,6 +501,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) { * Get namespaceNumber * @return namespaceNumber */ + @JsonProperty("namespace_number") @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getNamespaceNumber() { @@ -531,6 +521,7 @@ public XmlItem namespaceInteger(Integer namespaceInteger) { * Get namespaceInteger * @return namespaceInteger */ + @JsonProperty("namespace_integer") @ApiModelProperty(example = "-2", value = "") public Integer getNamespaceInteger() { @@ -550,6 +541,7 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) { * Get namespaceBoolean * @return namespaceBoolean */ + @JsonProperty("namespace_boolean") @ApiModelProperty(example = "true", value = "") public Boolean getNamespaceBoolean() { @@ -577,6 +569,7 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) { * Get namespaceArray * @return namespaceArray */ + @JsonProperty("namespace_array") @ApiModelProperty(value = "") public List getNamespaceArray() { @@ -604,6 +597,7 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) { * Get namespaceWrappedArray * @return namespaceWrappedArray */ + @JsonProperty("namespace_wrapped_array") @ApiModelProperty(value = "") public List getNamespaceWrappedArray() { @@ -623,6 +617,7 @@ public XmlItem prefixNsString(String prefixNsString) { * Get prefixNsString * @return prefixNsString */ + @JsonProperty("prefix_ns_string") @ApiModelProperty(example = "string", value = "") public String getPrefixNsString() { @@ -642,6 +637,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) { * Get prefixNsNumber * @return prefixNsNumber */ + @JsonProperty("prefix_ns_number") @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getPrefixNsNumber() { @@ -661,6 +657,7 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) { * Get prefixNsInteger * @return prefixNsInteger */ + @JsonProperty("prefix_ns_integer") @ApiModelProperty(example = "-2", value = "") public Integer getPrefixNsInteger() { @@ -680,6 +677,7 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) { * Get prefixNsBoolean * @return prefixNsBoolean */ + @JsonProperty("prefix_ns_boolean") @ApiModelProperty(example = "true", value = "") public Boolean getPrefixNsBoolean() { @@ -707,6 +705,7 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) { * Get prefixNsArray * @return prefixNsArray */ + @JsonProperty("prefix_ns_array") @ApiModelProperty(value = "") public List getPrefixNsArray() { @@ -734,6 +733,7 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) { * Get prefixNsWrappedArray * @return prefixNsWrappedArray */ + @JsonProperty("prefix_ns_wrapped_array") @ApiModelProperty(value = "") public List getPrefixNsWrappedArray() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 8e4c17989762..cb51920a8c28 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesAnyType extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesAnyType name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesAnyType name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 27a8f01607f1..1c66a636116f 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesArray extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesArray name(String name) { @@ -37,6 +36,7 @@ public AdditionalPropertiesArray name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index bc7b87d760a9..1dcc607639bf 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesBoolean extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesBoolean name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesBoolean name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index b5e88d5d7ccb..74250eb564ad 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -26,45 +26,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesClass { - @JsonProperty("map_string") @Valid private Map mapString = null; - @JsonProperty("map_number") @Valid private Map mapNumber = null; - @JsonProperty("map_integer") @Valid private Map mapInteger = null; - @JsonProperty("map_boolean") @Valid private Map mapBoolean = null; - @JsonProperty("map_array_integer") @Valid private Map> mapArrayInteger = null; - @JsonProperty("map_array_anytype") @Valid private Map> mapArrayAnytype = null; - @JsonProperty("map_map_string") @Valid private Map> mapMapString = null; - @JsonProperty("map_map_anytype") @Valid private Map> mapMapAnytype = null; - @JsonProperty("anytype_1") private Object anytype1; - @JsonProperty("anytype_2") private Object anytype2; - @JsonProperty("anytype_3") private Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { @@ -84,6 +73,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt * Get mapString * @return mapString */ + @JsonProperty("map_string") @ApiModelProperty(value = "") public Map getMapString() { @@ -111,6 +101,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * Get mapNumber * @return mapNumber */ + @JsonProperty("map_number") @Valid @ApiModelProperty(value = "") public Map getMapNumber() { @@ -138,6 +129,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege * Get mapInteger * @return mapInteger */ + @JsonProperty("map_integer") @ApiModelProperty(value = "") public Map getMapInteger() { @@ -165,6 +157,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea * Get mapBoolean * @return mapBoolean */ + @JsonProperty("map_boolean") @ApiModelProperty(value = "") public Map getMapBoolean() { @@ -192,6 +185,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { @@ -219,6 +213,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * Get mapArrayAnytype * @return mapArrayAnytype */ + @JsonProperty("map_array_anytype") @Valid @ApiModelProperty(value = "") public Map> getMapArrayAnytype() { @@ -246,6 +241,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { @@ -273,6 +269,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { @@ -292,6 +289,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) { * Get anytype1 * @return anytype1 */ + @JsonProperty("anytype_1") @ApiModelProperty(value = "") public Object getAnytype1() { @@ -311,6 +309,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) { * Get anytype2 * @return anytype2 */ + @JsonProperty("anytype_2") @ApiModelProperty(value = "") public Object getAnytype2() { @@ -330,6 +329,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) { * Get anytype3 * @return anytype3 */ + @JsonProperty("anytype_3") @ApiModelProperty(value = "") public Object getAnytype3() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 00b5174e93b7..ce8b8d62436c 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesInteger extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesInteger name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesInteger name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 8fec423ffb1b..dec791e0a273 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesNumber extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesNumber name(String name) { @@ -37,6 +36,7 @@ public AdditionalPropertiesNumber name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 67033332b0d6..546d0ab9216f 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesObject extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesObject name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesObject name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 993f83bb2cc1..c1f95cf62e81 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesString extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesString name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesString name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java index e11ae425d9e9..e880f829164c 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java @@ -39,10 +39,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Animal { - @JsonProperty("className") private String className; - @JsonProperty("color") private String color = "red"; public Animal className(String className) { @@ -54,6 +52,7 @@ public Animal className(String className) { * Get className * @return className */ + @JsonProperty("className") @NotNull @ApiModelProperty(required = true, value = "") public String getClassName() { @@ -73,6 +72,7 @@ public Animal color(String color) { * Get color * @return color */ + @JsonProperty("color") @ApiModelProperty(value = "") public String getColor() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index df67eda87fd1..46ab3b631960 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfArrayOfNumberOnly { - @JsonProperty("ArrayArrayNumber") @Valid private List> arrayArrayNumber = null; @@ -46,6 +45,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * Get arrayArrayNumber * @return arrayArrayNumber */ + @JsonProperty("ArrayArrayNumber") @Valid @ApiModelProperty(value = "") public List> getArrayArrayNumber() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 05f1ca376a68..cb5358905469 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfNumberOnly { - @JsonProperty("ArrayNumber") @Valid private List arrayNumber = null; @@ -46,6 +45,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ + @JsonProperty("ArrayNumber") @Valid @ApiModelProperty(value = "") public List getArrayNumber() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java index ba67885edc8a..55cc431ecde6 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java @@ -25,15 +25,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayTest { - @JsonProperty("array_of_string") @Valid private List arrayOfString = null; - @JsonProperty("array_array_of_integer") @Valid private List> arrayArrayOfInteger = null; - @JsonProperty("array_array_of_model") @Valid private List> arrayArrayOfModel = null; @@ -54,6 +51,7 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) { * Get arrayOfString * @return arrayOfString */ + @JsonProperty("array_of_string") @ApiModelProperty(value = "") public List getArrayOfString() { @@ -81,6 +79,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ + @JsonProperty("array_array_of_integer") @Valid @ApiModelProperty(value = "") public List> getArrayArrayOfInteger() { @@ -108,6 +107,7 @@ public ArrayTest addArrayArrayOfModelItem(List arrayArrayOfModelI * Get arrayArrayOfModel * @return arrayArrayOfModel */ + @JsonProperty("array_array_of_model") @Valid @ApiModelProperty(value = "") public List> getArrayArrayOfModel() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java index ec95c1253fad..70bbb0b93532 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java @@ -67,7 +67,6 @@ public static KindEnum fromValue(String value) { } } - @JsonProperty("kind") private KindEnum kind; public BigCat kind(KindEnum kind) { @@ -79,6 +78,7 @@ public BigCat kind(KindEnum kind) { * Get kind * @return kind */ + @JsonProperty("kind") @ApiModelProperty(value = "") public KindEnum getKind() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCatAllOf.java index 35ae937c0009..1a86665050e6 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCatAllOf.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCatAllOf.java @@ -64,7 +64,6 @@ public static KindEnum fromValue(String value) { } } - @JsonProperty("kind") private KindEnum kind; public BigCatAllOf kind(KindEnum kind) { @@ -76,6 +75,7 @@ public BigCatAllOf kind(KindEnum kind) { * Get kind * @return kind */ + @JsonProperty("kind") @ApiModelProperty(value = "") public KindEnum getKind() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Capitalization.java index e9cce9de0115..e0fdbe78bae2 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Capitalization.java @@ -22,22 +22,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Capitalization { - @JsonProperty("smallCamel") private String smallCamel; - @JsonProperty("CapitalCamel") private String capitalCamel; - @JsonProperty("small_Snake") private String smallSnake; - @JsonProperty("Capital_Snake") private String capitalSnake; - @JsonProperty("SCA_ETH_Flow_Points") private String scAETHFlowPoints; - @JsonProperty("ATT_NAME") private String ATT_NAME; public Capitalization smallCamel(String smallCamel) { @@ -49,6 +43,7 @@ public Capitalization smallCamel(String smallCamel) { * Get smallCamel * @return smallCamel */ + @JsonProperty("smallCamel") @ApiModelProperty(value = "") public String getSmallCamel() { @@ -68,6 +63,7 @@ public Capitalization capitalCamel(String capitalCamel) { * Get capitalCamel * @return capitalCamel */ + @JsonProperty("CapitalCamel") @ApiModelProperty(value = "") public String getCapitalCamel() { @@ -87,6 +83,7 @@ public Capitalization smallSnake(String smallSnake) { * Get smallSnake * @return smallSnake */ + @JsonProperty("small_Snake") @ApiModelProperty(value = "") public String getSmallSnake() { @@ -106,6 +103,7 @@ public Capitalization capitalSnake(String capitalSnake) { * Get capitalSnake * @return capitalSnake */ + @JsonProperty("Capital_Snake") @ApiModelProperty(value = "") public String getCapitalSnake() { @@ -125,6 +123,7 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) { * Get scAETHFlowPoints * @return scAETHFlowPoints */ + @JsonProperty("SCA_ETH_Flow_Points") @ApiModelProperty(value = "") public String getScAETHFlowPoints() { @@ -144,6 +143,7 @@ public Capitalization ATT_NAME(String ATT_NAME) { * Name of the pet * @return ATT_NAME */ + @JsonProperty("ATT_NAME") @ApiModelProperty(value = "Name of the pet ") public String getATTNAME() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java index 097ddbef7980..958fcb2298e0 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java @@ -36,7 +36,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Cat extends Animal { - @JsonProperty("declawed") private Boolean declawed; public Cat declawed(Boolean declawed) { @@ -48,6 +47,7 @@ public Cat declawed(Boolean declawed) { * Get declawed * @return declawed */ + @JsonProperty("declawed") @ApiModelProperty(value = "") public Boolean getDeclawed() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/CatAllOf.java index eed74bea751a..63de2ad8818e 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/CatAllOf.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/CatAllOf.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class CatAllOf { - @JsonProperty("declawed") private Boolean declawed; public CatAllOf declawed(Boolean declawed) { @@ -36,6 +35,7 @@ public CatAllOf declawed(Boolean declawed) { * Get declawed * @return declawed */ + @JsonProperty("declawed") @ApiModelProperty(value = "") public Boolean getDeclawed() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java index 27a4a9f25665..b63268b2c8ce 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java @@ -22,10 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name = "default-name"; public Category id(Long id) { @@ -37,6 +35,7 @@ public Category id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -56,6 +55,7 @@ public Category name(String name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @ApiModelProperty(required = true, value = "") public String getName() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ClassModel.java index 69296da7e60e..976f0b01d071 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ClassModel.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ClassModel { - @JsonProperty("_class") private String propertyClass; public ClassModel propertyClass(String propertyClass) { @@ -35,6 +34,7 @@ public ClassModel propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ + @JsonProperty("_class") @ApiModelProperty(value = "") public String getPropertyClass() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Client.java index b788daea14a3..a3c4731f3339 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Client.java @@ -22,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Client { - @JsonProperty("client") private String client; public Client client(String client) { @@ -34,6 +33,7 @@ public Client client(String client) { * Get client * @return client */ + @JsonProperty("client") @ApiModelProperty(value = "") public String getClient() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Dog.java index 9b61a2fa29b6..593562fabb42 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Dog.java @@ -27,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Dog extends Animal { - @JsonProperty("breed") private String breed; public Dog breed(String breed) { @@ -39,6 +38,7 @@ public Dog breed(String breed) { * Get breed * @return breed */ + @JsonProperty("breed") @ApiModelProperty(value = "") public String getBreed() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/DogAllOf.java index 4f275e535333..7ddb24717737 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/DogAllOf.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/DogAllOf.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class DogAllOf { - @JsonProperty("breed") private String breed; public DogAllOf breed(String breed) { @@ -36,6 +35,7 @@ public DogAllOf breed(String breed) { * Get breed * @return breed */ + @JsonProperty("breed") @ApiModelProperty(value = "") public String getBreed() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java index dba32cf2b710..04e850b1cf17 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java @@ -60,7 +60,6 @@ public static JustSymbolEnum fromValue(String value) { } } - @JsonProperty("just_symbol") private JustSymbolEnum justSymbol; /** @@ -98,7 +97,6 @@ public static ArrayEnumEnum fromValue(String value) { } } - @JsonProperty("array_enum") @Valid private List arrayEnum = null; @@ -111,6 +109,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) { * Get justSymbol * @return justSymbol */ + @JsonProperty("just_symbol") @ApiModelProperty(value = "") public JustSymbolEnum getJustSymbol() { @@ -138,6 +137,7 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) { * Get arrayEnum * @return arrayEnum */ + @JsonProperty("array_enum") @ApiModelProperty(value = "") public List getArrayEnum() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java index c20bc1460143..49747f67dccf 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java @@ -63,7 +63,6 @@ public static EnumStringEnum fromValue(String value) { } } - @JsonProperty("enum_string") private EnumStringEnum enumString; /** @@ -103,7 +102,6 @@ public static EnumStringRequiredEnum fromValue(String value) { } } - @JsonProperty("enum_string_required") private EnumStringRequiredEnum enumStringRequired; /** @@ -141,7 +139,6 @@ public static EnumIntegerEnum fromValue(Integer value) { } } - @JsonProperty("enum_integer") private EnumIntegerEnum enumInteger; /** @@ -179,10 +176,8 @@ public static EnumNumberEnum fromValue(Double value) { } } - @JsonProperty("enum_number") private EnumNumberEnum enumNumber; - @JsonProperty("outerEnum") private OuterEnum outerEnum; public EnumTest enumString(EnumStringEnum enumString) { @@ -194,6 +189,7 @@ public EnumTest enumString(EnumStringEnum enumString) { * Get enumString * @return enumString */ + @JsonProperty("enum_string") @ApiModelProperty(value = "") public EnumStringEnum getEnumString() { @@ -213,6 +209,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) { * Get enumStringRequired * @return enumStringRequired */ + @JsonProperty("enum_string_required") @NotNull @ApiModelProperty(required = true, value = "") public EnumStringRequiredEnum getEnumStringRequired() { @@ -232,6 +229,7 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) { * Get enumInteger * @return enumInteger */ + @JsonProperty("enum_integer") @ApiModelProperty(value = "") public EnumIntegerEnum getEnumInteger() { @@ -251,6 +249,7 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) { * Get enumNumber * @return enumNumber */ + @JsonProperty("enum_number") @ApiModelProperty(value = "") public EnumNumberEnum getEnumNumber() { @@ -270,6 +269,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) { * Get outerEnum * @return outerEnum */ + @JsonProperty("outerEnum") @Valid @ApiModelProperty(value = "") public OuterEnum getOuterEnum() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/File.java index d82e4902623d..43c44fd344bb 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/File.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/File.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class File { - @JsonProperty("sourceURI") private String sourceURI; public File sourceURI(String sourceURI) { @@ -35,6 +34,7 @@ public File sourceURI(String sourceURI) { * Test capitalization * @return sourceURI */ + @JsonProperty("sourceURI") @ApiModelProperty(value = "Test capitalization") public String getSourceURI() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 2ea153bd6468..d7815943b774 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -25,10 +25,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FileSchemaTestClass { - @JsonProperty("file") private File file; - @JsonProperty("files") @Valid private List files = null; @@ -41,6 +39,7 @@ public FileSchemaTestClass file(File file) { * Get file * @return file */ + @JsonProperty("file") @Valid @ApiModelProperty(value = "") public File getFile() { @@ -68,6 +67,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) { * Get files * @return files */ + @JsonProperty("files") @Valid @ApiModelProperty(value = "") public List getFiles() { 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 0e2aeaa78a22..ffd18f0ce221 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 @@ -30,48 +30,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FormatTest { - @JsonProperty("integer") private Integer integer; - @JsonProperty("int32") private Integer int32; - @JsonProperty("int64") private Long int64; - @JsonProperty("number") private BigDecimal number; - @JsonProperty("float") private Float _float; - @JsonProperty("double") private Double _double; - @JsonProperty("string") private String string; - @JsonProperty("byte") private byte[] _byte; - @JsonProperty("binary") private org.springframework.core.io.Resource binary; - @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("password") private String password; - @JsonProperty("BigDecimal") private BigDecimal bigDecimal; public FormatTest integer(Integer integer) { @@ -85,6 +71,7 @@ public FormatTest integer(Integer integer) { * maximum: 100 * @return integer */ + @JsonProperty("integer") @Min(10) @Max(100) @ApiModelProperty(value = "") public Integer getInteger() { @@ -106,6 +93,7 @@ public FormatTest int32(Integer int32) { * maximum: 200 * @return int32 */ + @JsonProperty("int32") @Min(20) @Max(200) @ApiModelProperty(value = "") public Integer getInt32() { @@ -125,6 +113,7 @@ public FormatTest int64(Long int64) { * Get int64 * @return int64 */ + @JsonProperty("int64") @ApiModelProperty(value = "") public Long getInt64() { @@ -146,6 +135,7 @@ public FormatTest number(BigDecimal number) { * maximum: 543.2 * @return number */ + @JsonProperty("number") @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") @ApiModelProperty(required = true, value = "") public BigDecimal getNumber() { @@ -167,6 +157,7 @@ public FormatTest _float(Float _float) { * maximum: 987.6 * @return _float */ + @JsonProperty("float") @DecimalMin("54.3") @DecimalMax("987.6") @ApiModelProperty(value = "") public Float getFloat() { @@ -188,6 +179,7 @@ public FormatTest _double(Double _double) { * maximum: 123.4 * @return _double */ + @JsonProperty("double") @DecimalMin("67.8") @DecimalMax("123.4") @ApiModelProperty(value = "") public Double getDouble() { @@ -207,6 +199,7 @@ public FormatTest string(String string) { * Get string * @return string */ + @JsonProperty("string") @Pattern(regexp = "/[a-z]/i") @ApiModelProperty(value = "") public String getString() { @@ -226,6 +219,7 @@ public FormatTest _byte(byte[] _byte) { * Get _byte * @return _byte */ + @JsonProperty("byte") @NotNull @ApiModelProperty(required = true, value = "") public byte[] getByte() { @@ -245,6 +239,7 @@ public FormatTest binary(org.springframework.core.io.Resource binary) { * Get binary * @return binary */ + @JsonProperty("binary") @Valid @ApiModelProperty(value = "") public org.springframework.core.io.Resource getBinary() { @@ -264,6 +259,7 @@ public FormatTest date(LocalDate date) { * Get date * @return date */ + @JsonProperty("date") @NotNull @Valid @ApiModelProperty(required = true, value = "") public LocalDate getDate() { @@ -283,6 +279,7 @@ public FormatTest dateTime(OffsetDateTime dateTime) { * Get dateTime * @return dateTime */ + @JsonProperty("dateTime") @Valid @ApiModelProperty(value = "") public OffsetDateTime getDateTime() { @@ -302,6 +299,7 @@ public FormatTest uuid(UUID uuid) { * Get uuid * @return uuid */ + @JsonProperty("uuid") @Valid @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") public UUID getUuid() { @@ -321,6 +319,7 @@ public FormatTest password(String password) { * Get password * @return password */ + @JsonProperty("password") @NotNull @Size(min = 10, max = 64) @ApiModelProperty(required = true, value = "") public String getPassword() { @@ -340,6 +339,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) { * Get bigDecimal * @return bigDecimal */ + @JsonProperty("BigDecimal") @Valid @ApiModelProperty(value = "") public BigDecimal getBigDecimal() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index 224b16d1a2d3..948ed9a0731d 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -24,10 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class HasOnlyReadOnly { - @JsonProperty("bar") private String bar; - @JsonProperty("foo") private String foo; public HasOnlyReadOnly bar(String bar) { @@ -39,6 +37,7 @@ public HasOnlyReadOnly bar(String bar) { * Get bar * @return bar */ + @JsonProperty("bar") @ApiModelProperty(readOnly = true, value = "") public String getBar() { @@ -58,6 +57,7 @@ public HasOnlyReadOnly foo(String foo) { * Get foo * @return foo */ + @JsonProperty("foo") @ApiModelProperty(readOnly = true, value = "") public String getFoo() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java index f2867ac50403..94d4ae9a9d56 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MapTest { - @JsonProperty("map_map_of_string") @Valid private Map> mapMapOfString = null; @@ -64,15 +63,12 @@ public static InnerEnum fromValue(String value) { } } - @JsonProperty("map_of_enum_string") @Valid private Map mapOfEnumString = null; - @JsonProperty("direct_map") @Valid private Map directMap = null; - @JsonProperty("indirect_map") @Valid private Map indirectMap = null; @@ -93,6 +89,7 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapMapOfString * @return mapMapOfString */ + @JsonProperty("map_map_of_string") @Valid @ApiModelProperty(value = "") public Map> getMapMapOfString() { @@ -120,6 +117,7 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) * Get mapOfEnumString * @return mapOfEnumString */ + @JsonProperty("map_of_enum_string") @ApiModelProperty(value = "") public Map getMapOfEnumString() { @@ -147,6 +145,7 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) { * Get directMap * @return directMap */ + @JsonProperty("direct_map") @ApiModelProperty(value = "") public Map getDirectMap() { @@ -174,6 +173,7 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) { * Get indirectMap * @return indirectMap */ + @JsonProperty("indirect_map") @ApiModelProperty(value = "") public Map getIndirectMap() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 901c65b2924d..89a2475d82fb 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -28,14 +28,11 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("map") @Valid private Map map = null; @@ -48,6 +45,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { * Get uuid * @return uuid */ + @JsonProperty("uuid") @Valid @ApiModelProperty(value = "") public UUID getUuid() { @@ -67,6 +65,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT * Get dateTime * @return dateTime */ + @JsonProperty("dateTime") @Valid @ApiModelProperty(value = "") public OffsetDateTime getDateTime() { @@ -94,6 +93,7 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * Get map * @return map */ + @JsonProperty("map") @Valid @ApiModelProperty(value = "") public Map getMap() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Model200Response.java index 36dfd34883e8..220b6493f31a 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Model200Response.java @@ -25,10 +25,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Model200Response { - @JsonProperty("name") private Integer name; - @JsonProperty("class") private String propertyClass; public Model200Response name(Integer name) { @@ -40,6 +38,7 @@ public Model200Response name(Integer name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public Integer getName() { @@ -59,6 +58,7 @@ public Model200Response propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ + @JsonProperty("class") @ApiModelProperty(value = "") public String getPropertyClass() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelApiResponse.java index dfba6cb672d4..29f3f43cf20e 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -24,13 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -42,6 +39,7 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ + @JsonProperty("code") @ApiModelProperty(value = "") public Integer getCode() { @@ -61,6 +59,7 @@ public ModelApiResponse type(String type) { * Get type * @return type */ + @JsonProperty("type") @ApiModelProperty(value = "") public String getType() { @@ -80,6 +79,7 @@ public ModelApiResponse message(String message) { * Get message * @return message */ + @JsonProperty("message") @ApiModelProperty(value = "") public String getMessage() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelList.java index 97ddf5359aa0..a374fe83d52a 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelList.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelList { - @JsonProperty("123-list") private String _123list; public ModelList _123list(String _123list) { @@ -36,6 +35,7 @@ public ModelList _123list(String _123list) { * Get _123list * @return _123list */ + @JsonProperty("123-list") @ApiModelProperty(value = "") public String get123list() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelReturn.java index 4505ddfeeeca..d8fc618d9dfb 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelReturn.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelReturn { - @JsonProperty("return") private Integer _return; public ModelReturn _return(Integer _return) { @@ -37,6 +36,7 @@ public ModelReturn _return(Integer _return) { * Get _return * @return _return */ + @JsonProperty("return") @ApiModelProperty(value = "") public Integer getReturn() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Name.java index 51cc37bbeea7..054901b488d6 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Name.java @@ -23,16 +23,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Name { - @JsonProperty("name") private Integer name; - @JsonProperty("snake_case") private Integer snakeCase; - @JsonProperty("property") private String property; - @JsonProperty("123Number") private Integer _123number; public Name name(Integer name) { @@ -44,6 +40,7 @@ public Name name(Integer name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @ApiModelProperty(required = true, value = "") public Integer getName() { @@ -63,6 +60,7 @@ public Name snakeCase(Integer snakeCase) { * Get snakeCase * @return snakeCase */ + @JsonProperty("snake_case") @ApiModelProperty(readOnly = true, value = "") public Integer getSnakeCase() { @@ -82,6 +80,7 @@ public Name property(String property) { * Get property * @return property */ + @JsonProperty("property") @ApiModelProperty(value = "") public String getProperty() { @@ -101,6 +100,7 @@ public Name _123number(Integer _123number) { * Get _123number * @return _123number */ + @JsonProperty("123Number") @ApiModelProperty(readOnly = true, value = "") public Integer get123number() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NumberOnly.java index 278146bfb899..8f2f2b19b191 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NumberOnly.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class NumberOnly { - @JsonProperty("JustNumber") private BigDecimal justNumber; public NumberOnly justNumber(BigDecimal justNumber) { @@ -35,6 +34,7 @@ public NumberOnly justNumber(BigDecimal justNumber) { * Get justNumber * @return justNumber */ + @JsonProperty("JustNumber") @Valid @ApiModelProperty(value = "") public BigDecimal getJustNumber() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Order.java index 9a9ed4f6c960..feac4d2cad8d 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Order.java @@ -25,16 +25,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -75,10 +71,8 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -90,6 +84,7 @@ public Order id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -109,6 +104,7 @@ public Order petId(Long petId) { * Get petId * @return petId */ + @JsonProperty("petId") @ApiModelProperty(value = "") public Long getPetId() { @@ -128,6 +124,7 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ + @JsonProperty("quantity") @ApiModelProperty(value = "") public Integer getQuantity() { @@ -147,6 +144,7 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ + @JsonProperty("shipDate") @Valid @ApiModelProperty(value = "") public OffsetDateTime getShipDate() { @@ -166,6 +164,7 @@ public Order status(StatusEnum status) { * Order Status * @return status */ + @JsonProperty("status") @ApiModelProperty(value = "Order Status") public StatusEnum getStatus() { @@ -185,6 +184,7 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ + @JsonProperty("complete") @ApiModelProperty(value = "") public Boolean getComplete() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/OuterComposite.java index c1a709bb26ad..00cce99097d7 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/OuterComposite.java @@ -23,13 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class OuterComposite { - @JsonProperty("my_number") private BigDecimal myNumber; - @JsonProperty("my_string") private String myString; - @JsonProperty("my_boolean") private Boolean myBoolean; public OuterComposite myNumber(BigDecimal myNumber) { @@ -41,6 +38,7 @@ public OuterComposite myNumber(BigDecimal myNumber) { * Get myNumber * @return myNumber */ + @JsonProperty("my_number") @Valid @ApiModelProperty(value = "") public BigDecimal getMyNumber() { @@ -60,6 +58,7 @@ public OuterComposite myString(String myString) { * Get myString * @return myString */ + @JsonProperty("my_string") @ApiModelProperty(value = "") public String getMyString() { @@ -79,6 +78,7 @@ public OuterComposite myBoolean(Boolean myBoolean) { * Get myBoolean * @return myBoolean */ + @JsonProperty("my_boolean") @ApiModelProperty(value = "") public Boolean getMyBoolean() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java index 4d705acedcd2..e39c22373324 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java @@ -30,20 +30,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private Set photoUrls = new LinkedHashSet<>(); - @JsonProperty("tags") @Valid private List tags = null; @@ -84,7 +79,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; public Pet id(Long id) { @@ -96,6 +90,7 @@ public Pet id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -115,6 +110,7 @@ public Pet category(Category category) { * Get category * @return category */ + @JsonProperty("category") @Valid @ApiModelProperty(value = "") public Category getCategory() { @@ -134,6 +130,7 @@ public Pet name(String name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") public String getName() { @@ -158,6 +155,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ + @JsonProperty("photoUrls") @NotNull @ApiModelProperty(required = true, value = "") public Set getPhotoUrls() { @@ -186,6 +184,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ + @JsonProperty("tags") @Valid @ApiModelProperty(value = "") public List getTags() { @@ -205,6 +204,7 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ + @JsonProperty("status") @ApiModelProperty(value = "pet status in the store") public StatusEnum getStatus() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java index b7a0a416782e..d02b8c8cfd53 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -22,10 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ReadOnlyFirst { - @JsonProperty("bar") private String bar; - @JsonProperty("baz") private String baz; public ReadOnlyFirst bar(String bar) { @@ -37,6 +35,7 @@ public ReadOnlyFirst bar(String bar) { * Get bar * @return bar */ + @JsonProperty("bar") @ApiModelProperty(readOnly = true, value = "") public String getBar() { @@ -56,6 +55,7 @@ public ReadOnlyFirst baz(String baz) { * Get baz * @return baz */ + @JsonProperty("baz") @ApiModelProperty(value = "") public String getBaz() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java index f321ab78cd56..8f176362e027 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class SpecialModelName { - @JsonProperty("$special[property.name]") private Long $specialPropertyName; public SpecialModelName $specialPropertyName(Long $specialPropertyName) { @@ -36,6 +35,7 @@ public class SpecialModelName { * Get $specialPropertyName * @return $specialPropertyName */ + @JsonProperty("$special[property.name]") @ApiModelProperty(value = "") public Long get$SpecialPropertyName() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Tag.java index 6161be4a9229..f7797bef2f19 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Tag.java @@ -22,10 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -37,6 +35,7 @@ public Tag id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -56,6 +55,7 @@ public Tag name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java index f10cff73bb78..506efbf431c1 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -25,19 +25,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderDefault { - @JsonProperty("string_item") private String stringItem = "what"; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem = true; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -50,6 +45,7 @@ public TypeHolderDefault stringItem(String stringItem) { * Get stringItem * @return stringItem */ + @JsonProperty("string_item") @NotNull @ApiModelProperty(required = true, value = "") public String getStringItem() { @@ -69,6 +65,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ + @JsonProperty("number_item") @NotNull @Valid @ApiModelProperty(required = true, value = "") public BigDecimal getNumberItem() { @@ -88,6 +85,7 @@ public TypeHolderDefault integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ + @JsonProperty("integer_item") @NotNull @ApiModelProperty(required = true, value = "") public Integer getIntegerItem() { @@ -107,6 +105,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ + @JsonProperty("bool_item") @NotNull @ApiModelProperty(required = true, value = "") public Boolean getBoolItem() { @@ -131,6 +130,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ + @JsonProperty("array_item") @NotNull @ApiModelProperty(required = true, value = "") public List getArrayItem() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java index d2ae69a4e5a8..806c0c90fa18 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -25,22 +25,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderExample { - @JsonProperty("string_item") private String stringItem; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("float_item") private Float floatItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -53,6 +47,7 @@ public TypeHolderExample stringItem(String stringItem) { * Get stringItem * @return stringItem */ + @JsonProperty("string_item") @NotNull @ApiModelProperty(example = "what", required = true, value = "") public String getStringItem() { @@ -72,6 +67,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ + @JsonProperty("number_item") @NotNull @Valid @ApiModelProperty(example = "1.234", required = true, value = "") public BigDecimal getNumberItem() { @@ -91,6 +87,7 @@ public TypeHolderExample floatItem(Float floatItem) { * Get floatItem * @return floatItem */ + @JsonProperty("float_item") @NotNull @ApiModelProperty(example = "1.234", required = true, value = "") public Float getFloatItem() { @@ -110,6 +107,7 @@ public TypeHolderExample integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ + @JsonProperty("integer_item") @NotNull @ApiModelProperty(example = "-2", required = true, value = "") public Integer getIntegerItem() { @@ -129,6 +127,7 @@ public TypeHolderExample boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ + @JsonProperty("bool_item") @NotNull @ApiModelProperty(example = "true", required = true, value = "") public Boolean getBoolItem() { @@ -153,6 +152,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ + @JsonProperty("array_item") @NotNull @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "") public List getArrayItem() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/User.java index ec85459bc99a..f42832389ffe 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/User.java @@ -22,28 +22,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -55,6 +47,7 @@ public User id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -74,6 +67,7 @@ public User username(String username) { * Get username * @return username */ + @JsonProperty("username") @ApiModelProperty(value = "") public String getUsername() { @@ -93,6 +87,7 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ + @JsonProperty("firstName") @ApiModelProperty(value = "") public String getFirstName() { @@ -112,6 +107,7 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ + @JsonProperty("lastName") @ApiModelProperty(value = "") public String getLastName() { @@ -131,6 +127,7 @@ public User email(String email) { * Get email * @return email */ + @JsonProperty("email") @ApiModelProperty(value = "") public String getEmail() { @@ -150,6 +147,7 @@ public User password(String password) { * Get password * @return password */ + @JsonProperty("password") @ApiModelProperty(value = "") public String getPassword() { @@ -169,6 +167,7 @@ public User phone(String phone) { * Get phone * @return phone */ + @JsonProperty("phone") @ApiModelProperty(value = "") public String getPhone() { @@ -188,6 +187,7 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ + @JsonProperty("userStatus") @ApiModelProperty(value = "User Status") public Integer getUserStatus() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java index 27d5f8282818..c795b4b85e6d 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java @@ -25,99 +25,70 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class XmlItem { - @JsonProperty("attribute_string") private String attributeString; - @JsonProperty("attribute_number") private BigDecimal attributeNumber; - @JsonProperty("attribute_integer") private Integer attributeInteger; - @JsonProperty("attribute_boolean") private Boolean attributeBoolean; - @JsonProperty("wrapped_array") @Valid private List wrappedArray = null; - @JsonProperty("name_string") private String nameString; - @JsonProperty("name_number") private BigDecimal nameNumber; - @JsonProperty("name_integer") private Integer nameInteger; - @JsonProperty("name_boolean") private Boolean nameBoolean; - @JsonProperty("name_array") @Valid private List nameArray = null; - @JsonProperty("name_wrapped_array") @Valid private List nameWrappedArray = null; - @JsonProperty("prefix_string") private String prefixString; - @JsonProperty("prefix_number") private BigDecimal prefixNumber; - @JsonProperty("prefix_integer") private Integer prefixInteger; - @JsonProperty("prefix_boolean") private Boolean prefixBoolean; - @JsonProperty("prefix_array") @Valid private List prefixArray = null; - @JsonProperty("prefix_wrapped_array") @Valid private List prefixWrappedArray = null; - @JsonProperty("namespace_string") private String namespaceString; - @JsonProperty("namespace_number") private BigDecimal namespaceNumber; - @JsonProperty("namespace_integer") private Integer namespaceInteger; - @JsonProperty("namespace_boolean") private Boolean namespaceBoolean; - @JsonProperty("namespace_array") @Valid private List namespaceArray = null; - @JsonProperty("namespace_wrapped_array") @Valid private List namespaceWrappedArray = null; - @JsonProperty("prefix_ns_string") private String prefixNsString; - @JsonProperty("prefix_ns_number") private BigDecimal prefixNsNumber; - @JsonProperty("prefix_ns_integer") private Integer prefixNsInteger; - @JsonProperty("prefix_ns_boolean") private Boolean prefixNsBoolean; - @JsonProperty("prefix_ns_array") @Valid private List prefixNsArray = null; - @JsonProperty("prefix_ns_wrapped_array") @Valid private List prefixNsWrappedArray = null; @@ -130,6 +101,7 @@ public XmlItem attributeString(String attributeString) { * Get attributeString * @return attributeString */ + @JsonProperty("attribute_string") @ApiModelProperty(example = "string", value = "") public String getAttributeString() { @@ -149,6 +121,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) { * Get attributeNumber * @return attributeNumber */ + @JsonProperty("attribute_number") @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getAttributeNumber() { @@ -168,6 +141,7 @@ public XmlItem attributeInteger(Integer attributeInteger) { * Get attributeInteger * @return attributeInteger */ + @JsonProperty("attribute_integer") @ApiModelProperty(example = "-2", value = "") public Integer getAttributeInteger() { @@ -187,6 +161,7 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) { * Get attributeBoolean * @return attributeBoolean */ + @JsonProperty("attribute_boolean") @ApiModelProperty(example = "true", value = "") public Boolean getAttributeBoolean() { @@ -214,6 +189,7 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) { * Get wrappedArray * @return wrappedArray */ + @JsonProperty("wrapped_array") @ApiModelProperty(value = "") public List getWrappedArray() { @@ -233,6 +209,7 @@ public XmlItem nameString(String nameString) { * Get nameString * @return nameString */ + @JsonProperty("name_string") @ApiModelProperty(example = "string", value = "") public String getNameString() { @@ -252,6 +229,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) { * Get nameNumber * @return nameNumber */ + @JsonProperty("name_number") @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getNameNumber() { @@ -271,6 +249,7 @@ public XmlItem nameInteger(Integer nameInteger) { * Get nameInteger * @return nameInteger */ + @JsonProperty("name_integer") @ApiModelProperty(example = "-2", value = "") public Integer getNameInteger() { @@ -290,6 +269,7 @@ public XmlItem nameBoolean(Boolean nameBoolean) { * Get nameBoolean * @return nameBoolean */ + @JsonProperty("name_boolean") @ApiModelProperty(example = "true", value = "") public Boolean getNameBoolean() { @@ -317,6 +297,7 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) { * Get nameArray * @return nameArray */ + @JsonProperty("name_array") @ApiModelProperty(value = "") public List getNameArray() { @@ -344,6 +325,7 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) { * Get nameWrappedArray * @return nameWrappedArray */ + @JsonProperty("name_wrapped_array") @ApiModelProperty(value = "") public List getNameWrappedArray() { @@ -363,6 +345,7 @@ public XmlItem prefixString(String prefixString) { * Get prefixString * @return prefixString */ + @JsonProperty("prefix_string") @ApiModelProperty(example = "string", value = "") public String getPrefixString() { @@ -382,6 +365,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) { * Get prefixNumber * @return prefixNumber */ + @JsonProperty("prefix_number") @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getPrefixNumber() { @@ -401,6 +385,7 @@ public XmlItem prefixInteger(Integer prefixInteger) { * Get prefixInteger * @return prefixInteger */ + @JsonProperty("prefix_integer") @ApiModelProperty(example = "-2", value = "") public Integer getPrefixInteger() { @@ -420,6 +405,7 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) { * Get prefixBoolean * @return prefixBoolean */ + @JsonProperty("prefix_boolean") @ApiModelProperty(example = "true", value = "") public Boolean getPrefixBoolean() { @@ -447,6 +433,7 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) { * Get prefixArray * @return prefixArray */ + @JsonProperty("prefix_array") @ApiModelProperty(value = "") public List getPrefixArray() { @@ -474,6 +461,7 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) { * Get prefixWrappedArray * @return prefixWrappedArray */ + @JsonProperty("prefix_wrapped_array") @ApiModelProperty(value = "") public List getPrefixWrappedArray() { @@ -493,6 +481,7 @@ public XmlItem namespaceString(String namespaceString) { * Get namespaceString * @return namespaceString */ + @JsonProperty("namespace_string") @ApiModelProperty(example = "string", value = "") public String getNamespaceString() { @@ -512,6 +501,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) { * Get namespaceNumber * @return namespaceNumber */ + @JsonProperty("namespace_number") @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getNamespaceNumber() { @@ -531,6 +521,7 @@ public XmlItem namespaceInteger(Integer namespaceInteger) { * Get namespaceInteger * @return namespaceInteger */ + @JsonProperty("namespace_integer") @ApiModelProperty(example = "-2", value = "") public Integer getNamespaceInteger() { @@ -550,6 +541,7 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) { * Get namespaceBoolean * @return namespaceBoolean */ + @JsonProperty("namespace_boolean") @ApiModelProperty(example = "true", value = "") public Boolean getNamespaceBoolean() { @@ -577,6 +569,7 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) { * Get namespaceArray * @return namespaceArray */ + @JsonProperty("namespace_array") @ApiModelProperty(value = "") public List getNamespaceArray() { @@ -604,6 +597,7 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) { * Get namespaceWrappedArray * @return namespaceWrappedArray */ + @JsonProperty("namespace_wrapped_array") @ApiModelProperty(value = "") public List getNamespaceWrappedArray() { @@ -623,6 +617,7 @@ public XmlItem prefixNsString(String prefixNsString) { * Get prefixNsString * @return prefixNsString */ + @JsonProperty("prefix_ns_string") @ApiModelProperty(example = "string", value = "") public String getPrefixNsString() { @@ -642,6 +637,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) { * Get prefixNsNumber * @return prefixNsNumber */ + @JsonProperty("prefix_ns_number") @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getPrefixNsNumber() { @@ -661,6 +657,7 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) { * Get prefixNsInteger * @return prefixNsInteger */ + @JsonProperty("prefix_ns_integer") @ApiModelProperty(example = "-2", value = "") public Integer getPrefixNsInteger() { @@ -680,6 +677,7 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) { * Get prefixNsBoolean * @return prefixNsBoolean */ + @JsonProperty("prefix_ns_boolean") @ApiModelProperty(example = "true", value = "") public Boolean getPrefixNsBoolean() { @@ -707,6 +705,7 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) { * Get prefixNsArray * @return prefixNsArray */ + @JsonProperty("prefix_ns_array") @ApiModelProperty(value = "") public List getPrefixNsArray() { @@ -734,6 +733,7 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) { * Get prefixNsWrappedArray * @return prefixNsWrappedArray */ + @JsonProperty("prefix_ns_wrapped_array") @ApiModelProperty(value = "") public List getPrefixNsWrappedArray() { diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Category.java index 0d2e56dfa3d9..870578890cac 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Category.java @@ -20,10 +20,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Category id(Long id) { @@ -35,6 +33,7 @@ public Category id(Long id) { * Get id * @return id */ + @JsonProperty("id") public Long getId() { return id; @@ -53,6 +52,7 @@ public Category name(String name) { * Get name * @return name */ + @JsonProperty("name") @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") public String getName() { return name; diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/ModelApiResponse.java index f66ed8b59413..6fb2e932dade 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -22,13 +22,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -40,6 +37,7 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ + @JsonProperty("code") public Integer getCode() { return code; @@ -58,6 +56,7 @@ public ModelApiResponse type(String type) { * Get type * @return type */ + @JsonProperty("type") public String getType() { return type; @@ -76,6 +75,7 @@ public ModelApiResponse message(String message) { * Get message * @return message */ + @JsonProperty("message") public String getMessage() { return message; diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Order.java index aafcfc0cc192..55aefcfb7441 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Order.java @@ -23,16 +23,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -73,10 +69,8 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -88,6 +82,7 @@ public Order id(Long id) { * Get id * @return id */ + @JsonProperty("id") public Long getId() { return id; @@ -106,6 +101,7 @@ public Order petId(Long petId) { * Get petId * @return petId */ + @JsonProperty("petId") public Long getPetId() { return petId; @@ -124,6 +120,7 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ + @JsonProperty("quantity") public Integer getQuantity() { return quantity; @@ -142,6 +139,7 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ + @JsonProperty("shipDate") @Valid public OffsetDateTime getShipDate() { return shipDate; @@ -160,6 +158,7 @@ public Order status(StatusEnum status) { * Order Status * @return status */ + @JsonProperty("status") public StatusEnum getStatus() { return status; @@ -178,6 +177,7 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ + @JsonProperty("complete") public Boolean getComplete() { return complete; diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Pet.java index c857f5804afd..0180283859c6 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Pet.java @@ -25,20 +25,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private List photoUrls = new ArrayList<>(); - @JsonProperty("tags") @Valid private List tags = null; @@ -79,7 +74,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; public Pet id(Long id) { @@ -91,6 +85,7 @@ public Pet id(Long id) { * Get id * @return id */ + @JsonProperty("id") public Long getId() { return id; @@ -109,6 +104,7 @@ public Pet category(Category category) { * Get category * @return category */ + @JsonProperty("category") @Valid public Category getCategory() { return category; @@ -127,6 +123,7 @@ public Pet name(String name) { * Get name * @return name */ + @JsonProperty("name") @NotNull public String getName() { return name; @@ -150,6 +147,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ + @JsonProperty("photoUrls") @NotNull public List getPhotoUrls() { return photoUrls; @@ -176,6 +174,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ + @JsonProperty("tags") @Valid public List getTags() { return tags; @@ -194,6 +193,7 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ + @JsonProperty("status") public StatusEnum getStatus() { return status; diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Tag.java index 32f55514e089..430014eecc26 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Tag.java @@ -20,10 +20,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -35,6 +33,7 @@ public Tag id(Long id) { * Get id * @return id */ + @JsonProperty("id") public Long getId() { return id; @@ -53,6 +52,7 @@ public Tag name(String name) { * Get name * @return name */ + @JsonProperty("name") public String getName() { return name; diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/User.java index 16f35830e845..6e3daf33b33c 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/User.java @@ -20,28 +20,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -53,6 +45,7 @@ public User id(Long id) { * Get id * @return id */ + @JsonProperty("id") public Long getId() { return id; @@ -71,6 +64,7 @@ public User username(String username) { * Get username * @return username */ + @JsonProperty("username") public String getUsername() { return username; @@ -89,6 +83,7 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ + @JsonProperty("firstName") public String getFirstName() { return firstName; @@ -107,6 +102,7 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ + @JsonProperty("lastName") public String getLastName() { return lastName; @@ -125,6 +121,7 @@ public User email(String email) { * Get email * @return email */ + @JsonProperty("email") public String getEmail() { return email; @@ -143,6 +140,7 @@ public User password(String password) { * Get password * @return password */ + @JsonProperty("password") public String getPassword() { return password; @@ -161,6 +159,7 @@ public User phone(String phone) { * Get phone * @return phone */ + @JsonProperty("phone") public String getPhone() { return phone; @@ -179,6 +178,7 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 8e4c17989762..cb51920a8c28 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesAnyType extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesAnyType name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesAnyType name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 27a8f01607f1..1c66a636116f 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesArray extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesArray name(String name) { @@ -37,6 +36,7 @@ public AdditionalPropertiesArray name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index bc7b87d760a9..1dcc607639bf 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesBoolean extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesBoolean name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesBoolean name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index b5e88d5d7ccb..74250eb564ad 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -26,45 +26,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesClass { - @JsonProperty("map_string") @Valid private Map mapString = null; - @JsonProperty("map_number") @Valid private Map mapNumber = null; - @JsonProperty("map_integer") @Valid private Map mapInteger = null; - @JsonProperty("map_boolean") @Valid private Map mapBoolean = null; - @JsonProperty("map_array_integer") @Valid private Map> mapArrayInteger = null; - @JsonProperty("map_array_anytype") @Valid private Map> mapArrayAnytype = null; - @JsonProperty("map_map_string") @Valid private Map> mapMapString = null; - @JsonProperty("map_map_anytype") @Valid private Map> mapMapAnytype = null; - @JsonProperty("anytype_1") private Object anytype1; - @JsonProperty("anytype_2") private Object anytype2; - @JsonProperty("anytype_3") private Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { @@ -84,6 +73,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt * Get mapString * @return mapString */ + @JsonProperty("map_string") @ApiModelProperty(value = "") public Map getMapString() { @@ -111,6 +101,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * Get mapNumber * @return mapNumber */ + @JsonProperty("map_number") @Valid @ApiModelProperty(value = "") public Map getMapNumber() { @@ -138,6 +129,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege * Get mapInteger * @return mapInteger */ + @JsonProperty("map_integer") @ApiModelProperty(value = "") public Map getMapInteger() { @@ -165,6 +157,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea * Get mapBoolean * @return mapBoolean */ + @JsonProperty("map_boolean") @ApiModelProperty(value = "") public Map getMapBoolean() { @@ -192,6 +185,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { @@ -219,6 +213,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * Get mapArrayAnytype * @return mapArrayAnytype */ + @JsonProperty("map_array_anytype") @Valid @ApiModelProperty(value = "") public Map> getMapArrayAnytype() { @@ -246,6 +241,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { @@ -273,6 +269,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { @@ -292,6 +289,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) { * Get anytype1 * @return anytype1 */ + @JsonProperty("anytype_1") @ApiModelProperty(value = "") public Object getAnytype1() { @@ -311,6 +309,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) { * Get anytype2 * @return anytype2 */ + @JsonProperty("anytype_2") @ApiModelProperty(value = "") public Object getAnytype2() { @@ -330,6 +329,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) { * Get anytype3 * @return anytype3 */ + @JsonProperty("anytype_3") @ApiModelProperty(value = "") public Object getAnytype3() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 00b5174e93b7..ce8b8d62436c 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesInteger extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesInteger name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesInteger name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 8fec423ffb1b..dec791e0a273 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesNumber extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesNumber name(String name) { @@ -37,6 +36,7 @@ public AdditionalPropertiesNumber name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 67033332b0d6..546d0ab9216f 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesObject extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesObject name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesObject name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 993f83bb2cc1..c1f95cf62e81 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesString extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesString name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesString name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java index e11ae425d9e9..e880f829164c 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java @@ -39,10 +39,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Animal { - @JsonProperty("className") private String className; - @JsonProperty("color") private String color = "red"; public Animal className(String className) { @@ -54,6 +52,7 @@ public Animal className(String className) { * Get className * @return className */ + @JsonProperty("className") @NotNull @ApiModelProperty(required = true, value = "") public String getClassName() { @@ -73,6 +72,7 @@ public Animal color(String color) { * Get color * @return color */ + @JsonProperty("color") @ApiModelProperty(value = "") public String getColor() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index df67eda87fd1..46ab3b631960 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfArrayOfNumberOnly { - @JsonProperty("ArrayArrayNumber") @Valid private List> arrayArrayNumber = null; @@ -46,6 +45,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * Get arrayArrayNumber * @return arrayArrayNumber */ + @JsonProperty("ArrayArrayNumber") @Valid @ApiModelProperty(value = "") public List> getArrayArrayNumber() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 05f1ca376a68..cb5358905469 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfNumberOnly { - @JsonProperty("ArrayNumber") @Valid private List arrayNumber = null; @@ -46,6 +45,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ + @JsonProperty("ArrayNumber") @Valid @ApiModelProperty(value = "") public List getArrayNumber() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java index ba67885edc8a..55cc431ecde6 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java @@ -25,15 +25,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayTest { - @JsonProperty("array_of_string") @Valid private List arrayOfString = null; - @JsonProperty("array_array_of_integer") @Valid private List> arrayArrayOfInteger = null; - @JsonProperty("array_array_of_model") @Valid private List> arrayArrayOfModel = null; @@ -54,6 +51,7 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) { * Get arrayOfString * @return arrayOfString */ + @JsonProperty("array_of_string") @ApiModelProperty(value = "") public List getArrayOfString() { @@ -81,6 +79,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ + @JsonProperty("array_array_of_integer") @Valid @ApiModelProperty(value = "") public List> getArrayArrayOfInteger() { @@ -108,6 +107,7 @@ public ArrayTest addArrayArrayOfModelItem(List arrayArrayOfModelI * Get arrayArrayOfModel * @return arrayArrayOfModel */ + @JsonProperty("array_array_of_model") @Valid @ApiModelProperty(value = "") public List> getArrayArrayOfModel() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java index ec95c1253fad..70bbb0b93532 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java @@ -67,7 +67,6 @@ public static KindEnum fromValue(String value) { } } - @JsonProperty("kind") private KindEnum kind; public BigCat kind(KindEnum kind) { @@ -79,6 +78,7 @@ public BigCat kind(KindEnum kind) { * Get kind * @return kind */ + @JsonProperty("kind") @ApiModelProperty(value = "") public KindEnum getKind() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCatAllOf.java index 35ae937c0009..1a86665050e6 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCatAllOf.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCatAllOf.java @@ -64,7 +64,6 @@ public static KindEnum fromValue(String value) { } } - @JsonProperty("kind") private KindEnum kind; public BigCatAllOf kind(KindEnum kind) { @@ -76,6 +75,7 @@ public BigCatAllOf kind(KindEnum kind) { * Get kind * @return kind */ + @JsonProperty("kind") @ApiModelProperty(value = "") public KindEnum getKind() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Capitalization.java index e9cce9de0115..e0fdbe78bae2 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Capitalization.java @@ -22,22 +22,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Capitalization { - @JsonProperty("smallCamel") private String smallCamel; - @JsonProperty("CapitalCamel") private String capitalCamel; - @JsonProperty("small_Snake") private String smallSnake; - @JsonProperty("Capital_Snake") private String capitalSnake; - @JsonProperty("SCA_ETH_Flow_Points") private String scAETHFlowPoints; - @JsonProperty("ATT_NAME") private String ATT_NAME; public Capitalization smallCamel(String smallCamel) { @@ -49,6 +43,7 @@ public Capitalization smallCamel(String smallCamel) { * Get smallCamel * @return smallCamel */ + @JsonProperty("smallCamel") @ApiModelProperty(value = "") public String getSmallCamel() { @@ -68,6 +63,7 @@ public Capitalization capitalCamel(String capitalCamel) { * Get capitalCamel * @return capitalCamel */ + @JsonProperty("CapitalCamel") @ApiModelProperty(value = "") public String getCapitalCamel() { @@ -87,6 +83,7 @@ public Capitalization smallSnake(String smallSnake) { * Get smallSnake * @return smallSnake */ + @JsonProperty("small_Snake") @ApiModelProperty(value = "") public String getSmallSnake() { @@ -106,6 +103,7 @@ public Capitalization capitalSnake(String capitalSnake) { * Get capitalSnake * @return capitalSnake */ + @JsonProperty("Capital_Snake") @ApiModelProperty(value = "") public String getCapitalSnake() { @@ -125,6 +123,7 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) { * Get scAETHFlowPoints * @return scAETHFlowPoints */ + @JsonProperty("SCA_ETH_Flow_Points") @ApiModelProperty(value = "") public String getScAETHFlowPoints() { @@ -144,6 +143,7 @@ public Capitalization ATT_NAME(String ATT_NAME) { * Name of the pet * @return ATT_NAME */ + @JsonProperty("ATT_NAME") @ApiModelProperty(value = "Name of the pet ") public String getATTNAME() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java index 097ddbef7980..958fcb2298e0 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java @@ -36,7 +36,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Cat extends Animal { - @JsonProperty("declawed") private Boolean declawed; public Cat declawed(Boolean declawed) { @@ -48,6 +47,7 @@ public Cat declawed(Boolean declawed) { * Get declawed * @return declawed */ + @JsonProperty("declawed") @ApiModelProperty(value = "") public Boolean getDeclawed() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/CatAllOf.java index eed74bea751a..63de2ad8818e 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/CatAllOf.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/CatAllOf.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class CatAllOf { - @JsonProperty("declawed") private Boolean declawed; public CatAllOf declawed(Boolean declawed) { @@ -36,6 +35,7 @@ public CatAllOf declawed(Boolean declawed) { * Get declawed * @return declawed */ + @JsonProperty("declawed") @ApiModelProperty(value = "") public Boolean getDeclawed() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Category.java index 27a4a9f25665..b63268b2c8ce 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Category.java @@ -22,10 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name = "default-name"; public Category id(Long id) { @@ -37,6 +35,7 @@ public Category id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -56,6 +55,7 @@ public Category name(String name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @ApiModelProperty(required = true, value = "") public String getName() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ClassModel.java index 69296da7e60e..976f0b01d071 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ClassModel.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ClassModel { - @JsonProperty("_class") private String propertyClass; public ClassModel propertyClass(String propertyClass) { @@ -35,6 +34,7 @@ public ClassModel propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ + @JsonProperty("_class") @ApiModelProperty(value = "") public String getPropertyClass() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Client.java index b788daea14a3..a3c4731f3339 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Client.java @@ -22,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Client { - @JsonProperty("client") private String client; public Client client(String client) { @@ -34,6 +33,7 @@ public Client client(String client) { * Get client * @return client */ + @JsonProperty("client") @ApiModelProperty(value = "") public String getClient() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Dog.java index 9b61a2fa29b6..593562fabb42 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Dog.java @@ -27,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Dog extends Animal { - @JsonProperty("breed") private String breed; public Dog breed(String breed) { @@ -39,6 +38,7 @@ public Dog breed(String breed) { * Get breed * @return breed */ + @JsonProperty("breed") @ApiModelProperty(value = "") public String getBreed() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/DogAllOf.java index 4f275e535333..7ddb24717737 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/DogAllOf.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/DogAllOf.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class DogAllOf { - @JsonProperty("breed") private String breed; public DogAllOf breed(String breed) { @@ -36,6 +35,7 @@ public DogAllOf breed(String breed) { * Get breed * @return breed */ + @JsonProperty("breed") @ApiModelProperty(value = "") public String getBreed() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java index dba32cf2b710..04e850b1cf17 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java @@ -60,7 +60,6 @@ public static JustSymbolEnum fromValue(String value) { } } - @JsonProperty("just_symbol") private JustSymbolEnum justSymbol; /** @@ -98,7 +97,6 @@ public static ArrayEnumEnum fromValue(String value) { } } - @JsonProperty("array_enum") @Valid private List arrayEnum = null; @@ -111,6 +109,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) { * Get justSymbol * @return justSymbol */ + @JsonProperty("just_symbol") @ApiModelProperty(value = "") public JustSymbolEnum getJustSymbol() { @@ -138,6 +137,7 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) { * Get arrayEnum * @return arrayEnum */ + @JsonProperty("array_enum") @ApiModelProperty(value = "") public List getArrayEnum() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java index c20bc1460143..49747f67dccf 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java @@ -63,7 +63,6 @@ public static EnumStringEnum fromValue(String value) { } } - @JsonProperty("enum_string") private EnumStringEnum enumString; /** @@ -103,7 +102,6 @@ public static EnumStringRequiredEnum fromValue(String value) { } } - @JsonProperty("enum_string_required") private EnumStringRequiredEnum enumStringRequired; /** @@ -141,7 +139,6 @@ public static EnumIntegerEnum fromValue(Integer value) { } } - @JsonProperty("enum_integer") private EnumIntegerEnum enumInteger; /** @@ -179,10 +176,8 @@ public static EnumNumberEnum fromValue(Double value) { } } - @JsonProperty("enum_number") private EnumNumberEnum enumNumber; - @JsonProperty("outerEnum") private OuterEnum outerEnum; public EnumTest enumString(EnumStringEnum enumString) { @@ -194,6 +189,7 @@ public EnumTest enumString(EnumStringEnum enumString) { * Get enumString * @return enumString */ + @JsonProperty("enum_string") @ApiModelProperty(value = "") public EnumStringEnum getEnumString() { @@ -213,6 +209,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) { * Get enumStringRequired * @return enumStringRequired */ + @JsonProperty("enum_string_required") @NotNull @ApiModelProperty(required = true, value = "") public EnumStringRequiredEnum getEnumStringRequired() { @@ -232,6 +229,7 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) { * Get enumInteger * @return enumInteger */ + @JsonProperty("enum_integer") @ApiModelProperty(value = "") public EnumIntegerEnum getEnumInteger() { @@ -251,6 +249,7 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) { * Get enumNumber * @return enumNumber */ + @JsonProperty("enum_number") @ApiModelProperty(value = "") public EnumNumberEnum getEnumNumber() { @@ -270,6 +269,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) { * Get outerEnum * @return outerEnum */ + @JsonProperty("outerEnum") @Valid @ApiModelProperty(value = "") public OuterEnum getOuterEnum() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/File.java index d82e4902623d..43c44fd344bb 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/File.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/File.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class File { - @JsonProperty("sourceURI") private String sourceURI; public File sourceURI(String sourceURI) { @@ -35,6 +34,7 @@ public File sourceURI(String sourceURI) { * Test capitalization * @return sourceURI */ + @JsonProperty("sourceURI") @ApiModelProperty(value = "Test capitalization") public String getSourceURI() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 2ea153bd6468..d7815943b774 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -25,10 +25,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FileSchemaTestClass { - @JsonProperty("file") private File file; - @JsonProperty("files") @Valid private List files = null; @@ -41,6 +39,7 @@ public FileSchemaTestClass file(File file) { * Get file * @return file */ + @JsonProperty("file") @Valid @ApiModelProperty(value = "") public File getFile() { @@ -68,6 +67,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) { * Get files * @return files */ + @JsonProperty("files") @Valid @ApiModelProperty(value = "") public List getFiles() { 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 0e2aeaa78a22..ffd18f0ce221 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 @@ -30,48 +30,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FormatTest { - @JsonProperty("integer") private Integer integer; - @JsonProperty("int32") private Integer int32; - @JsonProperty("int64") private Long int64; - @JsonProperty("number") private BigDecimal number; - @JsonProperty("float") private Float _float; - @JsonProperty("double") private Double _double; - @JsonProperty("string") private String string; - @JsonProperty("byte") private byte[] _byte; - @JsonProperty("binary") private org.springframework.core.io.Resource binary; - @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("password") private String password; - @JsonProperty("BigDecimal") private BigDecimal bigDecimal; public FormatTest integer(Integer integer) { @@ -85,6 +71,7 @@ public FormatTest integer(Integer integer) { * maximum: 100 * @return integer */ + @JsonProperty("integer") @Min(10) @Max(100) @ApiModelProperty(value = "") public Integer getInteger() { @@ -106,6 +93,7 @@ public FormatTest int32(Integer int32) { * maximum: 200 * @return int32 */ + @JsonProperty("int32") @Min(20) @Max(200) @ApiModelProperty(value = "") public Integer getInt32() { @@ -125,6 +113,7 @@ public FormatTest int64(Long int64) { * Get int64 * @return int64 */ + @JsonProperty("int64") @ApiModelProperty(value = "") public Long getInt64() { @@ -146,6 +135,7 @@ public FormatTest number(BigDecimal number) { * maximum: 543.2 * @return number */ + @JsonProperty("number") @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") @ApiModelProperty(required = true, value = "") public BigDecimal getNumber() { @@ -167,6 +157,7 @@ public FormatTest _float(Float _float) { * maximum: 987.6 * @return _float */ + @JsonProperty("float") @DecimalMin("54.3") @DecimalMax("987.6") @ApiModelProperty(value = "") public Float getFloat() { @@ -188,6 +179,7 @@ public FormatTest _double(Double _double) { * maximum: 123.4 * @return _double */ + @JsonProperty("double") @DecimalMin("67.8") @DecimalMax("123.4") @ApiModelProperty(value = "") public Double getDouble() { @@ -207,6 +199,7 @@ public FormatTest string(String string) { * Get string * @return string */ + @JsonProperty("string") @Pattern(regexp = "/[a-z]/i") @ApiModelProperty(value = "") public String getString() { @@ -226,6 +219,7 @@ public FormatTest _byte(byte[] _byte) { * Get _byte * @return _byte */ + @JsonProperty("byte") @NotNull @ApiModelProperty(required = true, value = "") public byte[] getByte() { @@ -245,6 +239,7 @@ public FormatTest binary(org.springframework.core.io.Resource binary) { * Get binary * @return binary */ + @JsonProperty("binary") @Valid @ApiModelProperty(value = "") public org.springframework.core.io.Resource getBinary() { @@ -264,6 +259,7 @@ public FormatTest date(LocalDate date) { * Get date * @return date */ + @JsonProperty("date") @NotNull @Valid @ApiModelProperty(required = true, value = "") public LocalDate getDate() { @@ -283,6 +279,7 @@ public FormatTest dateTime(OffsetDateTime dateTime) { * Get dateTime * @return dateTime */ + @JsonProperty("dateTime") @Valid @ApiModelProperty(value = "") public OffsetDateTime getDateTime() { @@ -302,6 +299,7 @@ public FormatTest uuid(UUID uuid) { * Get uuid * @return uuid */ + @JsonProperty("uuid") @Valid @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") public UUID getUuid() { @@ -321,6 +319,7 @@ public FormatTest password(String password) { * Get password * @return password */ + @JsonProperty("password") @NotNull @Size(min = 10, max = 64) @ApiModelProperty(required = true, value = "") public String getPassword() { @@ -340,6 +339,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) { * Get bigDecimal * @return bigDecimal */ + @JsonProperty("BigDecimal") @Valid @ApiModelProperty(value = "") public BigDecimal getBigDecimal() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index 224b16d1a2d3..948ed9a0731d 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -24,10 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class HasOnlyReadOnly { - @JsonProperty("bar") private String bar; - @JsonProperty("foo") private String foo; public HasOnlyReadOnly bar(String bar) { @@ -39,6 +37,7 @@ public HasOnlyReadOnly bar(String bar) { * Get bar * @return bar */ + @JsonProperty("bar") @ApiModelProperty(readOnly = true, value = "") public String getBar() { @@ -58,6 +57,7 @@ public HasOnlyReadOnly foo(String foo) { * Get foo * @return foo */ + @JsonProperty("foo") @ApiModelProperty(readOnly = true, value = "") public String getFoo() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java index f2867ac50403..94d4ae9a9d56 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MapTest { - @JsonProperty("map_map_of_string") @Valid private Map> mapMapOfString = null; @@ -64,15 +63,12 @@ public static InnerEnum fromValue(String value) { } } - @JsonProperty("map_of_enum_string") @Valid private Map mapOfEnumString = null; - @JsonProperty("direct_map") @Valid private Map directMap = null; - @JsonProperty("indirect_map") @Valid private Map indirectMap = null; @@ -93,6 +89,7 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapMapOfString * @return mapMapOfString */ + @JsonProperty("map_map_of_string") @Valid @ApiModelProperty(value = "") public Map> getMapMapOfString() { @@ -120,6 +117,7 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) * Get mapOfEnumString * @return mapOfEnumString */ + @JsonProperty("map_of_enum_string") @ApiModelProperty(value = "") public Map getMapOfEnumString() { @@ -147,6 +145,7 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) { * Get directMap * @return directMap */ + @JsonProperty("direct_map") @ApiModelProperty(value = "") public Map getDirectMap() { @@ -174,6 +173,7 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) { * Get indirectMap * @return indirectMap */ + @JsonProperty("indirect_map") @ApiModelProperty(value = "") public Map getIndirectMap() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 901c65b2924d..89a2475d82fb 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -28,14 +28,11 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("map") @Valid private Map map = null; @@ -48,6 +45,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { * Get uuid * @return uuid */ + @JsonProperty("uuid") @Valid @ApiModelProperty(value = "") public UUID getUuid() { @@ -67,6 +65,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT * Get dateTime * @return dateTime */ + @JsonProperty("dateTime") @Valid @ApiModelProperty(value = "") public OffsetDateTime getDateTime() { @@ -94,6 +93,7 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * Get map * @return map */ + @JsonProperty("map") @Valid @ApiModelProperty(value = "") public Map getMap() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Model200Response.java index 36dfd34883e8..220b6493f31a 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Model200Response.java @@ -25,10 +25,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Model200Response { - @JsonProperty("name") private Integer name; - @JsonProperty("class") private String propertyClass; public Model200Response name(Integer name) { @@ -40,6 +38,7 @@ public Model200Response name(Integer name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public Integer getName() { @@ -59,6 +58,7 @@ public Model200Response propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ + @JsonProperty("class") @ApiModelProperty(value = "") public String getPropertyClass() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelApiResponse.java index dfba6cb672d4..29f3f43cf20e 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -24,13 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -42,6 +39,7 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ + @JsonProperty("code") @ApiModelProperty(value = "") public Integer getCode() { @@ -61,6 +59,7 @@ public ModelApiResponse type(String type) { * Get type * @return type */ + @JsonProperty("type") @ApiModelProperty(value = "") public String getType() { @@ -80,6 +79,7 @@ public ModelApiResponse message(String message) { * Get message * @return message */ + @JsonProperty("message") @ApiModelProperty(value = "") public String getMessage() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelList.java index 97ddf5359aa0..a374fe83d52a 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelList.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelList { - @JsonProperty("123-list") private String _123list; public ModelList _123list(String _123list) { @@ -36,6 +35,7 @@ public ModelList _123list(String _123list) { * Get _123list * @return _123list */ + @JsonProperty("123-list") @ApiModelProperty(value = "") public String get123list() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelReturn.java index 4505ddfeeeca..d8fc618d9dfb 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelReturn.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelReturn { - @JsonProperty("return") private Integer _return; public ModelReturn _return(Integer _return) { @@ -37,6 +36,7 @@ public ModelReturn _return(Integer _return) { * Get _return * @return _return */ + @JsonProperty("return") @ApiModelProperty(value = "") public Integer getReturn() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Name.java index 51cc37bbeea7..054901b488d6 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Name.java @@ -23,16 +23,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Name { - @JsonProperty("name") private Integer name; - @JsonProperty("snake_case") private Integer snakeCase; - @JsonProperty("property") private String property; - @JsonProperty("123Number") private Integer _123number; public Name name(Integer name) { @@ -44,6 +40,7 @@ public Name name(Integer name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @ApiModelProperty(required = true, value = "") public Integer getName() { @@ -63,6 +60,7 @@ public Name snakeCase(Integer snakeCase) { * Get snakeCase * @return snakeCase */ + @JsonProperty("snake_case") @ApiModelProperty(readOnly = true, value = "") public Integer getSnakeCase() { @@ -82,6 +80,7 @@ public Name property(String property) { * Get property * @return property */ + @JsonProperty("property") @ApiModelProperty(value = "") public String getProperty() { @@ -101,6 +100,7 @@ public Name _123number(Integer _123number) { * Get _123number * @return _123number */ + @JsonProperty("123Number") @ApiModelProperty(readOnly = true, value = "") public Integer get123number() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NumberOnly.java index 278146bfb899..8f2f2b19b191 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NumberOnly.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class NumberOnly { - @JsonProperty("JustNumber") private BigDecimal justNumber; public NumberOnly justNumber(BigDecimal justNumber) { @@ -35,6 +34,7 @@ public NumberOnly justNumber(BigDecimal justNumber) { * Get justNumber * @return justNumber */ + @JsonProperty("JustNumber") @Valid @ApiModelProperty(value = "") public BigDecimal getJustNumber() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Order.java index 9a9ed4f6c960..feac4d2cad8d 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Order.java @@ -25,16 +25,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -75,10 +71,8 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -90,6 +84,7 @@ public Order id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -109,6 +104,7 @@ public Order petId(Long petId) { * Get petId * @return petId */ + @JsonProperty("petId") @ApiModelProperty(value = "") public Long getPetId() { @@ -128,6 +124,7 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ + @JsonProperty("quantity") @ApiModelProperty(value = "") public Integer getQuantity() { @@ -147,6 +144,7 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ + @JsonProperty("shipDate") @Valid @ApiModelProperty(value = "") public OffsetDateTime getShipDate() { @@ -166,6 +164,7 @@ public Order status(StatusEnum status) { * Order Status * @return status */ + @JsonProperty("status") @ApiModelProperty(value = "Order Status") public StatusEnum getStatus() { @@ -185,6 +184,7 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ + @JsonProperty("complete") @ApiModelProperty(value = "") public Boolean getComplete() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/OuterComposite.java index c1a709bb26ad..00cce99097d7 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/OuterComposite.java @@ -23,13 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class OuterComposite { - @JsonProperty("my_number") private BigDecimal myNumber; - @JsonProperty("my_string") private String myString; - @JsonProperty("my_boolean") private Boolean myBoolean; public OuterComposite myNumber(BigDecimal myNumber) { @@ -41,6 +38,7 @@ public OuterComposite myNumber(BigDecimal myNumber) { * Get myNumber * @return myNumber */ + @JsonProperty("my_number") @Valid @ApiModelProperty(value = "") public BigDecimal getMyNumber() { @@ -60,6 +58,7 @@ public OuterComposite myString(String myString) { * Get myString * @return myString */ + @JsonProperty("my_string") @ApiModelProperty(value = "") public String getMyString() { @@ -79,6 +78,7 @@ public OuterComposite myBoolean(Boolean myBoolean) { * Get myBoolean * @return myBoolean */ + @JsonProperty("my_boolean") @ApiModelProperty(value = "") public Boolean getMyBoolean() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java index 4d705acedcd2..e39c22373324 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java @@ -30,20 +30,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private Set photoUrls = new LinkedHashSet<>(); - @JsonProperty("tags") @Valid private List tags = null; @@ -84,7 +79,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; public Pet id(Long id) { @@ -96,6 +90,7 @@ public Pet id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -115,6 +110,7 @@ public Pet category(Category category) { * Get category * @return category */ + @JsonProperty("category") @Valid @ApiModelProperty(value = "") public Category getCategory() { @@ -134,6 +130,7 @@ public Pet name(String name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") public String getName() { @@ -158,6 +155,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ + @JsonProperty("photoUrls") @NotNull @ApiModelProperty(required = true, value = "") public Set getPhotoUrls() { @@ -186,6 +184,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ + @JsonProperty("tags") @Valid @ApiModelProperty(value = "") public List getTags() { @@ -205,6 +204,7 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ + @JsonProperty("status") @ApiModelProperty(value = "pet status in the store") public StatusEnum getStatus() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java index b7a0a416782e..d02b8c8cfd53 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -22,10 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ReadOnlyFirst { - @JsonProperty("bar") private String bar; - @JsonProperty("baz") private String baz; public ReadOnlyFirst bar(String bar) { @@ -37,6 +35,7 @@ public ReadOnlyFirst bar(String bar) { * Get bar * @return bar */ + @JsonProperty("bar") @ApiModelProperty(readOnly = true, value = "") public String getBar() { @@ -56,6 +55,7 @@ public ReadOnlyFirst baz(String baz) { * Get baz * @return baz */ + @JsonProperty("baz") @ApiModelProperty(value = "") public String getBaz() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java index f321ab78cd56..8f176362e027 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class SpecialModelName { - @JsonProperty("$special[property.name]") private Long $specialPropertyName; public SpecialModelName $specialPropertyName(Long $specialPropertyName) { @@ -36,6 +35,7 @@ public class SpecialModelName { * Get $specialPropertyName * @return $specialPropertyName */ + @JsonProperty("$special[property.name]") @ApiModelProperty(value = "") public Long get$SpecialPropertyName() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Tag.java index 6161be4a9229..f7797bef2f19 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Tag.java @@ -22,10 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -37,6 +35,7 @@ public Tag id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -56,6 +55,7 @@ public Tag name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java index f10cff73bb78..506efbf431c1 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -25,19 +25,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderDefault { - @JsonProperty("string_item") private String stringItem = "what"; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem = true; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -50,6 +45,7 @@ public TypeHolderDefault stringItem(String stringItem) { * Get stringItem * @return stringItem */ + @JsonProperty("string_item") @NotNull @ApiModelProperty(required = true, value = "") public String getStringItem() { @@ -69,6 +65,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ + @JsonProperty("number_item") @NotNull @Valid @ApiModelProperty(required = true, value = "") public BigDecimal getNumberItem() { @@ -88,6 +85,7 @@ public TypeHolderDefault integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ + @JsonProperty("integer_item") @NotNull @ApiModelProperty(required = true, value = "") public Integer getIntegerItem() { @@ -107,6 +105,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ + @JsonProperty("bool_item") @NotNull @ApiModelProperty(required = true, value = "") public Boolean getBoolItem() { @@ -131,6 +130,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ + @JsonProperty("array_item") @NotNull @ApiModelProperty(required = true, value = "") public List getArrayItem() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java index d2ae69a4e5a8..806c0c90fa18 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -25,22 +25,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderExample { - @JsonProperty("string_item") private String stringItem; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("float_item") private Float floatItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -53,6 +47,7 @@ public TypeHolderExample stringItem(String stringItem) { * Get stringItem * @return stringItem */ + @JsonProperty("string_item") @NotNull @ApiModelProperty(example = "what", required = true, value = "") public String getStringItem() { @@ -72,6 +67,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ + @JsonProperty("number_item") @NotNull @Valid @ApiModelProperty(example = "1.234", required = true, value = "") public BigDecimal getNumberItem() { @@ -91,6 +87,7 @@ public TypeHolderExample floatItem(Float floatItem) { * Get floatItem * @return floatItem */ + @JsonProperty("float_item") @NotNull @ApiModelProperty(example = "1.234", required = true, value = "") public Float getFloatItem() { @@ -110,6 +107,7 @@ public TypeHolderExample integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ + @JsonProperty("integer_item") @NotNull @ApiModelProperty(example = "-2", required = true, value = "") public Integer getIntegerItem() { @@ -129,6 +127,7 @@ public TypeHolderExample boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ + @JsonProperty("bool_item") @NotNull @ApiModelProperty(example = "true", required = true, value = "") public Boolean getBoolItem() { @@ -153,6 +152,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ + @JsonProperty("array_item") @NotNull @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "") public List getArrayItem() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/User.java index ec85459bc99a..f42832389ffe 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/User.java @@ -22,28 +22,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -55,6 +47,7 @@ public User id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -74,6 +67,7 @@ public User username(String username) { * Get username * @return username */ + @JsonProperty("username") @ApiModelProperty(value = "") public String getUsername() { @@ -93,6 +87,7 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ + @JsonProperty("firstName") @ApiModelProperty(value = "") public String getFirstName() { @@ -112,6 +107,7 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ + @JsonProperty("lastName") @ApiModelProperty(value = "") public String getLastName() { @@ -131,6 +127,7 @@ public User email(String email) { * Get email * @return email */ + @JsonProperty("email") @ApiModelProperty(value = "") public String getEmail() { @@ -150,6 +147,7 @@ public User password(String password) { * Get password * @return password */ + @JsonProperty("password") @ApiModelProperty(value = "") public String getPassword() { @@ -169,6 +167,7 @@ public User phone(String phone) { * Get phone * @return phone */ + @JsonProperty("phone") @ApiModelProperty(value = "") public String getPhone() { @@ -188,6 +187,7 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ + @JsonProperty("userStatus") @ApiModelProperty(value = "User Status") public Integer getUserStatus() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java index 27d5f8282818..c795b4b85e6d 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java @@ -25,99 +25,70 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class XmlItem { - @JsonProperty("attribute_string") private String attributeString; - @JsonProperty("attribute_number") private BigDecimal attributeNumber; - @JsonProperty("attribute_integer") private Integer attributeInteger; - @JsonProperty("attribute_boolean") private Boolean attributeBoolean; - @JsonProperty("wrapped_array") @Valid private List wrappedArray = null; - @JsonProperty("name_string") private String nameString; - @JsonProperty("name_number") private BigDecimal nameNumber; - @JsonProperty("name_integer") private Integer nameInteger; - @JsonProperty("name_boolean") private Boolean nameBoolean; - @JsonProperty("name_array") @Valid private List nameArray = null; - @JsonProperty("name_wrapped_array") @Valid private List nameWrappedArray = null; - @JsonProperty("prefix_string") private String prefixString; - @JsonProperty("prefix_number") private BigDecimal prefixNumber; - @JsonProperty("prefix_integer") private Integer prefixInteger; - @JsonProperty("prefix_boolean") private Boolean prefixBoolean; - @JsonProperty("prefix_array") @Valid private List prefixArray = null; - @JsonProperty("prefix_wrapped_array") @Valid private List prefixWrappedArray = null; - @JsonProperty("namespace_string") private String namespaceString; - @JsonProperty("namespace_number") private BigDecimal namespaceNumber; - @JsonProperty("namespace_integer") private Integer namespaceInteger; - @JsonProperty("namespace_boolean") private Boolean namespaceBoolean; - @JsonProperty("namespace_array") @Valid private List namespaceArray = null; - @JsonProperty("namespace_wrapped_array") @Valid private List namespaceWrappedArray = null; - @JsonProperty("prefix_ns_string") private String prefixNsString; - @JsonProperty("prefix_ns_number") private BigDecimal prefixNsNumber; - @JsonProperty("prefix_ns_integer") private Integer prefixNsInteger; - @JsonProperty("prefix_ns_boolean") private Boolean prefixNsBoolean; - @JsonProperty("prefix_ns_array") @Valid private List prefixNsArray = null; - @JsonProperty("prefix_ns_wrapped_array") @Valid private List prefixNsWrappedArray = null; @@ -130,6 +101,7 @@ public XmlItem attributeString(String attributeString) { * Get attributeString * @return attributeString */ + @JsonProperty("attribute_string") @ApiModelProperty(example = "string", value = "") public String getAttributeString() { @@ -149,6 +121,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) { * Get attributeNumber * @return attributeNumber */ + @JsonProperty("attribute_number") @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getAttributeNumber() { @@ -168,6 +141,7 @@ public XmlItem attributeInteger(Integer attributeInteger) { * Get attributeInteger * @return attributeInteger */ + @JsonProperty("attribute_integer") @ApiModelProperty(example = "-2", value = "") public Integer getAttributeInteger() { @@ -187,6 +161,7 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) { * Get attributeBoolean * @return attributeBoolean */ + @JsonProperty("attribute_boolean") @ApiModelProperty(example = "true", value = "") public Boolean getAttributeBoolean() { @@ -214,6 +189,7 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) { * Get wrappedArray * @return wrappedArray */ + @JsonProperty("wrapped_array") @ApiModelProperty(value = "") public List getWrappedArray() { @@ -233,6 +209,7 @@ public XmlItem nameString(String nameString) { * Get nameString * @return nameString */ + @JsonProperty("name_string") @ApiModelProperty(example = "string", value = "") public String getNameString() { @@ -252,6 +229,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) { * Get nameNumber * @return nameNumber */ + @JsonProperty("name_number") @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getNameNumber() { @@ -271,6 +249,7 @@ public XmlItem nameInteger(Integer nameInteger) { * Get nameInteger * @return nameInteger */ + @JsonProperty("name_integer") @ApiModelProperty(example = "-2", value = "") public Integer getNameInteger() { @@ -290,6 +269,7 @@ public XmlItem nameBoolean(Boolean nameBoolean) { * Get nameBoolean * @return nameBoolean */ + @JsonProperty("name_boolean") @ApiModelProperty(example = "true", value = "") public Boolean getNameBoolean() { @@ -317,6 +297,7 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) { * Get nameArray * @return nameArray */ + @JsonProperty("name_array") @ApiModelProperty(value = "") public List getNameArray() { @@ -344,6 +325,7 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) { * Get nameWrappedArray * @return nameWrappedArray */ + @JsonProperty("name_wrapped_array") @ApiModelProperty(value = "") public List getNameWrappedArray() { @@ -363,6 +345,7 @@ public XmlItem prefixString(String prefixString) { * Get prefixString * @return prefixString */ + @JsonProperty("prefix_string") @ApiModelProperty(example = "string", value = "") public String getPrefixString() { @@ -382,6 +365,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) { * Get prefixNumber * @return prefixNumber */ + @JsonProperty("prefix_number") @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getPrefixNumber() { @@ -401,6 +385,7 @@ public XmlItem prefixInteger(Integer prefixInteger) { * Get prefixInteger * @return prefixInteger */ + @JsonProperty("prefix_integer") @ApiModelProperty(example = "-2", value = "") public Integer getPrefixInteger() { @@ -420,6 +405,7 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) { * Get prefixBoolean * @return prefixBoolean */ + @JsonProperty("prefix_boolean") @ApiModelProperty(example = "true", value = "") public Boolean getPrefixBoolean() { @@ -447,6 +433,7 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) { * Get prefixArray * @return prefixArray */ + @JsonProperty("prefix_array") @ApiModelProperty(value = "") public List getPrefixArray() { @@ -474,6 +461,7 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) { * Get prefixWrappedArray * @return prefixWrappedArray */ + @JsonProperty("prefix_wrapped_array") @ApiModelProperty(value = "") public List getPrefixWrappedArray() { @@ -493,6 +481,7 @@ public XmlItem namespaceString(String namespaceString) { * Get namespaceString * @return namespaceString */ + @JsonProperty("namespace_string") @ApiModelProperty(example = "string", value = "") public String getNamespaceString() { @@ -512,6 +501,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) { * Get namespaceNumber * @return namespaceNumber */ + @JsonProperty("namespace_number") @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getNamespaceNumber() { @@ -531,6 +521,7 @@ public XmlItem namespaceInteger(Integer namespaceInteger) { * Get namespaceInteger * @return namespaceInteger */ + @JsonProperty("namespace_integer") @ApiModelProperty(example = "-2", value = "") public Integer getNamespaceInteger() { @@ -550,6 +541,7 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) { * Get namespaceBoolean * @return namespaceBoolean */ + @JsonProperty("namespace_boolean") @ApiModelProperty(example = "true", value = "") public Boolean getNamespaceBoolean() { @@ -577,6 +569,7 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) { * Get namespaceArray * @return namespaceArray */ + @JsonProperty("namespace_array") @ApiModelProperty(value = "") public List getNamespaceArray() { @@ -604,6 +597,7 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) { * Get namespaceWrappedArray * @return namespaceWrappedArray */ + @JsonProperty("namespace_wrapped_array") @ApiModelProperty(value = "") public List getNamespaceWrappedArray() { @@ -623,6 +617,7 @@ public XmlItem prefixNsString(String prefixNsString) { * Get prefixNsString * @return prefixNsString */ + @JsonProperty("prefix_ns_string") @ApiModelProperty(example = "string", value = "") public String getPrefixNsString() { @@ -642,6 +637,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) { * Get prefixNsNumber * @return prefixNsNumber */ + @JsonProperty("prefix_ns_number") @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getPrefixNsNumber() { @@ -661,6 +657,7 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) { * Get prefixNsInteger * @return prefixNsInteger */ + @JsonProperty("prefix_ns_integer") @ApiModelProperty(example = "-2", value = "") public Integer getPrefixNsInteger() { @@ -680,6 +677,7 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) { * Get prefixNsBoolean * @return prefixNsBoolean */ + @JsonProperty("prefix_ns_boolean") @ApiModelProperty(example = "true", value = "") public Boolean getPrefixNsBoolean() { @@ -707,6 +705,7 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) { * Get prefixNsArray * @return prefixNsArray */ + @JsonProperty("prefix_ns_array") @ApiModelProperty(value = "") public List getPrefixNsArray() { @@ -734,6 +733,7 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) { * Get prefixNsWrappedArray * @return prefixNsWrappedArray */ + @JsonProperty("prefix_ns_wrapped_array") @ApiModelProperty(value = "") public List getPrefixNsWrappedArray() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 8e4c17989762..cb51920a8c28 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesAnyType extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesAnyType name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesAnyType name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 27a8f01607f1..1c66a636116f 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesArray extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesArray name(String name) { @@ -37,6 +36,7 @@ public AdditionalPropertiesArray name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index bc7b87d760a9..1dcc607639bf 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesBoolean extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesBoolean name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesBoolean name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index b5e88d5d7ccb..74250eb564ad 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -26,45 +26,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesClass { - @JsonProperty("map_string") @Valid private Map mapString = null; - @JsonProperty("map_number") @Valid private Map mapNumber = null; - @JsonProperty("map_integer") @Valid private Map mapInteger = null; - @JsonProperty("map_boolean") @Valid private Map mapBoolean = null; - @JsonProperty("map_array_integer") @Valid private Map> mapArrayInteger = null; - @JsonProperty("map_array_anytype") @Valid private Map> mapArrayAnytype = null; - @JsonProperty("map_map_string") @Valid private Map> mapMapString = null; - @JsonProperty("map_map_anytype") @Valid private Map> mapMapAnytype = null; - @JsonProperty("anytype_1") private Object anytype1; - @JsonProperty("anytype_2") private Object anytype2; - @JsonProperty("anytype_3") private Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { @@ -84,6 +73,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt * Get mapString * @return mapString */ + @JsonProperty("map_string") @ApiModelProperty(value = "") public Map getMapString() { @@ -111,6 +101,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * Get mapNumber * @return mapNumber */ + @JsonProperty("map_number") @Valid @ApiModelProperty(value = "") public Map getMapNumber() { @@ -138,6 +129,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege * Get mapInteger * @return mapInteger */ + @JsonProperty("map_integer") @ApiModelProperty(value = "") public Map getMapInteger() { @@ -165,6 +157,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea * Get mapBoolean * @return mapBoolean */ + @JsonProperty("map_boolean") @ApiModelProperty(value = "") public Map getMapBoolean() { @@ -192,6 +185,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { @@ -219,6 +213,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * Get mapArrayAnytype * @return mapArrayAnytype */ + @JsonProperty("map_array_anytype") @Valid @ApiModelProperty(value = "") public Map> getMapArrayAnytype() { @@ -246,6 +241,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { @@ -273,6 +269,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { @@ -292,6 +289,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) { * Get anytype1 * @return anytype1 */ + @JsonProperty("anytype_1") @ApiModelProperty(value = "") public Object getAnytype1() { @@ -311,6 +309,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) { * Get anytype2 * @return anytype2 */ + @JsonProperty("anytype_2") @ApiModelProperty(value = "") public Object getAnytype2() { @@ -330,6 +329,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) { * Get anytype3 * @return anytype3 */ + @JsonProperty("anytype_3") @ApiModelProperty(value = "") public Object getAnytype3() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 00b5174e93b7..ce8b8d62436c 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesInteger extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesInteger name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesInteger name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 8fec423ffb1b..dec791e0a273 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesNumber extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesNumber name(String name) { @@ -37,6 +36,7 @@ public AdditionalPropertiesNumber name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 67033332b0d6..546d0ab9216f 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesObject extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesObject name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesObject name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 993f83bb2cc1..c1f95cf62e81 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesString extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesString name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesString name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Animal.java index e11ae425d9e9..e880f829164c 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Animal.java @@ -39,10 +39,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Animal { - @JsonProperty("className") private String className; - @JsonProperty("color") private String color = "red"; public Animal className(String className) { @@ -54,6 +52,7 @@ public Animal className(String className) { * Get className * @return className */ + @JsonProperty("className") @NotNull @ApiModelProperty(required = true, value = "") public String getClassName() { @@ -73,6 +72,7 @@ public Animal color(String color) { * Get color * @return color */ + @JsonProperty("color") @ApiModelProperty(value = "") public String getColor() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index df67eda87fd1..46ab3b631960 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfArrayOfNumberOnly { - @JsonProperty("ArrayArrayNumber") @Valid private List> arrayArrayNumber = null; @@ -46,6 +45,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * Get arrayArrayNumber * @return arrayArrayNumber */ + @JsonProperty("ArrayArrayNumber") @Valid @ApiModelProperty(value = "") public List> getArrayArrayNumber() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 05f1ca376a68..cb5358905469 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfNumberOnly { - @JsonProperty("ArrayNumber") @Valid private List arrayNumber = null; @@ -46,6 +45,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ + @JsonProperty("ArrayNumber") @Valid @ApiModelProperty(value = "") public List getArrayNumber() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayTest.java index ba67885edc8a..55cc431ecde6 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayTest.java @@ -25,15 +25,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayTest { - @JsonProperty("array_of_string") @Valid private List arrayOfString = null; - @JsonProperty("array_array_of_integer") @Valid private List> arrayArrayOfInteger = null; - @JsonProperty("array_array_of_model") @Valid private List> arrayArrayOfModel = null; @@ -54,6 +51,7 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) { * Get arrayOfString * @return arrayOfString */ + @JsonProperty("array_of_string") @ApiModelProperty(value = "") public List getArrayOfString() { @@ -81,6 +79,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ + @JsonProperty("array_array_of_integer") @Valid @ApiModelProperty(value = "") public List> getArrayArrayOfInteger() { @@ -108,6 +107,7 @@ public ArrayTest addArrayArrayOfModelItem(List arrayArrayOfModelI * Get arrayArrayOfModel * @return arrayArrayOfModel */ + @JsonProperty("array_array_of_model") @Valid @ApiModelProperty(value = "") public List> getArrayArrayOfModel() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCat.java index ec95c1253fad..70bbb0b93532 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCat.java @@ -67,7 +67,6 @@ public static KindEnum fromValue(String value) { } } - @JsonProperty("kind") private KindEnum kind; public BigCat kind(KindEnum kind) { @@ -79,6 +78,7 @@ public BigCat kind(KindEnum kind) { * Get kind * @return kind */ + @JsonProperty("kind") @ApiModelProperty(value = "") public KindEnum getKind() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCatAllOf.java index 35ae937c0009..1a86665050e6 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCatAllOf.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCatAllOf.java @@ -64,7 +64,6 @@ public static KindEnum fromValue(String value) { } } - @JsonProperty("kind") private KindEnum kind; public BigCatAllOf kind(KindEnum kind) { @@ -76,6 +75,7 @@ public BigCatAllOf kind(KindEnum kind) { * Get kind * @return kind */ + @JsonProperty("kind") @ApiModelProperty(value = "") public KindEnum getKind() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Capitalization.java index e9cce9de0115..e0fdbe78bae2 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Capitalization.java @@ -22,22 +22,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Capitalization { - @JsonProperty("smallCamel") private String smallCamel; - @JsonProperty("CapitalCamel") private String capitalCamel; - @JsonProperty("small_Snake") private String smallSnake; - @JsonProperty("Capital_Snake") private String capitalSnake; - @JsonProperty("SCA_ETH_Flow_Points") private String scAETHFlowPoints; - @JsonProperty("ATT_NAME") private String ATT_NAME; public Capitalization smallCamel(String smallCamel) { @@ -49,6 +43,7 @@ public Capitalization smallCamel(String smallCamel) { * Get smallCamel * @return smallCamel */ + @JsonProperty("smallCamel") @ApiModelProperty(value = "") public String getSmallCamel() { @@ -68,6 +63,7 @@ public Capitalization capitalCamel(String capitalCamel) { * Get capitalCamel * @return capitalCamel */ + @JsonProperty("CapitalCamel") @ApiModelProperty(value = "") public String getCapitalCamel() { @@ -87,6 +83,7 @@ public Capitalization smallSnake(String smallSnake) { * Get smallSnake * @return smallSnake */ + @JsonProperty("small_Snake") @ApiModelProperty(value = "") public String getSmallSnake() { @@ -106,6 +103,7 @@ public Capitalization capitalSnake(String capitalSnake) { * Get capitalSnake * @return capitalSnake */ + @JsonProperty("Capital_Snake") @ApiModelProperty(value = "") public String getCapitalSnake() { @@ -125,6 +123,7 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) { * Get scAETHFlowPoints * @return scAETHFlowPoints */ + @JsonProperty("SCA_ETH_Flow_Points") @ApiModelProperty(value = "") public String getScAETHFlowPoints() { @@ -144,6 +143,7 @@ public Capitalization ATT_NAME(String ATT_NAME) { * Name of the pet * @return ATT_NAME */ + @JsonProperty("ATT_NAME") @ApiModelProperty(value = "Name of the pet ") public String getATTNAME() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Cat.java index 097ddbef7980..958fcb2298e0 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Cat.java @@ -36,7 +36,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Cat extends Animal { - @JsonProperty("declawed") private Boolean declawed; public Cat declawed(Boolean declawed) { @@ -48,6 +47,7 @@ public Cat declawed(Boolean declawed) { * Get declawed * @return declawed */ + @JsonProperty("declawed") @ApiModelProperty(value = "") public Boolean getDeclawed() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/CatAllOf.java index eed74bea751a..63de2ad8818e 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/CatAllOf.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/CatAllOf.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class CatAllOf { - @JsonProperty("declawed") private Boolean declawed; public CatAllOf declawed(Boolean declawed) { @@ -36,6 +35,7 @@ public CatAllOf declawed(Boolean declawed) { * Get declawed * @return declawed */ + @JsonProperty("declawed") @ApiModelProperty(value = "") public Boolean getDeclawed() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Category.java index 27a4a9f25665..b63268b2c8ce 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Category.java @@ -22,10 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name = "default-name"; public Category id(Long id) { @@ -37,6 +35,7 @@ public Category id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -56,6 +55,7 @@ public Category name(String name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @ApiModelProperty(required = true, value = "") public String getName() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ClassModel.java index 69296da7e60e..976f0b01d071 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ClassModel.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ClassModel { - @JsonProperty("_class") private String propertyClass; public ClassModel propertyClass(String propertyClass) { @@ -35,6 +34,7 @@ public ClassModel propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ + @JsonProperty("_class") @ApiModelProperty(value = "") public String getPropertyClass() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Client.java index b788daea14a3..a3c4731f3339 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Client.java @@ -22,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Client { - @JsonProperty("client") private String client; public Client client(String client) { @@ -34,6 +33,7 @@ public Client client(String client) { * Get client * @return client */ + @JsonProperty("client") @ApiModelProperty(value = "") public String getClient() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Dog.java index 9b61a2fa29b6..593562fabb42 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Dog.java @@ -27,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Dog extends Animal { - @JsonProperty("breed") private String breed; public Dog breed(String breed) { @@ -39,6 +38,7 @@ public Dog breed(String breed) { * Get breed * @return breed */ + @JsonProperty("breed") @ApiModelProperty(value = "") public String getBreed() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/DogAllOf.java index 4f275e535333..7ddb24717737 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/DogAllOf.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/DogAllOf.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class DogAllOf { - @JsonProperty("breed") private String breed; public DogAllOf breed(String breed) { @@ -36,6 +35,7 @@ public DogAllOf breed(String breed) { * Get breed * @return breed */ + @JsonProperty("breed") @ApiModelProperty(value = "") public String getBreed() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumArrays.java index dba32cf2b710..04e850b1cf17 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumArrays.java @@ -60,7 +60,6 @@ public static JustSymbolEnum fromValue(String value) { } } - @JsonProperty("just_symbol") private JustSymbolEnum justSymbol; /** @@ -98,7 +97,6 @@ public static ArrayEnumEnum fromValue(String value) { } } - @JsonProperty("array_enum") @Valid private List arrayEnum = null; @@ -111,6 +109,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) { * Get justSymbol * @return justSymbol */ + @JsonProperty("just_symbol") @ApiModelProperty(value = "") public JustSymbolEnum getJustSymbol() { @@ -138,6 +137,7 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) { * Get arrayEnum * @return arrayEnum */ + @JsonProperty("array_enum") @ApiModelProperty(value = "") public List getArrayEnum() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumTest.java index c20bc1460143..49747f67dccf 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumTest.java @@ -63,7 +63,6 @@ public static EnumStringEnum fromValue(String value) { } } - @JsonProperty("enum_string") private EnumStringEnum enumString; /** @@ -103,7 +102,6 @@ public static EnumStringRequiredEnum fromValue(String value) { } } - @JsonProperty("enum_string_required") private EnumStringRequiredEnum enumStringRequired; /** @@ -141,7 +139,6 @@ public static EnumIntegerEnum fromValue(Integer value) { } } - @JsonProperty("enum_integer") private EnumIntegerEnum enumInteger; /** @@ -179,10 +176,8 @@ public static EnumNumberEnum fromValue(Double value) { } } - @JsonProperty("enum_number") private EnumNumberEnum enumNumber; - @JsonProperty("outerEnum") private OuterEnum outerEnum; public EnumTest enumString(EnumStringEnum enumString) { @@ -194,6 +189,7 @@ public EnumTest enumString(EnumStringEnum enumString) { * Get enumString * @return enumString */ + @JsonProperty("enum_string") @ApiModelProperty(value = "") public EnumStringEnum getEnumString() { @@ -213,6 +209,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) { * Get enumStringRequired * @return enumStringRequired */ + @JsonProperty("enum_string_required") @NotNull @ApiModelProperty(required = true, value = "") public EnumStringRequiredEnum getEnumStringRequired() { @@ -232,6 +229,7 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) { * Get enumInteger * @return enumInteger */ + @JsonProperty("enum_integer") @ApiModelProperty(value = "") public EnumIntegerEnum getEnumInteger() { @@ -251,6 +249,7 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) { * Get enumNumber * @return enumNumber */ + @JsonProperty("enum_number") @ApiModelProperty(value = "") public EnumNumberEnum getEnumNumber() { @@ -270,6 +269,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) { * Get outerEnum * @return outerEnum */ + @JsonProperty("outerEnum") @Valid @ApiModelProperty(value = "") public OuterEnum getOuterEnum() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/File.java index d82e4902623d..43c44fd344bb 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/File.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/File.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class File { - @JsonProperty("sourceURI") private String sourceURI; public File sourceURI(String sourceURI) { @@ -35,6 +34,7 @@ public File sourceURI(String sourceURI) { * Test capitalization * @return sourceURI */ + @JsonProperty("sourceURI") @ApiModelProperty(value = "Test capitalization") public String getSourceURI() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 2ea153bd6468..d7815943b774 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -25,10 +25,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FileSchemaTestClass { - @JsonProperty("file") private File file; - @JsonProperty("files") @Valid private List files = null; @@ -41,6 +39,7 @@ public FileSchemaTestClass file(File file) { * Get file * @return file */ + @JsonProperty("file") @Valid @ApiModelProperty(value = "") public File getFile() { @@ -68,6 +67,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) { * Get files * @return files */ + @JsonProperty("files") @Valid @ApiModelProperty(value = "") public List getFiles() { 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 0e2aeaa78a22..ffd18f0ce221 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 @@ -30,48 +30,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FormatTest { - @JsonProperty("integer") private Integer integer; - @JsonProperty("int32") private Integer int32; - @JsonProperty("int64") private Long int64; - @JsonProperty("number") private BigDecimal number; - @JsonProperty("float") private Float _float; - @JsonProperty("double") private Double _double; - @JsonProperty("string") private String string; - @JsonProperty("byte") private byte[] _byte; - @JsonProperty("binary") private org.springframework.core.io.Resource binary; - @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("password") private String password; - @JsonProperty("BigDecimal") private BigDecimal bigDecimal; public FormatTest integer(Integer integer) { @@ -85,6 +71,7 @@ public FormatTest integer(Integer integer) { * maximum: 100 * @return integer */ + @JsonProperty("integer") @Min(10) @Max(100) @ApiModelProperty(value = "") public Integer getInteger() { @@ -106,6 +93,7 @@ public FormatTest int32(Integer int32) { * maximum: 200 * @return int32 */ + @JsonProperty("int32") @Min(20) @Max(200) @ApiModelProperty(value = "") public Integer getInt32() { @@ -125,6 +113,7 @@ public FormatTest int64(Long int64) { * Get int64 * @return int64 */ + @JsonProperty("int64") @ApiModelProperty(value = "") public Long getInt64() { @@ -146,6 +135,7 @@ public FormatTest number(BigDecimal number) { * maximum: 543.2 * @return number */ + @JsonProperty("number") @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") @ApiModelProperty(required = true, value = "") public BigDecimal getNumber() { @@ -167,6 +157,7 @@ public FormatTest _float(Float _float) { * maximum: 987.6 * @return _float */ + @JsonProperty("float") @DecimalMin("54.3") @DecimalMax("987.6") @ApiModelProperty(value = "") public Float getFloat() { @@ -188,6 +179,7 @@ public FormatTest _double(Double _double) { * maximum: 123.4 * @return _double */ + @JsonProperty("double") @DecimalMin("67.8") @DecimalMax("123.4") @ApiModelProperty(value = "") public Double getDouble() { @@ -207,6 +199,7 @@ public FormatTest string(String string) { * Get string * @return string */ + @JsonProperty("string") @Pattern(regexp = "/[a-z]/i") @ApiModelProperty(value = "") public String getString() { @@ -226,6 +219,7 @@ public FormatTest _byte(byte[] _byte) { * Get _byte * @return _byte */ + @JsonProperty("byte") @NotNull @ApiModelProperty(required = true, value = "") public byte[] getByte() { @@ -245,6 +239,7 @@ public FormatTest binary(org.springframework.core.io.Resource binary) { * Get binary * @return binary */ + @JsonProperty("binary") @Valid @ApiModelProperty(value = "") public org.springframework.core.io.Resource getBinary() { @@ -264,6 +259,7 @@ public FormatTest date(LocalDate date) { * Get date * @return date */ + @JsonProperty("date") @NotNull @Valid @ApiModelProperty(required = true, value = "") public LocalDate getDate() { @@ -283,6 +279,7 @@ public FormatTest dateTime(OffsetDateTime dateTime) { * Get dateTime * @return dateTime */ + @JsonProperty("dateTime") @Valid @ApiModelProperty(value = "") public OffsetDateTime getDateTime() { @@ -302,6 +299,7 @@ public FormatTest uuid(UUID uuid) { * Get uuid * @return uuid */ + @JsonProperty("uuid") @Valid @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") public UUID getUuid() { @@ -321,6 +319,7 @@ public FormatTest password(String password) { * Get password * @return password */ + @JsonProperty("password") @NotNull @Size(min = 10, max = 64) @ApiModelProperty(required = true, value = "") public String getPassword() { @@ -340,6 +339,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) { * Get bigDecimal * @return bigDecimal */ + @JsonProperty("BigDecimal") @Valid @ApiModelProperty(value = "") public BigDecimal getBigDecimal() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index 224b16d1a2d3..948ed9a0731d 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -24,10 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class HasOnlyReadOnly { - @JsonProperty("bar") private String bar; - @JsonProperty("foo") private String foo; public HasOnlyReadOnly bar(String bar) { @@ -39,6 +37,7 @@ public HasOnlyReadOnly bar(String bar) { * Get bar * @return bar */ + @JsonProperty("bar") @ApiModelProperty(readOnly = true, value = "") public String getBar() { @@ -58,6 +57,7 @@ public HasOnlyReadOnly foo(String foo) { * Get foo * @return foo */ + @JsonProperty("foo") @ApiModelProperty(readOnly = true, value = "") public String getFoo() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MapTest.java index f2867ac50403..94d4ae9a9d56 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MapTest.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MapTest { - @JsonProperty("map_map_of_string") @Valid private Map> mapMapOfString = null; @@ -64,15 +63,12 @@ public static InnerEnum fromValue(String value) { } } - @JsonProperty("map_of_enum_string") @Valid private Map mapOfEnumString = null; - @JsonProperty("direct_map") @Valid private Map directMap = null; - @JsonProperty("indirect_map") @Valid private Map indirectMap = null; @@ -93,6 +89,7 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapMapOfString * @return mapMapOfString */ + @JsonProperty("map_map_of_string") @Valid @ApiModelProperty(value = "") public Map> getMapMapOfString() { @@ -120,6 +117,7 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) * Get mapOfEnumString * @return mapOfEnumString */ + @JsonProperty("map_of_enum_string") @ApiModelProperty(value = "") public Map getMapOfEnumString() { @@ -147,6 +145,7 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) { * Get directMap * @return directMap */ + @JsonProperty("direct_map") @ApiModelProperty(value = "") public Map getDirectMap() { @@ -174,6 +173,7 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) { * Get indirectMap * @return indirectMap */ + @JsonProperty("indirect_map") @ApiModelProperty(value = "") public Map getIndirectMap() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 901c65b2924d..89a2475d82fb 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -28,14 +28,11 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("map") @Valid private Map map = null; @@ -48,6 +45,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { * Get uuid * @return uuid */ + @JsonProperty("uuid") @Valid @ApiModelProperty(value = "") public UUID getUuid() { @@ -67,6 +65,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT * Get dateTime * @return dateTime */ + @JsonProperty("dateTime") @Valid @ApiModelProperty(value = "") public OffsetDateTime getDateTime() { @@ -94,6 +93,7 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * Get map * @return map */ + @JsonProperty("map") @Valid @ApiModelProperty(value = "") public Map getMap() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Model200Response.java index 36dfd34883e8..220b6493f31a 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Model200Response.java @@ -25,10 +25,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Model200Response { - @JsonProperty("name") private Integer name; - @JsonProperty("class") private String propertyClass; public Model200Response name(Integer name) { @@ -40,6 +38,7 @@ public Model200Response name(Integer name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public Integer getName() { @@ -59,6 +58,7 @@ public Model200Response propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ + @JsonProperty("class") @ApiModelProperty(value = "") public String getPropertyClass() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java index dfba6cb672d4..29f3f43cf20e 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -24,13 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -42,6 +39,7 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ + @JsonProperty("code") @ApiModelProperty(value = "") public Integer getCode() { @@ -61,6 +59,7 @@ public ModelApiResponse type(String type) { * Get type * @return type */ + @JsonProperty("type") @ApiModelProperty(value = "") public String getType() { @@ -80,6 +79,7 @@ public ModelApiResponse message(String message) { * Get message * @return message */ + @JsonProperty("message") @ApiModelProperty(value = "") public String getMessage() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelList.java index 97ddf5359aa0..a374fe83d52a 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelList.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelList { - @JsonProperty("123-list") private String _123list; public ModelList _123list(String _123list) { @@ -36,6 +35,7 @@ public ModelList _123list(String _123list) { * Get _123list * @return _123list */ + @JsonProperty("123-list") @ApiModelProperty(value = "") public String get123list() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelReturn.java index 4505ddfeeeca..d8fc618d9dfb 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelReturn.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelReturn { - @JsonProperty("return") private Integer _return; public ModelReturn _return(Integer _return) { @@ -37,6 +36,7 @@ public ModelReturn _return(Integer _return) { * Get _return * @return _return */ + @JsonProperty("return") @ApiModelProperty(value = "") public Integer getReturn() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Name.java index 51cc37bbeea7..054901b488d6 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Name.java @@ -23,16 +23,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Name { - @JsonProperty("name") private Integer name; - @JsonProperty("snake_case") private Integer snakeCase; - @JsonProperty("property") private String property; - @JsonProperty("123Number") private Integer _123number; public Name name(Integer name) { @@ -44,6 +40,7 @@ public Name name(Integer name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @ApiModelProperty(required = true, value = "") public Integer getName() { @@ -63,6 +60,7 @@ public Name snakeCase(Integer snakeCase) { * Get snakeCase * @return snakeCase */ + @JsonProperty("snake_case") @ApiModelProperty(readOnly = true, value = "") public Integer getSnakeCase() { @@ -82,6 +80,7 @@ public Name property(String property) { * Get property * @return property */ + @JsonProperty("property") @ApiModelProperty(value = "") public String getProperty() { @@ -101,6 +100,7 @@ public Name _123number(Integer _123number) { * Get _123number * @return _123number */ + @JsonProperty("123Number") @ApiModelProperty(readOnly = true, value = "") public Integer get123number() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NumberOnly.java index 278146bfb899..8f2f2b19b191 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NumberOnly.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class NumberOnly { - @JsonProperty("JustNumber") private BigDecimal justNumber; public NumberOnly justNumber(BigDecimal justNumber) { @@ -35,6 +34,7 @@ public NumberOnly justNumber(BigDecimal justNumber) { * Get justNumber * @return justNumber */ + @JsonProperty("JustNumber") @Valid @ApiModelProperty(value = "") public BigDecimal getJustNumber() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Order.java index 9a9ed4f6c960..feac4d2cad8d 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Order.java @@ -25,16 +25,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -75,10 +71,8 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -90,6 +84,7 @@ public Order id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -109,6 +104,7 @@ public Order petId(Long petId) { * Get petId * @return petId */ + @JsonProperty("petId") @ApiModelProperty(value = "") public Long getPetId() { @@ -128,6 +124,7 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ + @JsonProperty("quantity") @ApiModelProperty(value = "") public Integer getQuantity() { @@ -147,6 +144,7 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ + @JsonProperty("shipDate") @Valid @ApiModelProperty(value = "") public OffsetDateTime getShipDate() { @@ -166,6 +164,7 @@ public Order status(StatusEnum status) { * Order Status * @return status */ + @JsonProperty("status") @ApiModelProperty(value = "Order Status") public StatusEnum getStatus() { @@ -185,6 +184,7 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ + @JsonProperty("complete") @ApiModelProperty(value = "") public Boolean getComplete() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/OuterComposite.java index c1a709bb26ad..00cce99097d7 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/OuterComposite.java @@ -23,13 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class OuterComposite { - @JsonProperty("my_number") private BigDecimal myNumber; - @JsonProperty("my_string") private String myString; - @JsonProperty("my_boolean") private Boolean myBoolean; public OuterComposite myNumber(BigDecimal myNumber) { @@ -41,6 +38,7 @@ public OuterComposite myNumber(BigDecimal myNumber) { * Get myNumber * @return myNumber */ + @JsonProperty("my_number") @Valid @ApiModelProperty(value = "") public BigDecimal getMyNumber() { @@ -60,6 +58,7 @@ public OuterComposite myString(String myString) { * Get myString * @return myString */ + @JsonProperty("my_string") @ApiModelProperty(value = "") public String getMyString() { @@ -79,6 +78,7 @@ public OuterComposite myBoolean(Boolean myBoolean) { * Get myBoolean * @return myBoolean */ + @JsonProperty("my_boolean") @ApiModelProperty(value = "") public Boolean getMyBoolean() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java index 4d705acedcd2..e39c22373324 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java @@ -30,20 +30,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private Set photoUrls = new LinkedHashSet<>(); - @JsonProperty("tags") @Valid private List tags = null; @@ -84,7 +79,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; public Pet id(Long id) { @@ -96,6 +90,7 @@ public Pet id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -115,6 +110,7 @@ public Pet category(Category category) { * Get category * @return category */ + @JsonProperty("category") @Valid @ApiModelProperty(value = "") public Category getCategory() { @@ -134,6 +130,7 @@ public Pet name(String name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") public String getName() { @@ -158,6 +155,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ + @JsonProperty("photoUrls") @NotNull @ApiModelProperty(required = true, value = "") public Set getPhotoUrls() { @@ -186,6 +184,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ + @JsonProperty("tags") @Valid @ApiModelProperty(value = "") public List getTags() { @@ -205,6 +204,7 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ + @JsonProperty("status") @ApiModelProperty(value = "pet status in the store") public StatusEnum getStatus() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java index b7a0a416782e..d02b8c8cfd53 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -22,10 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ReadOnlyFirst { - @JsonProperty("bar") private String bar; - @JsonProperty("baz") private String baz; public ReadOnlyFirst bar(String bar) { @@ -37,6 +35,7 @@ public ReadOnlyFirst bar(String bar) { * Get bar * @return bar */ + @JsonProperty("bar") @ApiModelProperty(readOnly = true, value = "") public String getBar() { @@ -56,6 +55,7 @@ public ReadOnlyFirst baz(String baz) { * Get baz * @return baz */ + @JsonProperty("baz") @ApiModelProperty(value = "") public String getBaz() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/SpecialModelName.java index f321ab78cd56..8f176362e027 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/SpecialModelName.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class SpecialModelName { - @JsonProperty("$special[property.name]") private Long $specialPropertyName; public SpecialModelName $specialPropertyName(Long $specialPropertyName) { @@ -36,6 +35,7 @@ public class SpecialModelName { * Get $specialPropertyName * @return $specialPropertyName */ + @JsonProperty("$special[property.name]") @ApiModelProperty(value = "") public Long get$SpecialPropertyName() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Tag.java index 6161be4a9229..f7797bef2f19 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Tag.java @@ -22,10 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -37,6 +35,7 @@ public Tag id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -56,6 +55,7 @@ public Tag name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java index f10cff73bb78..506efbf431c1 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -25,19 +25,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderDefault { - @JsonProperty("string_item") private String stringItem = "what"; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem = true; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -50,6 +45,7 @@ public TypeHolderDefault stringItem(String stringItem) { * Get stringItem * @return stringItem */ + @JsonProperty("string_item") @NotNull @ApiModelProperty(required = true, value = "") public String getStringItem() { @@ -69,6 +65,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ + @JsonProperty("number_item") @NotNull @Valid @ApiModelProperty(required = true, value = "") public BigDecimal getNumberItem() { @@ -88,6 +85,7 @@ public TypeHolderDefault integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ + @JsonProperty("integer_item") @NotNull @ApiModelProperty(required = true, value = "") public Integer getIntegerItem() { @@ -107,6 +105,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ + @JsonProperty("bool_item") @NotNull @ApiModelProperty(required = true, value = "") public Boolean getBoolItem() { @@ -131,6 +130,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ + @JsonProperty("array_item") @NotNull @ApiModelProperty(required = true, value = "") public List getArrayItem() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java index d2ae69a4e5a8..806c0c90fa18 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -25,22 +25,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderExample { - @JsonProperty("string_item") private String stringItem; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("float_item") private Float floatItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -53,6 +47,7 @@ public TypeHolderExample stringItem(String stringItem) { * Get stringItem * @return stringItem */ + @JsonProperty("string_item") @NotNull @ApiModelProperty(example = "what", required = true, value = "") public String getStringItem() { @@ -72,6 +67,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ + @JsonProperty("number_item") @NotNull @Valid @ApiModelProperty(example = "1.234", required = true, value = "") public BigDecimal getNumberItem() { @@ -91,6 +87,7 @@ public TypeHolderExample floatItem(Float floatItem) { * Get floatItem * @return floatItem */ + @JsonProperty("float_item") @NotNull @ApiModelProperty(example = "1.234", required = true, value = "") public Float getFloatItem() { @@ -110,6 +107,7 @@ public TypeHolderExample integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ + @JsonProperty("integer_item") @NotNull @ApiModelProperty(example = "-2", required = true, value = "") public Integer getIntegerItem() { @@ -129,6 +127,7 @@ public TypeHolderExample boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ + @JsonProperty("bool_item") @NotNull @ApiModelProperty(example = "true", required = true, value = "") public Boolean getBoolItem() { @@ -153,6 +152,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ + @JsonProperty("array_item") @NotNull @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "") public List getArrayItem() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/User.java index ec85459bc99a..f42832389ffe 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/User.java @@ -22,28 +22,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -55,6 +47,7 @@ public User id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -74,6 +67,7 @@ public User username(String username) { * Get username * @return username */ + @JsonProperty("username") @ApiModelProperty(value = "") public String getUsername() { @@ -93,6 +87,7 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ + @JsonProperty("firstName") @ApiModelProperty(value = "") public String getFirstName() { @@ -112,6 +107,7 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ + @JsonProperty("lastName") @ApiModelProperty(value = "") public String getLastName() { @@ -131,6 +127,7 @@ public User email(String email) { * Get email * @return email */ + @JsonProperty("email") @ApiModelProperty(value = "") public String getEmail() { @@ -150,6 +147,7 @@ public User password(String password) { * Get password * @return password */ + @JsonProperty("password") @ApiModelProperty(value = "") public String getPassword() { @@ -169,6 +167,7 @@ public User phone(String phone) { * Get phone * @return phone */ + @JsonProperty("phone") @ApiModelProperty(value = "") public String getPhone() { @@ -188,6 +187,7 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ + @JsonProperty("userStatus") @ApiModelProperty(value = "User Status") public Integer getUserStatus() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/XmlItem.java index 27d5f8282818..c795b4b85e6d 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/XmlItem.java @@ -25,99 +25,70 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class XmlItem { - @JsonProperty("attribute_string") private String attributeString; - @JsonProperty("attribute_number") private BigDecimal attributeNumber; - @JsonProperty("attribute_integer") private Integer attributeInteger; - @JsonProperty("attribute_boolean") private Boolean attributeBoolean; - @JsonProperty("wrapped_array") @Valid private List wrappedArray = null; - @JsonProperty("name_string") private String nameString; - @JsonProperty("name_number") private BigDecimal nameNumber; - @JsonProperty("name_integer") private Integer nameInteger; - @JsonProperty("name_boolean") private Boolean nameBoolean; - @JsonProperty("name_array") @Valid private List nameArray = null; - @JsonProperty("name_wrapped_array") @Valid private List nameWrappedArray = null; - @JsonProperty("prefix_string") private String prefixString; - @JsonProperty("prefix_number") private BigDecimal prefixNumber; - @JsonProperty("prefix_integer") private Integer prefixInteger; - @JsonProperty("prefix_boolean") private Boolean prefixBoolean; - @JsonProperty("prefix_array") @Valid private List prefixArray = null; - @JsonProperty("prefix_wrapped_array") @Valid private List prefixWrappedArray = null; - @JsonProperty("namespace_string") private String namespaceString; - @JsonProperty("namespace_number") private BigDecimal namespaceNumber; - @JsonProperty("namespace_integer") private Integer namespaceInteger; - @JsonProperty("namespace_boolean") private Boolean namespaceBoolean; - @JsonProperty("namespace_array") @Valid private List namespaceArray = null; - @JsonProperty("namespace_wrapped_array") @Valid private List namespaceWrappedArray = null; - @JsonProperty("prefix_ns_string") private String prefixNsString; - @JsonProperty("prefix_ns_number") private BigDecimal prefixNsNumber; - @JsonProperty("prefix_ns_integer") private Integer prefixNsInteger; - @JsonProperty("prefix_ns_boolean") private Boolean prefixNsBoolean; - @JsonProperty("prefix_ns_array") @Valid private List prefixNsArray = null; - @JsonProperty("prefix_ns_wrapped_array") @Valid private List prefixNsWrappedArray = null; @@ -130,6 +101,7 @@ public XmlItem attributeString(String attributeString) { * Get attributeString * @return attributeString */ + @JsonProperty("attribute_string") @ApiModelProperty(example = "string", value = "") public String getAttributeString() { @@ -149,6 +121,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) { * Get attributeNumber * @return attributeNumber */ + @JsonProperty("attribute_number") @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getAttributeNumber() { @@ -168,6 +141,7 @@ public XmlItem attributeInteger(Integer attributeInteger) { * Get attributeInteger * @return attributeInteger */ + @JsonProperty("attribute_integer") @ApiModelProperty(example = "-2", value = "") public Integer getAttributeInteger() { @@ -187,6 +161,7 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) { * Get attributeBoolean * @return attributeBoolean */ + @JsonProperty("attribute_boolean") @ApiModelProperty(example = "true", value = "") public Boolean getAttributeBoolean() { @@ -214,6 +189,7 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) { * Get wrappedArray * @return wrappedArray */ + @JsonProperty("wrapped_array") @ApiModelProperty(value = "") public List getWrappedArray() { @@ -233,6 +209,7 @@ public XmlItem nameString(String nameString) { * Get nameString * @return nameString */ + @JsonProperty("name_string") @ApiModelProperty(example = "string", value = "") public String getNameString() { @@ -252,6 +229,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) { * Get nameNumber * @return nameNumber */ + @JsonProperty("name_number") @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getNameNumber() { @@ -271,6 +249,7 @@ public XmlItem nameInteger(Integer nameInteger) { * Get nameInteger * @return nameInteger */ + @JsonProperty("name_integer") @ApiModelProperty(example = "-2", value = "") public Integer getNameInteger() { @@ -290,6 +269,7 @@ public XmlItem nameBoolean(Boolean nameBoolean) { * Get nameBoolean * @return nameBoolean */ + @JsonProperty("name_boolean") @ApiModelProperty(example = "true", value = "") public Boolean getNameBoolean() { @@ -317,6 +297,7 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) { * Get nameArray * @return nameArray */ + @JsonProperty("name_array") @ApiModelProperty(value = "") public List getNameArray() { @@ -344,6 +325,7 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) { * Get nameWrappedArray * @return nameWrappedArray */ + @JsonProperty("name_wrapped_array") @ApiModelProperty(value = "") public List getNameWrappedArray() { @@ -363,6 +345,7 @@ public XmlItem prefixString(String prefixString) { * Get prefixString * @return prefixString */ + @JsonProperty("prefix_string") @ApiModelProperty(example = "string", value = "") public String getPrefixString() { @@ -382,6 +365,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) { * Get prefixNumber * @return prefixNumber */ + @JsonProperty("prefix_number") @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getPrefixNumber() { @@ -401,6 +385,7 @@ public XmlItem prefixInteger(Integer prefixInteger) { * Get prefixInteger * @return prefixInteger */ + @JsonProperty("prefix_integer") @ApiModelProperty(example = "-2", value = "") public Integer getPrefixInteger() { @@ -420,6 +405,7 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) { * Get prefixBoolean * @return prefixBoolean */ + @JsonProperty("prefix_boolean") @ApiModelProperty(example = "true", value = "") public Boolean getPrefixBoolean() { @@ -447,6 +433,7 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) { * Get prefixArray * @return prefixArray */ + @JsonProperty("prefix_array") @ApiModelProperty(value = "") public List getPrefixArray() { @@ -474,6 +461,7 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) { * Get prefixWrappedArray * @return prefixWrappedArray */ + @JsonProperty("prefix_wrapped_array") @ApiModelProperty(value = "") public List getPrefixWrappedArray() { @@ -493,6 +481,7 @@ public XmlItem namespaceString(String namespaceString) { * Get namespaceString * @return namespaceString */ + @JsonProperty("namespace_string") @ApiModelProperty(example = "string", value = "") public String getNamespaceString() { @@ -512,6 +501,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) { * Get namespaceNumber * @return namespaceNumber */ + @JsonProperty("namespace_number") @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getNamespaceNumber() { @@ -531,6 +521,7 @@ public XmlItem namespaceInteger(Integer namespaceInteger) { * Get namespaceInteger * @return namespaceInteger */ + @JsonProperty("namespace_integer") @ApiModelProperty(example = "-2", value = "") public Integer getNamespaceInteger() { @@ -550,6 +541,7 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) { * Get namespaceBoolean * @return namespaceBoolean */ + @JsonProperty("namespace_boolean") @ApiModelProperty(example = "true", value = "") public Boolean getNamespaceBoolean() { @@ -577,6 +569,7 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) { * Get namespaceArray * @return namespaceArray */ + @JsonProperty("namespace_array") @ApiModelProperty(value = "") public List getNamespaceArray() { @@ -604,6 +597,7 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) { * Get namespaceWrappedArray * @return namespaceWrappedArray */ + @JsonProperty("namespace_wrapped_array") @ApiModelProperty(value = "") public List getNamespaceWrappedArray() { @@ -623,6 +617,7 @@ public XmlItem prefixNsString(String prefixNsString) { * Get prefixNsString * @return prefixNsString */ + @JsonProperty("prefix_ns_string") @ApiModelProperty(example = "string", value = "") public String getPrefixNsString() { @@ -642,6 +637,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) { * Get prefixNsNumber * @return prefixNsNumber */ + @JsonProperty("prefix_ns_number") @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getPrefixNsNumber() { @@ -661,6 +657,7 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) { * Get prefixNsInteger * @return prefixNsInteger */ + @JsonProperty("prefix_ns_integer") @ApiModelProperty(example = "-2", value = "") public Integer getPrefixNsInteger() { @@ -680,6 +677,7 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) { * Get prefixNsBoolean * @return prefixNsBoolean */ + @JsonProperty("prefix_ns_boolean") @ApiModelProperty(example = "true", value = "") public Boolean getPrefixNsBoolean() { @@ -707,6 +705,7 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) { * Get prefixNsArray * @return prefixNsArray */ + @JsonProperty("prefix_ns_array") @ApiModelProperty(value = "") public List getPrefixNsArray() { @@ -734,6 +733,7 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) { * Get prefixNsWrappedArray * @return prefixNsWrappedArray */ + @JsonProperty("prefix_ns_wrapped_array") @ApiModelProperty(value = "") public List getPrefixNsWrappedArray() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 8e4c17989762..cb51920a8c28 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesAnyType extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesAnyType name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesAnyType name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 27a8f01607f1..1c66a636116f 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesArray extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesArray name(String name) { @@ -37,6 +36,7 @@ public AdditionalPropertiesArray name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index bc7b87d760a9..1dcc607639bf 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesBoolean extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesBoolean name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesBoolean name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index b5e88d5d7ccb..74250eb564ad 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -26,45 +26,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesClass { - @JsonProperty("map_string") @Valid private Map mapString = null; - @JsonProperty("map_number") @Valid private Map mapNumber = null; - @JsonProperty("map_integer") @Valid private Map mapInteger = null; - @JsonProperty("map_boolean") @Valid private Map mapBoolean = null; - @JsonProperty("map_array_integer") @Valid private Map> mapArrayInteger = null; - @JsonProperty("map_array_anytype") @Valid private Map> mapArrayAnytype = null; - @JsonProperty("map_map_string") @Valid private Map> mapMapString = null; - @JsonProperty("map_map_anytype") @Valid private Map> mapMapAnytype = null; - @JsonProperty("anytype_1") private Object anytype1; - @JsonProperty("anytype_2") private Object anytype2; - @JsonProperty("anytype_3") private Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { @@ -84,6 +73,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt * Get mapString * @return mapString */ + @JsonProperty("map_string") @ApiModelProperty(value = "") public Map getMapString() { @@ -111,6 +101,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * Get mapNumber * @return mapNumber */ + @JsonProperty("map_number") @Valid @ApiModelProperty(value = "") public Map getMapNumber() { @@ -138,6 +129,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege * Get mapInteger * @return mapInteger */ + @JsonProperty("map_integer") @ApiModelProperty(value = "") public Map getMapInteger() { @@ -165,6 +157,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea * Get mapBoolean * @return mapBoolean */ + @JsonProperty("map_boolean") @ApiModelProperty(value = "") public Map getMapBoolean() { @@ -192,6 +185,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { @@ -219,6 +213,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * Get mapArrayAnytype * @return mapArrayAnytype */ + @JsonProperty("map_array_anytype") @Valid @ApiModelProperty(value = "") public Map> getMapArrayAnytype() { @@ -246,6 +241,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { @@ -273,6 +269,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { @@ -292,6 +289,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) { * Get anytype1 * @return anytype1 */ + @JsonProperty("anytype_1") @ApiModelProperty(value = "") public Object getAnytype1() { @@ -311,6 +309,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) { * Get anytype2 * @return anytype2 */ + @JsonProperty("anytype_2") @ApiModelProperty(value = "") public Object getAnytype2() { @@ -330,6 +329,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) { * Get anytype3 * @return anytype3 */ + @JsonProperty("anytype_3") @ApiModelProperty(value = "") public Object getAnytype3() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 00b5174e93b7..ce8b8d62436c 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesInteger extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesInteger name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesInteger name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 8fec423ffb1b..dec791e0a273 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesNumber extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesNumber name(String name) { @@ -37,6 +36,7 @@ public AdditionalPropertiesNumber name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 67033332b0d6..546d0ab9216f 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesObject extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesObject name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesObject name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 993f83bb2cc1..c1f95cf62e81 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesString extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesString name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesString name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Animal.java index 798ec01a7fbe..4673ab974ce8 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Animal.java @@ -37,10 +37,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Animal { - @JsonProperty("className") private String className; - @JsonProperty("color") private String color = "red"; public Animal className(String className) { @@ -52,6 +50,7 @@ public Animal className(String className) { * Get className * @return className */ + @JsonProperty("className") @NotNull @ApiModelProperty(required = true, value = "") public String getClassName() { @@ -71,6 +70,7 @@ public Animal color(String color) { * Get color * @return color */ + @JsonProperty("color") @ApiModelProperty(value = "") public String getColor() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index df67eda87fd1..46ab3b631960 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfArrayOfNumberOnly { - @JsonProperty("ArrayArrayNumber") @Valid private List> arrayArrayNumber = null; @@ -46,6 +45,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * Get arrayArrayNumber * @return arrayArrayNumber */ + @JsonProperty("ArrayArrayNumber") @Valid @ApiModelProperty(value = "") public List> getArrayArrayNumber() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 05f1ca376a68..cb5358905469 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfNumberOnly { - @JsonProperty("ArrayNumber") @Valid private List arrayNumber = null; @@ -46,6 +45,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ + @JsonProperty("ArrayNumber") @Valid @ApiModelProperty(value = "") public List getArrayNumber() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayTest.java index ba67885edc8a..55cc431ecde6 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayTest.java @@ -25,15 +25,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayTest { - @JsonProperty("array_of_string") @Valid private List arrayOfString = null; - @JsonProperty("array_array_of_integer") @Valid private List> arrayArrayOfInteger = null; - @JsonProperty("array_array_of_model") @Valid private List> arrayArrayOfModel = null; @@ -54,6 +51,7 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) { * Get arrayOfString * @return arrayOfString */ + @JsonProperty("array_of_string") @ApiModelProperty(value = "") public List getArrayOfString() { @@ -81,6 +79,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ + @JsonProperty("array_array_of_integer") @Valid @ApiModelProperty(value = "") public List> getArrayArrayOfInteger() { @@ -108,6 +107,7 @@ public ArrayTest addArrayArrayOfModelItem(List arrayArrayOfModelI * Get arrayArrayOfModel * @return arrayArrayOfModel */ + @JsonProperty("array_array_of_model") @Valid @ApiModelProperty(value = "") public List> getArrayArrayOfModel() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Capitalization.java index e9cce9de0115..e0fdbe78bae2 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Capitalization.java @@ -22,22 +22,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Capitalization { - @JsonProperty("smallCamel") private String smallCamel; - @JsonProperty("CapitalCamel") private String capitalCamel; - @JsonProperty("small_Snake") private String smallSnake; - @JsonProperty("Capital_Snake") private String capitalSnake; - @JsonProperty("SCA_ETH_Flow_Points") private String scAETHFlowPoints; - @JsonProperty("ATT_NAME") private String ATT_NAME; public Capitalization smallCamel(String smallCamel) { @@ -49,6 +43,7 @@ public Capitalization smallCamel(String smallCamel) { * Get smallCamel * @return smallCamel */ + @JsonProperty("smallCamel") @ApiModelProperty(value = "") public String getSmallCamel() { @@ -68,6 +63,7 @@ public Capitalization capitalCamel(String capitalCamel) { * Get capitalCamel * @return capitalCamel */ + @JsonProperty("CapitalCamel") @ApiModelProperty(value = "") public String getCapitalCamel() { @@ -87,6 +83,7 @@ public Capitalization smallSnake(String smallSnake) { * Get smallSnake * @return smallSnake */ + @JsonProperty("small_Snake") @ApiModelProperty(value = "") public String getSmallSnake() { @@ -106,6 +103,7 @@ public Capitalization capitalSnake(String capitalSnake) { * Get capitalSnake * @return capitalSnake */ + @JsonProperty("Capital_Snake") @ApiModelProperty(value = "") public String getCapitalSnake() { @@ -125,6 +123,7 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) { * Get scAETHFlowPoints * @return scAETHFlowPoints */ + @JsonProperty("SCA_ETH_Flow_Points") @ApiModelProperty(value = "") public String getScAETHFlowPoints() { @@ -144,6 +143,7 @@ public Capitalization ATT_NAME(String ATT_NAME) { * Name of the pet * @return ATT_NAME */ + @JsonProperty("ATT_NAME") @ApiModelProperty(value = "Name of the pet ") public String getATTNAME() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Cat.java index 9c77b07695d5..9b798b7b5a25 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Cat.java @@ -27,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Cat extends Animal { - @JsonProperty("declawed") private Boolean declawed; public Cat declawed(Boolean declawed) { @@ -39,6 +38,7 @@ public Cat declawed(Boolean declawed) { * Get declawed * @return declawed */ + @JsonProperty("declawed") @ApiModelProperty(value = "") public Boolean getDeclawed() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/CatAllOf.java index eed74bea751a..63de2ad8818e 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/CatAllOf.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/CatAllOf.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class CatAllOf { - @JsonProperty("declawed") private Boolean declawed; public CatAllOf declawed(Boolean declawed) { @@ -36,6 +35,7 @@ public CatAllOf declawed(Boolean declawed) { * Get declawed * @return declawed */ + @JsonProperty("declawed") @ApiModelProperty(value = "") public Boolean getDeclawed() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Category.java index 27a4a9f25665..b63268b2c8ce 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Category.java @@ -22,10 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name = "default-name"; public Category id(Long id) { @@ -37,6 +35,7 @@ public Category id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -56,6 +55,7 @@ public Category name(String name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @ApiModelProperty(required = true, value = "") public String getName() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ClassModel.java index 69296da7e60e..976f0b01d071 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ClassModel.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ClassModel { - @JsonProperty("_class") private String propertyClass; public ClassModel propertyClass(String propertyClass) { @@ -35,6 +34,7 @@ public ClassModel propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ + @JsonProperty("_class") @ApiModelProperty(value = "") public String getPropertyClass() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Client.java index b788daea14a3..a3c4731f3339 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Client.java @@ -22,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Client { - @JsonProperty("client") private String client; public Client client(String client) { @@ -34,6 +33,7 @@ public Client client(String client) { * Get client * @return client */ + @JsonProperty("client") @ApiModelProperty(value = "") public String getClient() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Dog.java index 9b61a2fa29b6..593562fabb42 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Dog.java @@ -27,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Dog extends Animal { - @JsonProperty("breed") private String breed; public Dog breed(String breed) { @@ -39,6 +38,7 @@ public Dog breed(String breed) { * Get breed * @return breed */ + @JsonProperty("breed") @ApiModelProperty(value = "") public String getBreed() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/DogAllOf.java index 4f275e535333..7ddb24717737 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/DogAllOf.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/DogAllOf.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class DogAllOf { - @JsonProperty("breed") private String breed; public DogAllOf breed(String breed) { @@ -36,6 +35,7 @@ public DogAllOf breed(String breed) { * Get breed * @return breed */ + @JsonProperty("breed") @ApiModelProperty(value = "") public String getBreed() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumArrays.java index dba32cf2b710..04e850b1cf17 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumArrays.java @@ -60,7 +60,6 @@ public static JustSymbolEnum fromValue(String value) { } } - @JsonProperty("just_symbol") private JustSymbolEnum justSymbol; /** @@ -98,7 +97,6 @@ public static ArrayEnumEnum fromValue(String value) { } } - @JsonProperty("array_enum") @Valid private List arrayEnum = null; @@ -111,6 +109,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) { * Get justSymbol * @return justSymbol */ + @JsonProperty("just_symbol") @ApiModelProperty(value = "") public JustSymbolEnum getJustSymbol() { @@ -138,6 +137,7 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) { * Get arrayEnum * @return arrayEnum */ + @JsonProperty("array_enum") @ApiModelProperty(value = "") public List getArrayEnum() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumTest.java index c20bc1460143..49747f67dccf 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumTest.java @@ -63,7 +63,6 @@ public static EnumStringEnum fromValue(String value) { } } - @JsonProperty("enum_string") private EnumStringEnum enumString; /** @@ -103,7 +102,6 @@ public static EnumStringRequiredEnum fromValue(String value) { } } - @JsonProperty("enum_string_required") private EnumStringRequiredEnum enumStringRequired; /** @@ -141,7 +139,6 @@ public static EnumIntegerEnum fromValue(Integer value) { } } - @JsonProperty("enum_integer") private EnumIntegerEnum enumInteger; /** @@ -179,10 +176,8 @@ public static EnumNumberEnum fromValue(Double value) { } } - @JsonProperty("enum_number") private EnumNumberEnum enumNumber; - @JsonProperty("outerEnum") private OuterEnum outerEnum; public EnumTest enumString(EnumStringEnum enumString) { @@ -194,6 +189,7 @@ public EnumTest enumString(EnumStringEnum enumString) { * Get enumString * @return enumString */ + @JsonProperty("enum_string") @ApiModelProperty(value = "") public EnumStringEnum getEnumString() { @@ -213,6 +209,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) { * Get enumStringRequired * @return enumStringRequired */ + @JsonProperty("enum_string_required") @NotNull @ApiModelProperty(required = true, value = "") public EnumStringRequiredEnum getEnumStringRequired() { @@ -232,6 +229,7 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) { * Get enumInteger * @return enumInteger */ + @JsonProperty("enum_integer") @ApiModelProperty(value = "") public EnumIntegerEnum getEnumInteger() { @@ -251,6 +249,7 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) { * Get enumNumber * @return enumNumber */ + @JsonProperty("enum_number") @ApiModelProperty(value = "") public EnumNumberEnum getEnumNumber() { @@ -270,6 +269,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) { * Get outerEnum * @return outerEnum */ + @JsonProperty("outerEnum") @Valid @ApiModelProperty(value = "") public OuterEnum getOuterEnum() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/File.java index d82e4902623d..43c44fd344bb 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/File.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/File.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class File { - @JsonProperty("sourceURI") private String sourceURI; public File sourceURI(String sourceURI) { @@ -35,6 +34,7 @@ public File sourceURI(String sourceURI) { * Test capitalization * @return sourceURI */ + @JsonProperty("sourceURI") @ApiModelProperty(value = "Test capitalization") public String getSourceURI() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 2ea153bd6468..d7815943b774 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -25,10 +25,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FileSchemaTestClass { - @JsonProperty("file") private File file; - @JsonProperty("files") @Valid private List files = null; @@ -41,6 +39,7 @@ public FileSchemaTestClass file(File file) { * Get file * @return file */ + @JsonProperty("file") @Valid @ApiModelProperty(value = "") public File getFile() { @@ -68,6 +67,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) { * Get files * @return files */ + @JsonProperty("files") @Valid @ApiModelProperty(value = "") public List getFiles() { 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 0e2aeaa78a22..ffd18f0ce221 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 @@ -30,48 +30,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FormatTest { - @JsonProperty("integer") private Integer integer; - @JsonProperty("int32") private Integer int32; - @JsonProperty("int64") private Long int64; - @JsonProperty("number") private BigDecimal number; - @JsonProperty("float") private Float _float; - @JsonProperty("double") private Double _double; - @JsonProperty("string") private String string; - @JsonProperty("byte") private byte[] _byte; - @JsonProperty("binary") private org.springframework.core.io.Resource binary; - @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("password") private String password; - @JsonProperty("BigDecimal") private BigDecimal bigDecimal; public FormatTest integer(Integer integer) { @@ -85,6 +71,7 @@ public FormatTest integer(Integer integer) { * maximum: 100 * @return integer */ + @JsonProperty("integer") @Min(10) @Max(100) @ApiModelProperty(value = "") public Integer getInteger() { @@ -106,6 +93,7 @@ public FormatTest int32(Integer int32) { * maximum: 200 * @return int32 */ + @JsonProperty("int32") @Min(20) @Max(200) @ApiModelProperty(value = "") public Integer getInt32() { @@ -125,6 +113,7 @@ public FormatTest int64(Long int64) { * Get int64 * @return int64 */ + @JsonProperty("int64") @ApiModelProperty(value = "") public Long getInt64() { @@ -146,6 +135,7 @@ public FormatTest number(BigDecimal number) { * maximum: 543.2 * @return number */ + @JsonProperty("number") @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") @ApiModelProperty(required = true, value = "") public BigDecimal getNumber() { @@ -167,6 +157,7 @@ public FormatTest _float(Float _float) { * maximum: 987.6 * @return _float */ + @JsonProperty("float") @DecimalMin("54.3") @DecimalMax("987.6") @ApiModelProperty(value = "") public Float getFloat() { @@ -188,6 +179,7 @@ public FormatTest _double(Double _double) { * maximum: 123.4 * @return _double */ + @JsonProperty("double") @DecimalMin("67.8") @DecimalMax("123.4") @ApiModelProperty(value = "") public Double getDouble() { @@ -207,6 +199,7 @@ public FormatTest string(String string) { * Get string * @return string */ + @JsonProperty("string") @Pattern(regexp = "/[a-z]/i") @ApiModelProperty(value = "") public String getString() { @@ -226,6 +219,7 @@ public FormatTest _byte(byte[] _byte) { * Get _byte * @return _byte */ + @JsonProperty("byte") @NotNull @ApiModelProperty(required = true, value = "") public byte[] getByte() { @@ -245,6 +239,7 @@ public FormatTest binary(org.springframework.core.io.Resource binary) { * Get binary * @return binary */ + @JsonProperty("binary") @Valid @ApiModelProperty(value = "") public org.springframework.core.io.Resource getBinary() { @@ -264,6 +259,7 @@ public FormatTest date(LocalDate date) { * Get date * @return date */ + @JsonProperty("date") @NotNull @Valid @ApiModelProperty(required = true, value = "") public LocalDate getDate() { @@ -283,6 +279,7 @@ public FormatTest dateTime(OffsetDateTime dateTime) { * Get dateTime * @return dateTime */ + @JsonProperty("dateTime") @Valid @ApiModelProperty(value = "") public OffsetDateTime getDateTime() { @@ -302,6 +299,7 @@ public FormatTest uuid(UUID uuid) { * Get uuid * @return uuid */ + @JsonProperty("uuid") @Valid @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") public UUID getUuid() { @@ -321,6 +319,7 @@ public FormatTest password(String password) { * Get password * @return password */ + @JsonProperty("password") @NotNull @Size(min = 10, max = 64) @ApiModelProperty(required = true, value = "") public String getPassword() { @@ -340,6 +339,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) { * Get bigDecimal * @return bigDecimal */ + @JsonProperty("BigDecimal") @Valid @ApiModelProperty(value = "") public BigDecimal getBigDecimal() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index 224b16d1a2d3..948ed9a0731d 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -24,10 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class HasOnlyReadOnly { - @JsonProperty("bar") private String bar; - @JsonProperty("foo") private String foo; public HasOnlyReadOnly bar(String bar) { @@ -39,6 +37,7 @@ public HasOnlyReadOnly bar(String bar) { * Get bar * @return bar */ + @JsonProperty("bar") @ApiModelProperty(readOnly = true, value = "") public String getBar() { @@ -58,6 +57,7 @@ public HasOnlyReadOnly foo(String foo) { * Get foo * @return foo */ + @JsonProperty("foo") @ApiModelProperty(readOnly = true, value = "") public String getFoo() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MapTest.java index f2867ac50403..94d4ae9a9d56 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MapTest.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MapTest { - @JsonProperty("map_map_of_string") @Valid private Map> mapMapOfString = null; @@ -64,15 +63,12 @@ public static InnerEnum fromValue(String value) { } } - @JsonProperty("map_of_enum_string") @Valid private Map mapOfEnumString = null; - @JsonProperty("direct_map") @Valid private Map directMap = null; - @JsonProperty("indirect_map") @Valid private Map indirectMap = null; @@ -93,6 +89,7 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapMapOfString * @return mapMapOfString */ + @JsonProperty("map_map_of_string") @Valid @ApiModelProperty(value = "") public Map> getMapMapOfString() { @@ -120,6 +117,7 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) * Get mapOfEnumString * @return mapOfEnumString */ + @JsonProperty("map_of_enum_string") @ApiModelProperty(value = "") public Map getMapOfEnumString() { @@ -147,6 +145,7 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) { * Get directMap * @return directMap */ + @JsonProperty("direct_map") @ApiModelProperty(value = "") public Map getDirectMap() { @@ -174,6 +173,7 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) { * Get indirectMap * @return indirectMap */ + @JsonProperty("indirect_map") @ApiModelProperty(value = "") public Map getIndirectMap() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 901c65b2924d..89a2475d82fb 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -28,14 +28,11 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("map") @Valid private Map map = null; @@ -48,6 +45,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { * Get uuid * @return uuid */ + @JsonProperty("uuid") @Valid @ApiModelProperty(value = "") public UUID getUuid() { @@ -67,6 +65,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT * Get dateTime * @return dateTime */ + @JsonProperty("dateTime") @Valid @ApiModelProperty(value = "") public OffsetDateTime getDateTime() { @@ -94,6 +93,7 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * Get map * @return map */ + @JsonProperty("map") @Valid @ApiModelProperty(value = "") public Map getMap() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Model200Response.java index 36dfd34883e8..220b6493f31a 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Model200Response.java @@ -25,10 +25,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Model200Response { - @JsonProperty("name") private Integer name; - @JsonProperty("class") private String propertyClass; public Model200Response name(Integer name) { @@ -40,6 +38,7 @@ public Model200Response name(Integer name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public Integer getName() { @@ -59,6 +58,7 @@ public Model200Response propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ + @JsonProperty("class") @ApiModelProperty(value = "") public String getPropertyClass() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelApiResponse.java index dfba6cb672d4..29f3f43cf20e 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -24,13 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -42,6 +39,7 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ + @JsonProperty("code") @ApiModelProperty(value = "") public Integer getCode() { @@ -61,6 +59,7 @@ public ModelApiResponse type(String type) { * Get type * @return type */ + @JsonProperty("type") @ApiModelProperty(value = "") public String getType() { @@ -80,6 +79,7 @@ public ModelApiResponse message(String message) { * Get message * @return message */ + @JsonProperty("message") @ApiModelProperty(value = "") public String getMessage() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelList.java index 97ddf5359aa0..a374fe83d52a 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelList.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelList { - @JsonProperty("123-list") private String _123list; public ModelList _123list(String _123list) { @@ -36,6 +35,7 @@ public ModelList _123list(String _123list) { * Get _123list * @return _123list */ + @JsonProperty("123-list") @ApiModelProperty(value = "") public String get123list() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelReturn.java index 4505ddfeeeca..d8fc618d9dfb 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelReturn.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelReturn { - @JsonProperty("return") private Integer _return; public ModelReturn _return(Integer _return) { @@ -37,6 +36,7 @@ public ModelReturn _return(Integer _return) { * Get _return * @return _return */ + @JsonProperty("return") @ApiModelProperty(value = "") public Integer getReturn() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Name.java index 51cc37bbeea7..054901b488d6 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Name.java @@ -23,16 +23,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Name { - @JsonProperty("name") private Integer name; - @JsonProperty("snake_case") private Integer snakeCase; - @JsonProperty("property") private String property; - @JsonProperty("123Number") private Integer _123number; public Name name(Integer name) { @@ -44,6 +40,7 @@ public Name name(Integer name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @ApiModelProperty(required = true, value = "") public Integer getName() { @@ -63,6 +60,7 @@ public Name snakeCase(Integer snakeCase) { * Get snakeCase * @return snakeCase */ + @JsonProperty("snake_case") @ApiModelProperty(readOnly = true, value = "") public Integer getSnakeCase() { @@ -82,6 +80,7 @@ public Name property(String property) { * Get property * @return property */ + @JsonProperty("property") @ApiModelProperty(value = "") public String getProperty() { @@ -101,6 +100,7 @@ public Name _123number(Integer _123number) { * Get _123number * @return _123number */ + @JsonProperty("123Number") @ApiModelProperty(readOnly = true, value = "") public Integer get123number() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/NumberOnly.java index 278146bfb899..8f2f2b19b191 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/NumberOnly.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class NumberOnly { - @JsonProperty("JustNumber") private BigDecimal justNumber; public NumberOnly justNumber(BigDecimal justNumber) { @@ -35,6 +34,7 @@ public NumberOnly justNumber(BigDecimal justNumber) { * Get justNumber * @return justNumber */ + @JsonProperty("JustNumber") @Valid @ApiModelProperty(value = "") public BigDecimal getJustNumber() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Order.java index 9a9ed4f6c960..feac4d2cad8d 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Order.java @@ -25,16 +25,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -75,10 +71,8 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -90,6 +84,7 @@ public Order id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -109,6 +104,7 @@ public Order petId(Long petId) { * Get petId * @return petId */ + @JsonProperty("petId") @ApiModelProperty(value = "") public Long getPetId() { @@ -128,6 +124,7 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ + @JsonProperty("quantity") @ApiModelProperty(value = "") public Integer getQuantity() { @@ -147,6 +144,7 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ + @JsonProperty("shipDate") @Valid @ApiModelProperty(value = "") public OffsetDateTime getShipDate() { @@ -166,6 +164,7 @@ public Order status(StatusEnum status) { * Order Status * @return status */ + @JsonProperty("status") @ApiModelProperty(value = "Order Status") public StatusEnum getStatus() { @@ -185,6 +184,7 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ + @JsonProperty("complete") @ApiModelProperty(value = "") public Boolean getComplete() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/OuterComposite.java index c1a709bb26ad..00cce99097d7 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/OuterComposite.java @@ -23,13 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class OuterComposite { - @JsonProperty("my_number") private BigDecimal myNumber; - @JsonProperty("my_string") private String myString; - @JsonProperty("my_boolean") private Boolean myBoolean; public OuterComposite myNumber(BigDecimal myNumber) { @@ -41,6 +38,7 @@ public OuterComposite myNumber(BigDecimal myNumber) { * Get myNumber * @return myNumber */ + @JsonProperty("my_number") @Valid @ApiModelProperty(value = "") public BigDecimal getMyNumber() { @@ -60,6 +58,7 @@ public OuterComposite myString(String myString) { * Get myString * @return myString */ + @JsonProperty("my_string") @ApiModelProperty(value = "") public String getMyString() { @@ -79,6 +78,7 @@ public OuterComposite myBoolean(Boolean myBoolean) { * Get myBoolean * @return myBoolean */ + @JsonProperty("my_boolean") @ApiModelProperty(value = "") public Boolean getMyBoolean() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Pet.java index f8fa05d91c38..1d8ef7f7160f 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Pet.java @@ -27,20 +27,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private List photoUrls = new ArrayList<>(); - @JsonProperty("tags") @Valid private List tags = null; @@ -81,7 +76,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; public Pet id(Long id) { @@ -93,6 +87,7 @@ public Pet id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -112,6 +107,7 @@ public Pet category(Category category) { * Get category * @return category */ + @JsonProperty("category") @Valid @ApiModelProperty(value = "") public Category getCategory() { @@ -131,6 +127,7 @@ public Pet name(String name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") public String getName() { @@ -155,6 +152,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ + @JsonProperty("photoUrls") @NotNull @ApiModelProperty(required = true, value = "") public List getPhotoUrls() { @@ -182,6 +180,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ + @JsonProperty("tags") @Valid @ApiModelProperty(value = "") public List getTags() { @@ -201,6 +200,7 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ + @JsonProperty("status") @ApiModelProperty(value = "pet status in the store") public StatusEnum getStatus() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java index b7a0a416782e..d02b8c8cfd53 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -22,10 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ReadOnlyFirst { - @JsonProperty("bar") private String bar; - @JsonProperty("baz") private String baz; public ReadOnlyFirst bar(String bar) { @@ -37,6 +35,7 @@ public ReadOnlyFirst bar(String bar) { * Get bar * @return bar */ + @JsonProperty("bar") @ApiModelProperty(readOnly = true, value = "") public String getBar() { @@ -56,6 +55,7 @@ public ReadOnlyFirst baz(String baz) { * Get baz * @return baz */ + @JsonProperty("baz") @ApiModelProperty(value = "") public String getBaz() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java index f321ab78cd56..8f176362e027 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class SpecialModelName { - @JsonProperty("$special[property.name]") private Long $specialPropertyName; public SpecialModelName $specialPropertyName(Long $specialPropertyName) { @@ -36,6 +35,7 @@ public class SpecialModelName { * Get $specialPropertyName * @return $specialPropertyName */ + @JsonProperty("$special[property.name]") @ApiModelProperty(value = "") public Long get$SpecialPropertyName() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Tag.java index 6161be4a9229..f7797bef2f19 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Tag.java @@ -22,10 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -37,6 +35,7 @@ public Tag id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -56,6 +55,7 @@ public Tag name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java index f10cff73bb78..506efbf431c1 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -25,19 +25,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderDefault { - @JsonProperty("string_item") private String stringItem = "what"; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem = true; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -50,6 +45,7 @@ public TypeHolderDefault stringItem(String stringItem) { * Get stringItem * @return stringItem */ + @JsonProperty("string_item") @NotNull @ApiModelProperty(required = true, value = "") public String getStringItem() { @@ -69,6 +65,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ + @JsonProperty("number_item") @NotNull @Valid @ApiModelProperty(required = true, value = "") public BigDecimal getNumberItem() { @@ -88,6 +85,7 @@ public TypeHolderDefault integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ + @JsonProperty("integer_item") @NotNull @ApiModelProperty(required = true, value = "") public Integer getIntegerItem() { @@ -107,6 +105,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ + @JsonProperty("bool_item") @NotNull @ApiModelProperty(required = true, value = "") public Boolean getBoolItem() { @@ -131,6 +130,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ + @JsonProperty("array_item") @NotNull @ApiModelProperty(required = true, value = "") public List getArrayItem() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java index d2ae69a4e5a8..806c0c90fa18 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -25,22 +25,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderExample { - @JsonProperty("string_item") private String stringItem; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("float_item") private Float floatItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -53,6 +47,7 @@ public TypeHolderExample stringItem(String stringItem) { * Get stringItem * @return stringItem */ + @JsonProperty("string_item") @NotNull @ApiModelProperty(example = "what", required = true, value = "") public String getStringItem() { @@ -72,6 +67,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ + @JsonProperty("number_item") @NotNull @Valid @ApiModelProperty(example = "1.234", required = true, value = "") public BigDecimal getNumberItem() { @@ -91,6 +87,7 @@ public TypeHolderExample floatItem(Float floatItem) { * Get floatItem * @return floatItem */ + @JsonProperty("float_item") @NotNull @ApiModelProperty(example = "1.234", required = true, value = "") public Float getFloatItem() { @@ -110,6 +107,7 @@ public TypeHolderExample integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ + @JsonProperty("integer_item") @NotNull @ApiModelProperty(example = "-2", required = true, value = "") public Integer getIntegerItem() { @@ -129,6 +127,7 @@ public TypeHolderExample boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ + @JsonProperty("bool_item") @NotNull @ApiModelProperty(example = "true", required = true, value = "") public Boolean getBoolItem() { @@ -153,6 +152,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ + @JsonProperty("array_item") @NotNull @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "") public List getArrayItem() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/User.java index ec85459bc99a..f42832389ffe 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/User.java @@ -22,28 +22,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -55,6 +47,7 @@ public User id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -74,6 +67,7 @@ public User username(String username) { * Get username * @return username */ + @JsonProperty("username") @ApiModelProperty(value = "") public String getUsername() { @@ -93,6 +87,7 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ + @JsonProperty("firstName") @ApiModelProperty(value = "") public String getFirstName() { @@ -112,6 +107,7 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ + @JsonProperty("lastName") @ApiModelProperty(value = "") public String getLastName() { @@ -131,6 +127,7 @@ public User email(String email) { * Get email * @return email */ + @JsonProperty("email") @ApiModelProperty(value = "") public String getEmail() { @@ -150,6 +147,7 @@ public User password(String password) { * Get password * @return password */ + @JsonProperty("password") @ApiModelProperty(value = "") public String getPassword() { @@ -169,6 +167,7 @@ public User phone(String phone) { * Get phone * @return phone */ + @JsonProperty("phone") @ApiModelProperty(value = "") public String getPhone() { @@ -188,6 +187,7 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ + @JsonProperty("userStatus") @ApiModelProperty(value = "User Status") public Integer getUserStatus() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/XmlItem.java index 27d5f8282818..c795b4b85e6d 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/XmlItem.java @@ -25,99 +25,70 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class XmlItem { - @JsonProperty("attribute_string") private String attributeString; - @JsonProperty("attribute_number") private BigDecimal attributeNumber; - @JsonProperty("attribute_integer") private Integer attributeInteger; - @JsonProperty("attribute_boolean") private Boolean attributeBoolean; - @JsonProperty("wrapped_array") @Valid private List wrappedArray = null; - @JsonProperty("name_string") private String nameString; - @JsonProperty("name_number") private BigDecimal nameNumber; - @JsonProperty("name_integer") private Integer nameInteger; - @JsonProperty("name_boolean") private Boolean nameBoolean; - @JsonProperty("name_array") @Valid private List nameArray = null; - @JsonProperty("name_wrapped_array") @Valid private List nameWrappedArray = null; - @JsonProperty("prefix_string") private String prefixString; - @JsonProperty("prefix_number") private BigDecimal prefixNumber; - @JsonProperty("prefix_integer") private Integer prefixInteger; - @JsonProperty("prefix_boolean") private Boolean prefixBoolean; - @JsonProperty("prefix_array") @Valid private List prefixArray = null; - @JsonProperty("prefix_wrapped_array") @Valid private List prefixWrappedArray = null; - @JsonProperty("namespace_string") private String namespaceString; - @JsonProperty("namespace_number") private BigDecimal namespaceNumber; - @JsonProperty("namespace_integer") private Integer namespaceInteger; - @JsonProperty("namespace_boolean") private Boolean namespaceBoolean; - @JsonProperty("namespace_array") @Valid private List namespaceArray = null; - @JsonProperty("namespace_wrapped_array") @Valid private List namespaceWrappedArray = null; - @JsonProperty("prefix_ns_string") private String prefixNsString; - @JsonProperty("prefix_ns_number") private BigDecimal prefixNsNumber; - @JsonProperty("prefix_ns_integer") private Integer prefixNsInteger; - @JsonProperty("prefix_ns_boolean") private Boolean prefixNsBoolean; - @JsonProperty("prefix_ns_array") @Valid private List prefixNsArray = null; - @JsonProperty("prefix_ns_wrapped_array") @Valid private List prefixNsWrappedArray = null; @@ -130,6 +101,7 @@ public XmlItem attributeString(String attributeString) { * Get attributeString * @return attributeString */ + @JsonProperty("attribute_string") @ApiModelProperty(example = "string", value = "") public String getAttributeString() { @@ -149,6 +121,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) { * Get attributeNumber * @return attributeNumber */ + @JsonProperty("attribute_number") @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getAttributeNumber() { @@ -168,6 +141,7 @@ public XmlItem attributeInteger(Integer attributeInteger) { * Get attributeInteger * @return attributeInteger */ + @JsonProperty("attribute_integer") @ApiModelProperty(example = "-2", value = "") public Integer getAttributeInteger() { @@ -187,6 +161,7 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) { * Get attributeBoolean * @return attributeBoolean */ + @JsonProperty("attribute_boolean") @ApiModelProperty(example = "true", value = "") public Boolean getAttributeBoolean() { @@ -214,6 +189,7 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) { * Get wrappedArray * @return wrappedArray */ + @JsonProperty("wrapped_array") @ApiModelProperty(value = "") public List getWrappedArray() { @@ -233,6 +209,7 @@ public XmlItem nameString(String nameString) { * Get nameString * @return nameString */ + @JsonProperty("name_string") @ApiModelProperty(example = "string", value = "") public String getNameString() { @@ -252,6 +229,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) { * Get nameNumber * @return nameNumber */ + @JsonProperty("name_number") @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getNameNumber() { @@ -271,6 +249,7 @@ public XmlItem nameInteger(Integer nameInteger) { * Get nameInteger * @return nameInteger */ + @JsonProperty("name_integer") @ApiModelProperty(example = "-2", value = "") public Integer getNameInteger() { @@ -290,6 +269,7 @@ public XmlItem nameBoolean(Boolean nameBoolean) { * Get nameBoolean * @return nameBoolean */ + @JsonProperty("name_boolean") @ApiModelProperty(example = "true", value = "") public Boolean getNameBoolean() { @@ -317,6 +297,7 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) { * Get nameArray * @return nameArray */ + @JsonProperty("name_array") @ApiModelProperty(value = "") public List getNameArray() { @@ -344,6 +325,7 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) { * Get nameWrappedArray * @return nameWrappedArray */ + @JsonProperty("name_wrapped_array") @ApiModelProperty(value = "") public List getNameWrappedArray() { @@ -363,6 +345,7 @@ public XmlItem prefixString(String prefixString) { * Get prefixString * @return prefixString */ + @JsonProperty("prefix_string") @ApiModelProperty(example = "string", value = "") public String getPrefixString() { @@ -382,6 +365,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) { * Get prefixNumber * @return prefixNumber */ + @JsonProperty("prefix_number") @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getPrefixNumber() { @@ -401,6 +385,7 @@ public XmlItem prefixInteger(Integer prefixInteger) { * Get prefixInteger * @return prefixInteger */ + @JsonProperty("prefix_integer") @ApiModelProperty(example = "-2", value = "") public Integer getPrefixInteger() { @@ -420,6 +405,7 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) { * Get prefixBoolean * @return prefixBoolean */ + @JsonProperty("prefix_boolean") @ApiModelProperty(example = "true", value = "") public Boolean getPrefixBoolean() { @@ -447,6 +433,7 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) { * Get prefixArray * @return prefixArray */ + @JsonProperty("prefix_array") @ApiModelProperty(value = "") public List getPrefixArray() { @@ -474,6 +461,7 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) { * Get prefixWrappedArray * @return prefixWrappedArray */ + @JsonProperty("prefix_wrapped_array") @ApiModelProperty(value = "") public List getPrefixWrappedArray() { @@ -493,6 +481,7 @@ public XmlItem namespaceString(String namespaceString) { * Get namespaceString * @return namespaceString */ + @JsonProperty("namespace_string") @ApiModelProperty(example = "string", value = "") public String getNamespaceString() { @@ -512,6 +501,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) { * Get namespaceNumber * @return namespaceNumber */ + @JsonProperty("namespace_number") @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getNamespaceNumber() { @@ -531,6 +521,7 @@ public XmlItem namespaceInteger(Integer namespaceInteger) { * Get namespaceInteger * @return namespaceInteger */ + @JsonProperty("namespace_integer") @ApiModelProperty(example = "-2", value = "") public Integer getNamespaceInteger() { @@ -550,6 +541,7 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) { * Get namespaceBoolean * @return namespaceBoolean */ + @JsonProperty("namespace_boolean") @ApiModelProperty(example = "true", value = "") public Boolean getNamespaceBoolean() { @@ -577,6 +569,7 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) { * Get namespaceArray * @return namespaceArray */ + @JsonProperty("namespace_array") @ApiModelProperty(value = "") public List getNamespaceArray() { @@ -604,6 +597,7 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) { * Get namespaceWrappedArray * @return namespaceWrappedArray */ + @JsonProperty("namespace_wrapped_array") @ApiModelProperty(value = "") public List getNamespaceWrappedArray() { @@ -623,6 +617,7 @@ public XmlItem prefixNsString(String prefixNsString) { * Get prefixNsString * @return prefixNsString */ + @JsonProperty("prefix_ns_string") @ApiModelProperty(example = "string", value = "") public String getPrefixNsString() { @@ -642,6 +637,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) { * Get prefixNsNumber * @return prefixNsNumber */ + @JsonProperty("prefix_ns_number") @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getPrefixNsNumber() { @@ -661,6 +657,7 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) { * Get prefixNsInteger * @return prefixNsInteger */ + @JsonProperty("prefix_ns_integer") @ApiModelProperty(example = "-2", value = "") public Integer getPrefixNsInteger() { @@ -680,6 +677,7 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) { * Get prefixNsBoolean * @return prefixNsBoolean */ + @JsonProperty("prefix_ns_boolean") @ApiModelProperty(example = "true", value = "") public Boolean getPrefixNsBoolean() { @@ -707,6 +705,7 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) { * Get prefixNsArray * @return prefixNsArray */ + @JsonProperty("prefix_ns_array") @ApiModelProperty(value = "") public List getPrefixNsArray() { @@ -734,6 +733,7 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) { * Get prefixNsWrappedArray * @return prefixNsWrappedArray */ + @JsonProperty("prefix_ns_wrapped_array") @ApiModelProperty(value = "") public List getPrefixNsWrappedArray() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 8e4c17989762..cb51920a8c28 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesAnyType extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesAnyType name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesAnyType name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 27a8f01607f1..1c66a636116f 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesArray extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesArray name(String name) { @@ -37,6 +36,7 @@ public AdditionalPropertiesArray name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index bc7b87d760a9..1dcc607639bf 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesBoolean extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesBoolean name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesBoolean name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index b5e88d5d7ccb..74250eb564ad 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -26,45 +26,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesClass { - @JsonProperty("map_string") @Valid private Map mapString = null; - @JsonProperty("map_number") @Valid private Map mapNumber = null; - @JsonProperty("map_integer") @Valid private Map mapInteger = null; - @JsonProperty("map_boolean") @Valid private Map mapBoolean = null; - @JsonProperty("map_array_integer") @Valid private Map> mapArrayInteger = null; - @JsonProperty("map_array_anytype") @Valid private Map> mapArrayAnytype = null; - @JsonProperty("map_map_string") @Valid private Map> mapMapString = null; - @JsonProperty("map_map_anytype") @Valid private Map> mapMapAnytype = null; - @JsonProperty("anytype_1") private Object anytype1; - @JsonProperty("anytype_2") private Object anytype2; - @JsonProperty("anytype_3") private Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { @@ -84,6 +73,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt * Get mapString * @return mapString */ + @JsonProperty("map_string") @ApiModelProperty(value = "") public Map getMapString() { @@ -111,6 +101,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * Get mapNumber * @return mapNumber */ + @JsonProperty("map_number") @Valid @ApiModelProperty(value = "") public Map getMapNumber() { @@ -138,6 +129,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege * Get mapInteger * @return mapInteger */ + @JsonProperty("map_integer") @ApiModelProperty(value = "") public Map getMapInteger() { @@ -165,6 +157,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea * Get mapBoolean * @return mapBoolean */ + @JsonProperty("map_boolean") @ApiModelProperty(value = "") public Map getMapBoolean() { @@ -192,6 +185,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { @@ -219,6 +213,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * Get mapArrayAnytype * @return mapArrayAnytype */ + @JsonProperty("map_array_anytype") @Valid @ApiModelProperty(value = "") public Map> getMapArrayAnytype() { @@ -246,6 +241,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { @@ -273,6 +269,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { @@ -292,6 +289,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) { * Get anytype1 * @return anytype1 */ + @JsonProperty("anytype_1") @ApiModelProperty(value = "") public Object getAnytype1() { @@ -311,6 +309,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) { * Get anytype2 * @return anytype2 */ + @JsonProperty("anytype_2") @ApiModelProperty(value = "") public Object getAnytype2() { @@ -330,6 +329,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) { * Get anytype3 * @return anytype3 */ + @JsonProperty("anytype_3") @ApiModelProperty(value = "") public Object getAnytype3() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 00b5174e93b7..ce8b8d62436c 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesInteger extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesInteger name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesInteger name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 8fec423ffb1b..dec791e0a273 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesNumber extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesNumber name(String name) { @@ -37,6 +36,7 @@ public AdditionalPropertiesNumber name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 67033332b0d6..546d0ab9216f 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesObject extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesObject name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesObject name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 993f83bb2cc1..c1f95cf62e81 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesString extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesString name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesString name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Animal.java index 798ec01a7fbe..4673ab974ce8 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Animal.java @@ -37,10 +37,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Animal { - @JsonProperty("className") private String className; - @JsonProperty("color") private String color = "red"; public Animal className(String className) { @@ -52,6 +50,7 @@ public Animal className(String className) { * Get className * @return className */ + @JsonProperty("className") @NotNull @ApiModelProperty(required = true, value = "") public String getClassName() { @@ -71,6 +70,7 @@ public Animal color(String color) { * Get color * @return color */ + @JsonProperty("color") @ApiModelProperty(value = "") public String getColor() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index df67eda87fd1..46ab3b631960 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfArrayOfNumberOnly { - @JsonProperty("ArrayArrayNumber") @Valid private List> arrayArrayNumber = null; @@ -46,6 +45,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * Get arrayArrayNumber * @return arrayArrayNumber */ + @JsonProperty("ArrayArrayNumber") @Valid @ApiModelProperty(value = "") public List> getArrayArrayNumber() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 05f1ca376a68..cb5358905469 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfNumberOnly { - @JsonProperty("ArrayNumber") @Valid private List arrayNumber = null; @@ -46,6 +45,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ + @JsonProperty("ArrayNumber") @Valid @ApiModelProperty(value = "") public List getArrayNumber() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayTest.java index ba67885edc8a..55cc431ecde6 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayTest.java @@ -25,15 +25,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayTest { - @JsonProperty("array_of_string") @Valid private List arrayOfString = null; - @JsonProperty("array_array_of_integer") @Valid private List> arrayArrayOfInteger = null; - @JsonProperty("array_array_of_model") @Valid private List> arrayArrayOfModel = null; @@ -54,6 +51,7 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) { * Get arrayOfString * @return arrayOfString */ + @JsonProperty("array_of_string") @ApiModelProperty(value = "") public List getArrayOfString() { @@ -81,6 +79,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ + @JsonProperty("array_array_of_integer") @Valid @ApiModelProperty(value = "") public List> getArrayArrayOfInteger() { @@ -108,6 +107,7 @@ public ArrayTest addArrayArrayOfModelItem(List arrayArrayOfModelI * Get arrayArrayOfModel * @return arrayArrayOfModel */ + @JsonProperty("array_array_of_model") @Valid @ApiModelProperty(value = "") public List> getArrayArrayOfModel() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Capitalization.java index e9cce9de0115..e0fdbe78bae2 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Capitalization.java @@ -22,22 +22,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Capitalization { - @JsonProperty("smallCamel") private String smallCamel; - @JsonProperty("CapitalCamel") private String capitalCamel; - @JsonProperty("small_Snake") private String smallSnake; - @JsonProperty("Capital_Snake") private String capitalSnake; - @JsonProperty("SCA_ETH_Flow_Points") private String scAETHFlowPoints; - @JsonProperty("ATT_NAME") private String ATT_NAME; public Capitalization smallCamel(String smallCamel) { @@ -49,6 +43,7 @@ public Capitalization smallCamel(String smallCamel) { * Get smallCamel * @return smallCamel */ + @JsonProperty("smallCamel") @ApiModelProperty(value = "") public String getSmallCamel() { @@ -68,6 +63,7 @@ public Capitalization capitalCamel(String capitalCamel) { * Get capitalCamel * @return capitalCamel */ + @JsonProperty("CapitalCamel") @ApiModelProperty(value = "") public String getCapitalCamel() { @@ -87,6 +83,7 @@ public Capitalization smallSnake(String smallSnake) { * Get smallSnake * @return smallSnake */ + @JsonProperty("small_Snake") @ApiModelProperty(value = "") public String getSmallSnake() { @@ -106,6 +103,7 @@ public Capitalization capitalSnake(String capitalSnake) { * Get capitalSnake * @return capitalSnake */ + @JsonProperty("Capital_Snake") @ApiModelProperty(value = "") public String getCapitalSnake() { @@ -125,6 +123,7 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) { * Get scAETHFlowPoints * @return scAETHFlowPoints */ + @JsonProperty("SCA_ETH_Flow_Points") @ApiModelProperty(value = "") public String getScAETHFlowPoints() { @@ -144,6 +143,7 @@ public Capitalization ATT_NAME(String ATT_NAME) { * Name of the pet * @return ATT_NAME */ + @JsonProperty("ATT_NAME") @ApiModelProperty(value = "Name of the pet ") public String getATTNAME() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Cat.java index 9c77b07695d5..9b798b7b5a25 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Cat.java @@ -27,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Cat extends Animal { - @JsonProperty("declawed") private Boolean declawed; public Cat declawed(Boolean declawed) { @@ -39,6 +38,7 @@ public Cat declawed(Boolean declawed) { * Get declawed * @return declawed */ + @JsonProperty("declawed") @ApiModelProperty(value = "") public Boolean getDeclawed() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/CatAllOf.java index eed74bea751a..63de2ad8818e 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/CatAllOf.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/CatAllOf.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class CatAllOf { - @JsonProperty("declawed") private Boolean declawed; public CatAllOf declawed(Boolean declawed) { @@ -36,6 +35,7 @@ public CatAllOf declawed(Boolean declawed) { * Get declawed * @return declawed */ + @JsonProperty("declawed") @ApiModelProperty(value = "") public Boolean getDeclawed() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Category.java index 27a4a9f25665..b63268b2c8ce 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Category.java @@ -22,10 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name = "default-name"; public Category id(Long id) { @@ -37,6 +35,7 @@ public Category id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -56,6 +55,7 @@ public Category name(String name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @ApiModelProperty(required = true, value = "") public String getName() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ClassModel.java index 69296da7e60e..976f0b01d071 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ClassModel.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ClassModel { - @JsonProperty("_class") private String propertyClass; public ClassModel propertyClass(String propertyClass) { @@ -35,6 +34,7 @@ public ClassModel propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ + @JsonProperty("_class") @ApiModelProperty(value = "") public String getPropertyClass() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Client.java index b788daea14a3..a3c4731f3339 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Client.java @@ -22,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Client { - @JsonProperty("client") private String client; public Client client(String client) { @@ -34,6 +33,7 @@ public Client client(String client) { * Get client * @return client */ + @JsonProperty("client") @ApiModelProperty(value = "") public String getClient() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Dog.java index 9b61a2fa29b6..593562fabb42 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Dog.java @@ -27,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Dog extends Animal { - @JsonProperty("breed") private String breed; public Dog breed(String breed) { @@ -39,6 +38,7 @@ public Dog breed(String breed) { * Get breed * @return breed */ + @JsonProperty("breed") @ApiModelProperty(value = "") public String getBreed() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/DogAllOf.java index 4f275e535333..7ddb24717737 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/DogAllOf.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/DogAllOf.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class DogAllOf { - @JsonProperty("breed") private String breed; public DogAllOf breed(String breed) { @@ -36,6 +35,7 @@ public DogAllOf breed(String breed) { * Get breed * @return breed */ + @JsonProperty("breed") @ApiModelProperty(value = "") public String getBreed() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumArrays.java index dba32cf2b710..04e850b1cf17 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumArrays.java @@ -60,7 +60,6 @@ public static JustSymbolEnum fromValue(String value) { } } - @JsonProperty("just_symbol") private JustSymbolEnum justSymbol; /** @@ -98,7 +97,6 @@ public static ArrayEnumEnum fromValue(String value) { } } - @JsonProperty("array_enum") @Valid private List arrayEnum = null; @@ -111,6 +109,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) { * Get justSymbol * @return justSymbol */ + @JsonProperty("just_symbol") @ApiModelProperty(value = "") public JustSymbolEnum getJustSymbol() { @@ -138,6 +137,7 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) { * Get arrayEnum * @return arrayEnum */ + @JsonProperty("array_enum") @ApiModelProperty(value = "") public List getArrayEnum() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumTest.java index c20bc1460143..49747f67dccf 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumTest.java @@ -63,7 +63,6 @@ public static EnumStringEnum fromValue(String value) { } } - @JsonProperty("enum_string") private EnumStringEnum enumString; /** @@ -103,7 +102,6 @@ public static EnumStringRequiredEnum fromValue(String value) { } } - @JsonProperty("enum_string_required") private EnumStringRequiredEnum enumStringRequired; /** @@ -141,7 +139,6 @@ public static EnumIntegerEnum fromValue(Integer value) { } } - @JsonProperty("enum_integer") private EnumIntegerEnum enumInteger; /** @@ -179,10 +176,8 @@ public static EnumNumberEnum fromValue(Double value) { } } - @JsonProperty("enum_number") private EnumNumberEnum enumNumber; - @JsonProperty("outerEnum") private OuterEnum outerEnum; public EnumTest enumString(EnumStringEnum enumString) { @@ -194,6 +189,7 @@ public EnumTest enumString(EnumStringEnum enumString) { * Get enumString * @return enumString */ + @JsonProperty("enum_string") @ApiModelProperty(value = "") public EnumStringEnum getEnumString() { @@ -213,6 +209,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) { * Get enumStringRequired * @return enumStringRequired */ + @JsonProperty("enum_string_required") @NotNull @ApiModelProperty(required = true, value = "") public EnumStringRequiredEnum getEnumStringRequired() { @@ -232,6 +229,7 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) { * Get enumInteger * @return enumInteger */ + @JsonProperty("enum_integer") @ApiModelProperty(value = "") public EnumIntegerEnum getEnumInteger() { @@ -251,6 +249,7 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) { * Get enumNumber * @return enumNumber */ + @JsonProperty("enum_number") @ApiModelProperty(value = "") public EnumNumberEnum getEnumNumber() { @@ -270,6 +269,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) { * Get outerEnum * @return outerEnum */ + @JsonProperty("outerEnum") @Valid @ApiModelProperty(value = "") public OuterEnum getOuterEnum() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/File.java index d82e4902623d..43c44fd344bb 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/File.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/File.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class File { - @JsonProperty("sourceURI") private String sourceURI; public File sourceURI(String sourceURI) { @@ -35,6 +34,7 @@ public File sourceURI(String sourceURI) { * Test capitalization * @return sourceURI */ + @JsonProperty("sourceURI") @ApiModelProperty(value = "Test capitalization") public String getSourceURI() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 2ea153bd6468..d7815943b774 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -25,10 +25,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FileSchemaTestClass { - @JsonProperty("file") private File file; - @JsonProperty("files") @Valid private List files = null; @@ -41,6 +39,7 @@ public FileSchemaTestClass file(File file) { * Get file * @return file */ + @JsonProperty("file") @Valid @ApiModelProperty(value = "") public File getFile() { @@ -68,6 +67,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) { * Get files * @return files */ + @JsonProperty("files") @Valid @ApiModelProperty(value = "") public List getFiles() { 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 0e2aeaa78a22..ffd18f0ce221 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 @@ -30,48 +30,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FormatTest { - @JsonProperty("integer") private Integer integer; - @JsonProperty("int32") private Integer int32; - @JsonProperty("int64") private Long int64; - @JsonProperty("number") private BigDecimal number; - @JsonProperty("float") private Float _float; - @JsonProperty("double") private Double _double; - @JsonProperty("string") private String string; - @JsonProperty("byte") private byte[] _byte; - @JsonProperty("binary") private org.springframework.core.io.Resource binary; - @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("password") private String password; - @JsonProperty("BigDecimal") private BigDecimal bigDecimal; public FormatTest integer(Integer integer) { @@ -85,6 +71,7 @@ public FormatTest integer(Integer integer) { * maximum: 100 * @return integer */ + @JsonProperty("integer") @Min(10) @Max(100) @ApiModelProperty(value = "") public Integer getInteger() { @@ -106,6 +93,7 @@ public FormatTest int32(Integer int32) { * maximum: 200 * @return int32 */ + @JsonProperty("int32") @Min(20) @Max(200) @ApiModelProperty(value = "") public Integer getInt32() { @@ -125,6 +113,7 @@ public FormatTest int64(Long int64) { * Get int64 * @return int64 */ + @JsonProperty("int64") @ApiModelProperty(value = "") public Long getInt64() { @@ -146,6 +135,7 @@ public FormatTest number(BigDecimal number) { * maximum: 543.2 * @return number */ + @JsonProperty("number") @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") @ApiModelProperty(required = true, value = "") public BigDecimal getNumber() { @@ -167,6 +157,7 @@ public FormatTest _float(Float _float) { * maximum: 987.6 * @return _float */ + @JsonProperty("float") @DecimalMin("54.3") @DecimalMax("987.6") @ApiModelProperty(value = "") public Float getFloat() { @@ -188,6 +179,7 @@ public FormatTest _double(Double _double) { * maximum: 123.4 * @return _double */ + @JsonProperty("double") @DecimalMin("67.8") @DecimalMax("123.4") @ApiModelProperty(value = "") public Double getDouble() { @@ -207,6 +199,7 @@ public FormatTest string(String string) { * Get string * @return string */ + @JsonProperty("string") @Pattern(regexp = "/[a-z]/i") @ApiModelProperty(value = "") public String getString() { @@ -226,6 +219,7 @@ public FormatTest _byte(byte[] _byte) { * Get _byte * @return _byte */ + @JsonProperty("byte") @NotNull @ApiModelProperty(required = true, value = "") public byte[] getByte() { @@ -245,6 +239,7 @@ public FormatTest binary(org.springframework.core.io.Resource binary) { * Get binary * @return binary */ + @JsonProperty("binary") @Valid @ApiModelProperty(value = "") public org.springframework.core.io.Resource getBinary() { @@ -264,6 +259,7 @@ public FormatTest date(LocalDate date) { * Get date * @return date */ + @JsonProperty("date") @NotNull @Valid @ApiModelProperty(required = true, value = "") public LocalDate getDate() { @@ -283,6 +279,7 @@ public FormatTest dateTime(OffsetDateTime dateTime) { * Get dateTime * @return dateTime */ + @JsonProperty("dateTime") @Valid @ApiModelProperty(value = "") public OffsetDateTime getDateTime() { @@ -302,6 +299,7 @@ public FormatTest uuid(UUID uuid) { * Get uuid * @return uuid */ + @JsonProperty("uuid") @Valid @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") public UUID getUuid() { @@ -321,6 +319,7 @@ public FormatTest password(String password) { * Get password * @return password */ + @JsonProperty("password") @NotNull @Size(min = 10, max = 64) @ApiModelProperty(required = true, value = "") public String getPassword() { @@ -340,6 +339,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) { * Get bigDecimal * @return bigDecimal */ + @JsonProperty("BigDecimal") @Valid @ApiModelProperty(value = "") public BigDecimal getBigDecimal() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index 224b16d1a2d3..948ed9a0731d 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -24,10 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class HasOnlyReadOnly { - @JsonProperty("bar") private String bar; - @JsonProperty("foo") private String foo; public HasOnlyReadOnly bar(String bar) { @@ -39,6 +37,7 @@ public HasOnlyReadOnly bar(String bar) { * Get bar * @return bar */ + @JsonProperty("bar") @ApiModelProperty(readOnly = true, value = "") public String getBar() { @@ -58,6 +57,7 @@ public HasOnlyReadOnly foo(String foo) { * Get foo * @return foo */ + @JsonProperty("foo") @ApiModelProperty(readOnly = true, value = "") public String getFoo() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MapTest.java index f2867ac50403..94d4ae9a9d56 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MapTest.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MapTest { - @JsonProperty("map_map_of_string") @Valid private Map> mapMapOfString = null; @@ -64,15 +63,12 @@ public static InnerEnum fromValue(String value) { } } - @JsonProperty("map_of_enum_string") @Valid private Map mapOfEnumString = null; - @JsonProperty("direct_map") @Valid private Map directMap = null; - @JsonProperty("indirect_map") @Valid private Map indirectMap = null; @@ -93,6 +89,7 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapMapOfString * @return mapMapOfString */ + @JsonProperty("map_map_of_string") @Valid @ApiModelProperty(value = "") public Map> getMapMapOfString() { @@ -120,6 +117,7 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) * Get mapOfEnumString * @return mapOfEnumString */ + @JsonProperty("map_of_enum_string") @ApiModelProperty(value = "") public Map getMapOfEnumString() { @@ -147,6 +145,7 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) { * Get directMap * @return directMap */ + @JsonProperty("direct_map") @ApiModelProperty(value = "") public Map getDirectMap() { @@ -174,6 +173,7 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) { * Get indirectMap * @return indirectMap */ + @JsonProperty("indirect_map") @ApiModelProperty(value = "") public Map getIndirectMap() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 901c65b2924d..89a2475d82fb 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -28,14 +28,11 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("map") @Valid private Map map = null; @@ -48,6 +45,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { * Get uuid * @return uuid */ + @JsonProperty("uuid") @Valid @ApiModelProperty(value = "") public UUID getUuid() { @@ -67,6 +65,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT * Get dateTime * @return dateTime */ + @JsonProperty("dateTime") @Valid @ApiModelProperty(value = "") public OffsetDateTime getDateTime() { @@ -94,6 +93,7 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * Get map * @return map */ + @JsonProperty("map") @Valid @ApiModelProperty(value = "") public Map getMap() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Model200Response.java index 36dfd34883e8..220b6493f31a 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Model200Response.java @@ -25,10 +25,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Model200Response { - @JsonProperty("name") private Integer name; - @JsonProperty("class") private String propertyClass; public Model200Response name(Integer name) { @@ -40,6 +38,7 @@ public Model200Response name(Integer name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public Integer getName() { @@ -59,6 +58,7 @@ public Model200Response propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ + @JsonProperty("class") @ApiModelProperty(value = "") public String getPropertyClass() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelApiResponse.java index dfba6cb672d4..29f3f43cf20e 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -24,13 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -42,6 +39,7 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ + @JsonProperty("code") @ApiModelProperty(value = "") public Integer getCode() { @@ -61,6 +59,7 @@ public ModelApiResponse type(String type) { * Get type * @return type */ + @JsonProperty("type") @ApiModelProperty(value = "") public String getType() { @@ -80,6 +79,7 @@ public ModelApiResponse message(String message) { * Get message * @return message */ + @JsonProperty("message") @ApiModelProperty(value = "") public String getMessage() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelList.java index 97ddf5359aa0..a374fe83d52a 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelList.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelList { - @JsonProperty("123-list") private String _123list; public ModelList _123list(String _123list) { @@ -36,6 +35,7 @@ public ModelList _123list(String _123list) { * Get _123list * @return _123list */ + @JsonProperty("123-list") @ApiModelProperty(value = "") public String get123list() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelReturn.java index 4505ddfeeeca..d8fc618d9dfb 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelReturn.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelReturn { - @JsonProperty("return") private Integer _return; public ModelReturn _return(Integer _return) { @@ -37,6 +36,7 @@ public ModelReturn _return(Integer _return) { * Get _return * @return _return */ + @JsonProperty("return") @ApiModelProperty(value = "") public Integer getReturn() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Name.java index 51cc37bbeea7..054901b488d6 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Name.java @@ -23,16 +23,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Name { - @JsonProperty("name") private Integer name; - @JsonProperty("snake_case") private Integer snakeCase; - @JsonProperty("property") private String property; - @JsonProperty("123Number") private Integer _123number; public Name name(Integer name) { @@ -44,6 +40,7 @@ public Name name(Integer name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @ApiModelProperty(required = true, value = "") public Integer getName() { @@ -63,6 +60,7 @@ public Name snakeCase(Integer snakeCase) { * Get snakeCase * @return snakeCase */ + @JsonProperty("snake_case") @ApiModelProperty(readOnly = true, value = "") public Integer getSnakeCase() { @@ -82,6 +80,7 @@ public Name property(String property) { * Get property * @return property */ + @JsonProperty("property") @ApiModelProperty(value = "") public String getProperty() { @@ -101,6 +100,7 @@ public Name _123number(Integer _123number) { * Get _123number * @return _123number */ + @JsonProperty("123Number") @ApiModelProperty(readOnly = true, value = "") public Integer get123number() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/NumberOnly.java index 278146bfb899..8f2f2b19b191 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/NumberOnly.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class NumberOnly { - @JsonProperty("JustNumber") private BigDecimal justNumber; public NumberOnly justNumber(BigDecimal justNumber) { @@ -35,6 +34,7 @@ public NumberOnly justNumber(BigDecimal justNumber) { * Get justNumber * @return justNumber */ + @JsonProperty("JustNumber") @Valid @ApiModelProperty(value = "") public BigDecimal getJustNumber() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Order.java index 9a9ed4f6c960..feac4d2cad8d 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Order.java @@ -25,16 +25,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -75,10 +71,8 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -90,6 +84,7 @@ public Order id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -109,6 +104,7 @@ public Order petId(Long petId) { * Get petId * @return petId */ + @JsonProperty("petId") @ApiModelProperty(value = "") public Long getPetId() { @@ -128,6 +124,7 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ + @JsonProperty("quantity") @ApiModelProperty(value = "") public Integer getQuantity() { @@ -147,6 +144,7 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ + @JsonProperty("shipDate") @Valid @ApiModelProperty(value = "") public OffsetDateTime getShipDate() { @@ -166,6 +164,7 @@ public Order status(StatusEnum status) { * Order Status * @return status */ + @JsonProperty("status") @ApiModelProperty(value = "Order Status") public StatusEnum getStatus() { @@ -185,6 +184,7 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ + @JsonProperty("complete") @ApiModelProperty(value = "") public Boolean getComplete() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/OuterComposite.java index c1a709bb26ad..00cce99097d7 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/OuterComposite.java @@ -23,13 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class OuterComposite { - @JsonProperty("my_number") private BigDecimal myNumber; - @JsonProperty("my_string") private String myString; - @JsonProperty("my_boolean") private Boolean myBoolean; public OuterComposite myNumber(BigDecimal myNumber) { @@ -41,6 +38,7 @@ public OuterComposite myNumber(BigDecimal myNumber) { * Get myNumber * @return myNumber */ + @JsonProperty("my_number") @Valid @ApiModelProperty(value = "") public BigDecimal getMyNumber() { @@ -60,6 +58,7 @@ public OuterComposite myString(String myString) { * Get myString * @return myString */ + @JsonProperty("my_string") @ApiModelProperty(value = "") public String getMyString() { @@ -79,6 +78,7 @@ public OuterComposite myBoolean(Boolean myBoolean) { * Get myBoolean * @return myBoolean */ + @JsonProperty("my_boolean") @ApiModelProperty(value = "") public Boolean getMyBoolean() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Pet.java index f8fa05d91c38..1d8ef7f7160f 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Pet.java @@ -27,20 +27,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private List photoUrls = new ArrayList<>(); - @JsonProperty("tags") @Valid private List tags = null; @@ -81,7 +76,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; public Pet id(Long id) { @@ -93,6 +87,7 @@ public Pet id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -112,6 +107,7 @@ public Pet category(Category category) { * Get category * @return category */ + @JsonProperty("category") @Valid @ApiModelProperty(value = "") public Category getCategory() { @@ -131,6 +127,7 @@ public Pet name(String name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") public String getName() { @@ -155,6 +152,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ + @JsonProperty("photoUrls") @NotNull @ApiModelProperty(required = true, value = "") public List getPhotoUrls() { @@ -182,6 +180,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ + @JsonProperty("tags") @Valid @ApiModelProperty(value = "") public List getTags() { @@ -201,6 +200,7 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ + @JsonProperty("status") @ApiModelProperty(value = "pet status in the store") public StatusEnum getStatus() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ReadOnlyFirst.java index b7a0a416782e..d02b8c8cfd53 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -22,10 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ReadOnlyFirst { - @JsonProperty("bar") private String bar; - @JsonProperty("baz") private String baz; public ReadOnlyFirst bar(String bar) { @@ -37,6 +35,7 @@ public ReadOnlyFirst bar(String bar) { * Get bar * @return bar */ + @JsonProperty("bar") @ApiModelProperty(readOnly = true, value = "") public String getBar() { @@ -56,6 +55,7 @@ public ReadOnlyFirst baz(String baz) { * Get baz * @return baz */ + @JsonProperty("baz") @ApiModelProperty(value = "") public String getBaz() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/SpecialModelName.java index f321ab78cd56..8f176362e027 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/SpecialModelName.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class SpecialModelName { - @JsonProperty("$special[property.name]") private Long $specialPropertyName; public SpecialModelName $specialPropertyName(Long $specialPropertyName) { @@ -36,6 +35,7 @@ public class SpecialModelName { * Get $specialPropertyName * @return $specialPropertyName */ + @JsonProperty("$special[property.name]") @ApiModelProperty(value = "") public Long get$SpecialPropertyName() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Tag.java index 6161be4a9229..f7797bef2f19 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Tag.java @@ -22,10 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -37,6 +35,7 @@ public Tag id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -56,6 +55,7 @@ public Tag name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderDefault.java index f10cff73bb78..506efbf431c1 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -25,19 +25,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderDefault { - @JsonProperty("string_item") private String stringItem = "what"; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem = true; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -50,6 +45,7 @@ public TypeHolderDefault stringItem(String stringItem) { * Get stringItem * @return stringItem */ + @JsonProperty("string_item") @NotNull @ApiModelProperty(required = true, value = "") public String getStringItem() { @@ -69,6 +65,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ + @JsonProperty("number_item") @NotNull @Valid @ApiModelProperty(required = true, value = "") public BigDecimal getNumberItem() { @@ -88,6 +85,7 @@ public TypeHolderDefault integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ + @JsonProperty("integer_item") @NotNull @ApiModelProperty(required = true, value = "") public Integer getIntegerItem() { @@ -107,6 +105,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ + @JsonProperty("bool_item") @NotNull @ApiModelProperty(required = true, value = "") public Boolean getBoolItem() { @@ -131,6 +130,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ + @JsonProperty("array_item") @NotNull @ApiModelProperty(required = true, value = "") public List getArrayItem() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderExample.java index d2ae69a4e5a8..806c0c90fa18 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -25,22 +25,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderExample { - @JsonProperty("string_item") private String stringItem; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("float_item") private Float floatItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -53,6 +47,7 @@ public TypeHolderExample stringItem(String stringItem) { * Get stringItem * @return stringItem */ + @JsonProperty("string_item") @NotNull @ApiModelProperty(example = "what", required = true, value = "") public String getStringItem() { @@ -72,6 +67,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ + @JsonProperty("number_item") @NotNull @Valid @ApiModelProperty(example = "1.234", required = true, value = "") public BigDecimal getNumberItem() { @@ -91,6 +87,7 @@ public TypeHolderExample floatItem(Float floatItem) { * Get floatItem * @return floatItem */ + @JsonProperty("float_item") @NotNull @ApiModelProperty(example = "1.234", required = true, value = "") public Float getFloatItem() { @@ -110,6 +107,7 @@ public TypeHolderExample integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ + @JsonProperty("integer_item") @NotNull @ApiModelProperty(example = "-2", required = true, value = "") public Integer getIntegerItem() { @@ -129,6 +127,7 @@ public TypeHolderExample boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ + @JsonProperty("bool_item") @NotNull @ApiModelProperty(example = "true", required = true, value = "") public Boolean getBoolItem() { @@ -153,6 +152,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ + @JsonProperty("array_item") @NotNull @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "") public List getArrayItem() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/User.java index ec85459bc99a..f42832389ffe 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/User.java @@ -22,28 +22,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -55,6 +47,7 @@ public User id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -74,6 +67,7 @@ public User username(String username) { * Get username * @return username */ + @JsonProperty("username") @ApiModelProperty(value = "") public String getUsername() { @@ -93,6 +87,7 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ + @JsonProperty("firstName") @ApiModelProperty(value = "") public String getFirstName() { @@ -112,6 +107,7 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ + @JsonProperty("lastName") @ApiModelProperty(value = "") public String getLastName() { @@ -131,6 +127,7 @@ public User email(String email) { * Get email * @return email */ + @JsonProperty("email") @ApiModelProperty(value = "") public String getEmail() { @@ -150,6 +147,7 @@ public User password(String password) { * Get password * @return password */ + @JsonProperty("password") @ApiModelProperty(value = "") public String getPassword() { @@ -169,6 +167,7 @@ public User phone(String phone) { * Get phone * @return phone */ + @JsonProperty("phone") @ApiModelProperty(value = "") public String getPhone() { @@ -188,6 +187,7 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ + @JsonProperty("userStatus") @ApiModelProperty(value = "User Status") public Integer getUserStatus() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/XmlItem.java index 27d5f8282818..c795b4b85e6d 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/XmlItem.java @@ -25,99 +25,70 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class XmlItem { - @JsonProperty("attribute_string") private String attributeString; - @JsonProperty("attribute_number") private BigDecimal attributeNumber; - @JsonProperty("attribute_integer") private Integer attributeInteger; - @JsonProperty("attribute_boolean") private Boolean attributeBoolean; - @JsonProperty("wrapped_array") @Valid private List wrappedArray = null; - @JsonProperty("name_string") private String nameString; - @JsonProperty("name_number") private BigDecimal nameNumber; - @JsonProperty("name_integer") private Integer nameInteger; - @JsonProperty("name_boolean") private Boolean nameBoolean; - @JsonProperty("name_array") @Valid private List nameArray = null; - @JsonProperty("name_wrapped_array") @Valid private List nameWrappedArray = null; - @JsonProperty("prefix_string") private String prefixString; - @JsonProperty("prefix_number") private BigDecimal prefixNumber; - @JsonProperty("prefix_integer") private Integer prefixInteger; - @JsonProperty("prefix_boolean") private Boolean prefixBoolean; - @JsonProperty("prefix_array") @Valid private List prefixArray = null; - @JsonProperty("prefix_wrapped_array") @Valid private List prefixWrappedArray = null; - @JsonProperty("namespace_string") private String namespaceString; - @JsonProperty("namespace_number") private BigDecimal namespaceNumber; - @JsonProperty("namespace_integer") private Integer namespaceInteger; - @JsonProperty("namespace_boolean") private Boolean namespaceBoolean; - @JsonProperty("namespace_array") @Valid private List namespaceArray = null; - @JsonProperty("namespace_wrapped_array") @Valid private List namespaceWrappedArray = null; - @JsonProperty("prefix_ns_string") private String prefixNsString; - @JsonProperty("prefix_ns_number") private BigDecimal prefixNsNumber; - @JsonProperty("prefix_ns_integer") private Integer prefixNsInteger; - @JsonProperty("prefix_ns_boolean") private Boolean prefixNsBoolean; - @JsonProperty("prefix_ns_array") @Valid private List prefixNsArray = null; - @JsonProperty("prefix_ns_wrapped_array") @Valid private List prefixNsWrappedArray = null; @@ -130,6 +101,7 @@ public XmlItem attributeString(String attributeString) { * Get attributeString * @return attributeString */ + @JsonProperty("attribute_string") @ApiModelProperty(example = "string", value = "") public String getAttributeString() { @@ -149,6 +121,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) { * Get attributeNumber * @return attributeNumber */ + @JsonProperty("attribute_number") @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getAttributeNumber() { @@ -168,6 +141,7 @@ public XmlItem attributeInteger(Integer attributeInteger) { * Get attributeInteger * @return attributeInteger */ + @JsonProperty("attribute_integer") @ApiModelProperty(example = "-2", value = "") public Integer getAttributeInteger() { @@ -187,6 +161,7 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) { * Get attributeBoolean * @return attributeBoolean */ + @JsonProperty("attribute_boolean") @ApiModelProperty(example = "true", value = "") public Boolean getAttributeBoolean() { @@ -214,6 +189,7 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) { * Get wrappedArray * @return wrappedArray */ + @JsonProperty("wrapped_array") @ApiModelProperty(value = "") public List getWrappedArray() { @@ -233,6 +209,7 @@ public XmlItem nameString(String nameString) { * Get nameString * @return nameString */ + @JsonProperty("name_string") @ApiModelProperty(example = "string", value = "") public String getNameString() { @@ -252,6 +229,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) { * Get nameNumber * @return nameNumber */ + @JsonProperty("name_number") @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getNameNumber() { @@ -271,6 +249,7 @@ public XmlItem nameInteger(Integer nameInteger) { * Get nameInteger * @return nameInteger */ + @JsonProperty("name_integer") @ApiModelProperty(example = "-2", value = "") public Integer getNameInteger() { @@ -290,6 +269,7 @@ public XmlItem nameBoolean(Boolean nameBoolean) { * Get nameBoolean * @return nameBoolean */ + @JsonProperty("name_boolean") @ApiModelProperty(example = "true", value = "") public Boolean getNameBoolean() { @@ -317,6 +297,7 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) { * Get nameArray * @return nameArray */ + @JsonProperty("name_array") @ApiModelProperty(value = "") public List getNameArray() { @@ -344,6 +325,7 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) { * Get nameWrappedArray * @return nameWrappedArray */ + @JsonProperty("name_wrapped_array") @ApiModelProperty(value = "") public List getNameWrappedArray() { @@ -363,6 +345,7 @@ public XmlItem prefixString(String prefixString) { * Get prefixString * @return prefixString */ + @JsonProperty("prefix_string") @ApiModelProperty(example = "string", value = "") public String getPrefixString() { @@ -382,6 +365,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) { * Get prefixNumber * @return prefixNumber */ + @JsonProperty("prefix_number") @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getPrefixNumber() { @@ -401,6 +385,7 @@ public XmlItem prefixInteger(Integer prefixInteger) { * Get prefixInteger * @return prefixInteger */ + @JsonProperty("prefix_integer") @ApiModelProperty(example = "-2", value = "") public Integer getPrefixInteger() { @@ -420,6 +405,7 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) { * Get prefixBoolean * @return prefixBoolean */ + @JsonProperty("prefix_boolean") @ApiModelProperty(example = "true", value = "") public Boolean getPrefixBoolean() { @@ -447,6 +433,7 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) { * Get prefixArray * @return prefixArray */ + @JsonProperty("prefix_array") @ApiModelProperty(value = "") public List getPrefixArray() { @@ -474,6 +461,7 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) { * Get prefixWrappedArray * @return prefixWrappedArray */ + @JsonProperty("prefix_wrapped_array") @ApiModelProperty(value = "") public List getPrefixWrappedArray() { @@ -493,6 +481,7 @@ public XmlItem namespaceString(String namespaceString) { * Get namespaceString * @return namespaceString */ + @JsonProperty("namespace_string") @ApiModelProperty(example = "string", value = "") public String getNamespaceString() { @@ -512,6 +501,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) { * Get namespaceNumber * @return namespaceNumber */ + @JsonProperty("namespace_number") @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getNamespaceNumber() { @@ -531,6 +521,7 @@ public XmlItem namespaceInteger(Integer namespaceInteger) { * Get namespaceInteger * @return namespaceInteger */ + @JsonProperty("namespace_integer") @ApiModelProperty(example = "-2", value = "") public Integer getNamespaceInteger() { @@ -550,6 +541,7 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) { * Get namespaceBoolean * @return namespaceBoolean */ + @JsonProperty("namespace_boolean") @ApiModelProperty(example = "true", value = "") public Boolean getNamespaceBoolean() { @@ -577,6 +569,7 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) { * Get namespaceArray * @return namespaceArray */ + @JsonProperty("namespace_array") @ApiModelProperty(value = "") public List getNamespaceArray() { @@ -604,6 +597,7 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) { * Get namespaceWrappedArray * @return namespaceWrappedArray */ + @JsonProperty("namespace_wrapped_array") @ApiModelProperty(value = "") public List getNamespaceWrappedArray() { @@ -623,6 +617,7 @@ public XmlItem prefixNsString(String prefixNsString) { * Get prefixNsString * @return prefixNsString */ + @JsonProperty("prefix_ns_string") @ApiModelProperty(example = "string", value = "") public String getPrefixNsString() { @@ -642,6 +637,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) { * Get prefixNsNumber * @return prefixNsNumber */ + @JsonProperty("prefix_ns_number") @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getPrefixNsNumber() { @@ -661,6 +657,7 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) { * Get prefixNsInteger * @return prefixNsInteger */ + @JsonProperty("prefix_ns_integer") @ApiModelProperty(example = "-2", value = "") public Integer getPrefixNsInteger() { @@ -680,6 +677,7 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) { * Get prefixNsBoolean * @return prefixNsBoolean */ + @JsonProperty("prefix_ns_boolean") @ApiModelProperty(example = "true", value = "") public Boolean getPrefixNsBoolean() { @@ -707,6 +705,7 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) { * Get prefixNsArray * @return prefixNsArray */ + @JsonProperty("prefix_ns_array") @ApiModelProperty(value = "") public List getPrefixNsArray() { @@ -734,6 +733,7 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) { * Get prefixNsWrappedArray * @return prefixNsWrappedArray */ + @JsonProperty("prefix_ns_wrapped_array") @ApiModelProperty(value = "") public List getPrefixNsWrappedArray() { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 8e4c17989762..cb51920a8c28 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesAnyType extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesAnyType name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesAnyType name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 27a8f01607f1..1c66a636116f 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesArray extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesArray name(String name) { @@ -37,6 +36,7 @@ public AdditionalPropertiesArray name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index bc7b87d760a9..1dcc607639bf 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesBoolean extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesBoolean name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesBoolean name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index b5e88d5d7ccb..74250eb564ad 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -26,45 +26,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesClass { - @JsonProperty("map_string") @Valid private Map mapString = null; - @JsonProperty("map_number") @Valid private Map mapNumber = null; - @JsonProperty("map_integer") @Valid private Map mapInteger = null; - @JsonProperty("map_boolean") @Valid private Map mapBoolean = null; - @JsonProperty("map_array_integer") @Valid private Map> mapArrayInteger = null; - @JsonProperty("map_array_anytype") @Valid private Map> mapArrayAnytype = null; - @JsonProperty("map_map_string") @Valid private Map> mapMapString = null; - @JsonProperty("map_map_anytype") @Valid private Map> mapMapAnytype = null; - @JsonProperty("anytype_1") private Object anytype1; - @JsonProperty("anytype_2") private Object anytype2; - @JsonProperty("anytype_3") private Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { @@ -84,6 +73,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt * Get mapString * @return mapString */ + @JsonProperty("map_string") @ApiModelProperty(value = "") public Map getMapString() { @@ -111,6 +101,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * Get mapNumber * @return mapNumber */ + @JsonProperty("map_number") @Valid @ApiModelProperty(value = "") public Map getMapNumber() { @@ -138,6 +129,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege * Get mapInteger * @return mapInteger */ + @JsonProperty("map_integer") @ApiModelProperty(value = "") public Map getMapInteger() { @@ -165,6 +157,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea * Get mapBoolean * @return mapBoolean */ + @JsonProperty("map_boolean") @ApiModelProperty(value = "") public Map getMapBoolean() { @@ -192,6 +185,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { @@ -219,6 +213,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * Get mapArrayAnytype * @return mapArrayAnytype */ + @JsonProperty("map_array_anytype") @Valid @ApiModelProperty(value = "") public Map> getMapArrayAnytype() { @@ -246,6 +241,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { @@ -273,6 +269,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { @@ -292,6 +289,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) { * Get anytype1 * @return anytype1 */ + @JsonProperty("anytype_1") @ApiModelProperty(value = "") public Object getAnytype1() { @@ -311,6 +309,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) { * Get anytype2 * @return anytype2 */ + @JsonProperty("anytype_2") @ApiModelProperty(value = "") public Object getAnytype2() { @@ -330,6 +329,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) { * Get anytype3 * @return anytype3 */ + @JsonProperty("anytype_3") @ApiModelProperty(value = "") public Object getAnytype3() { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 00b5174e93b7..ce8b8d62436c 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesInteger extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesInteger name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesInteger name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 8fec423ffb1b..dec791e0a273 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesNumber extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesNumber name(String name) { @@ -37,6 +36,7 @@ public AdditionalPropertiesNumber name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 67033332b0d6..546d0ab9216f 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesObject extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesObject name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesObject name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 993f83bb2cc1..c1f95cf62e81 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesString extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesString name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesString name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Animal.java index 798ec01a7fbe..4673ab974ce8 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Animal.java @@ -37,10 +37,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Animal { - @JsonProperty("className") private String className; - @JsonProperty("color") private String color = "red"; public Animal className(String className) { @@ -52,6 +50,7 @@ public Animal className(String className) { * Get className * @return className */ + @JsonProperty("className") @NotNull @ApiModelProperty(required = true, value = "") public String getClassName() { @@ -71,6 +70,7 @@ public Animal color(String color) { * Get color * @return color */ + @JsonProperty("color") @ApiModelProperty(value = "") public String getColor() { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index df67eda87fd1..46ab3b631960 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfArrayOfNumberOnly { - @JsonProperty("ArrayArrayNumber") @Valid private List> arrayArrayNumber = null; @@ -46,6 +45,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * Get arrayArrayNumber * @return arrayArrayNumber */ + @JsonProperty("ArrayArrayNumber") @Valid @ApiModelProperty(value = "") public List> getArrayArrayNumber() { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 05f1ca376a68..cb5358905469 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfNumberOnly { - @JsonProperty("ArrayNumber") @Valid private List arrayNumber = null; @@ -46,6 +45,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ + @JsonProperty("ArrayNumber") @Valid @ApiModelProperty(value = "") public List getArrayNumber() { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayTest.java index ba67885edc8a..55cc431ecde6 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayTest.java @@ -25,15 +25,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayTest { - @JsonProperty("array_of_string") @Valid private List arrayOfString = null; - @JsonProperty("array_array_of_integer") @Valid private List> arrayArrayOfInteger = null; - @JsonProperty("array_array_of_model") @Valid private List> arrayArrayOfModel = null; @@ -54,6 +51,7 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) { * Get arrayOfString * @return arrayOfString */ + @JsonProperty("array_of_string") @ApiModelProperty(value = "") public List getArrayOfString() { @@ -81,6 +79,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ + @JsonProperty("array_array_of_integer") @Valid @ApiModelProperty(value = "") public List> getArrayArrayOfInteger() { @@ -108,6 +107,7 @@ public ArrayTest addArrayArrayOfModelItem(List arrayArrayOfModelI * Get arrayArrayOfModel * @return arrayArrayOfModel */ + @JsonProperty("array_array_of_model") @Valid @ApiModelProperty(value = "") public List> getArrayArrayOfModel() { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Capitalization.java index e9cce9de0115..e0fdbe78bae2 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Capitalization.java @@ -22,22 +22,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Capitalization { - @JsonProperty("smallCamel") private String smallCamel; - @JsonProperty("CapitalCamel") private String capitalCamel; - @JsonProperty("small_Snake") private String smallSnake; - @JsonProperty("Capital_Snake") private String capitalSnake; - @JsonProperty("SCA_ETH_Flow_Points") private String scAETHFlowPoints; - @JsonProperty("ATT_NAME") private String ATT_NAME; public Capitalization smallCamel(String smallCamel) { @@ -49,6 +43,7 @@ public Capitalization smallCamel(String smallCamel) { * Get smallCamel * @return smallCamel */ + @JsonProperty("smallCamel") @ApiModelProperty(value = "") public String getSmallCamel() { @@ -68,6 +63,7 @@ public Capitalization capitalCamel(String capitalCamel) { * Get capitalCamel * @return capitalCamel */ + @JsonProperty("CapitalCamel") @ApiModelProperty(value = "") public String getCapitalCamel() { @@ -87,6 +83,7 @@ public Capitalization smallSnake(String smallSnake) { * Get smallSnake * @return smallSnake */ + @JsonProperty("small_Snake") @ApiModelProperty(value = "") public String getSmallSnake() { @@ -106,6 +103,7 @@ public Capitalization capitalSnake(String capitalSnake) { * Get capitalSnake * @return capitalSnake */ + @JsonProperty("Capital_Snake") @ApiModelProperty(value = "") public String getCapitalSnake() { @@ -125,6 +123,7 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) { * Get scAETHFlowPoints * @return scAETHFlowPoints */ + @JsonProperty("SCA_ETH_Flow_Points") @ApiModelProperty(value = "") public String getScAETHFlowPoints() { @@ -144,6 +143,7 @@ public Capitalization ATT_NAME(String ATT_NAME) { * Name of the pet * @return ATT_NAME */ + @JsonProperty("ATT_NAME") @ApiModelProperty(value = "Name of the pet ") public String getATTNAME() { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Cat.java index 9c77b07695d5..9b798b7b5a25 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Cat.java @@ -27,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Cat extends Animal { - @JsonProperty("declawed") private Boolean declawed; public Cat declawed(Boolean declawed) { @@ -39,6 +38,7 @@ public Cat declawed(Boolean declawed) { * Get declawed * @return declawed */ + @JsonProperty("declawed") @ApiModelProperty(value = "") public Boolean getDeclawed() { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/CatAllOf.java index eed74bea751a..63de2ad8818e 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/CatAllOf.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/CatAllOf.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class CatAllOf { - @JsonProperty("declawed") private Boolean declawed; public CatAllOf declawed(Boolean declawed) { @@ -36,6 +35,7 @@ public CatAllOf declawed(Boolean declawed) { * Get declawed * @return declawed */ + @JsonProperty("declawed") @ApiModelProperty(value = "") public Boolean getDeclawed() { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Category.java index 27a4a9f25665..b63268b2c8ce 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Category.java @@ -22,10 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name = "default-name"; public Category id(Long id) { @@ -37,6 +35,7 @@ public Category id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -56,6 +55,7 @@ public Category name(String name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @ApiModelProperty(required = true, value = "") public String getName() { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ClassModel.java index 69296da7e60e..976f0b01d071 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ClassModel.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ClassModel { - @JsonProperty("_class") private String propertyClass; public ClassModel propertyClass(String propertyClass) { @@ -35,6 +34,7 @@ public ClassModel propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ + @JsonProperty("_class") @ApiModelProperty(value = "") public String getPropertyClass() { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Client.java index b788daea14a3..a3c4731f3339 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Client.java @@ -22,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Client { - @JsonProperty("client") private String client; public Client client(String client) { @@ -34,6 +33,7 @@ public Client client(String client) { * Get client * @return client */ + @JsonProperty("client") @ApiModelProperty(value = "") public String getClient() { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Dog.java index 9b61a2fa29b6..593562fabb42 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Dog.java @@ -27,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Dog extends Animal { - @JsonProperty("breed") private String breed; public Dog breed(String breed) { @@ -39,6 +38,7 @@ public Dog breed(String breed) { * Get breed * @return breed */ + @JsonProperty("breed") @ApiModelProperty(value = "") public String getBreed() { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/DogAllOf.java index 4f275e535333..7ddb24717737 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/DogAllOf.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/DogAllOf.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class DogAllOf { - @JsonProperty("breed") private String breed; public DogAllOf breed(String breed) { @@ -36,6 +35,7 @@ public DogAllOf breed(String breed) { * Get breed * @return breed */ + @JsonProperty("breed") @ApiModelProperty(value = "") public String getBreed() { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumArrays.java index dba32cf2b710..04e850b1cf17 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumArrays.java @@ -60,7 +60,6 @@ public static JustSymbolEnum fromValue(String value) { } } - @JsonProperty("just_symbol") private JustSymbolEnum justSymbol; /** @@ -98,7 +97,6 @@ public static ArrayEnumEnum fromValue(String value) { } } - @JsonProperty("array_enum") @Valid private List arrayEnum = null; @@ -111,6 +109,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) { * Get justSymbol * @return justSymbol */ + @JsonProperty("just_symbol") @ApiModelProperty(value = "") public JustSymbolEnum getJustSymbol() { @@ -138,6 +137,7 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) { * Get arrayEnum * @return arrayEnum */ + @JsonProperty("array_enum") @ApiModelProperty(value = "") public List getArrayEnum() { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumTest.java index c20bc1460143..49747f67dccf 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumTest.java @@ -63,7 +63,6 @@ public static EnumStringEnum fromValue(String value) { } } - @JsonProperty("enum_string") private EnumStringEnum enumString; /** @@ -103,7 +102,6 @@ public static EnumStringRequiredEnum fromValue(String value) { } } - @JsonProperty("enum_string_required") private EnumStringRequiredEnum enumStringRequired; /** @@ -141,7 +139,6 @@ public static EnumIntegerEnum fromValue(Integer value) { } } - @JsonProperty("enum_integer") private EnumIntegerEnum enumInteger; /** @@ -179,10 +176,8 @@ public static EnumNumberEnum fromValue(Double value) { } } - @JsonProperty("enum_number") private EnumNumberEnum enumNumber; - @JsonProperty("outerEnum") private OuterEnum outerEnum; public EnumTest enumString(EnumStringEnum enumString) { @@ -194,6 +189,7 @@ public EnumTest enumString(EnumStringEnum enumString) { * Get enumString * @return enumString */ + @JsonProperty("enum_string") @ApiModelProperty(value = "") public EnumStringEnum getEnumString() { @@ -213,6 +209,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) { * Get enumStringRequired * @return enumStringRequired */ + @JsonProperty("enum_string_required") @NotNull @ApiModelProperty(required = true, value = "") public EnumStringRequiredEnum getEnumStringRequired() { @@ -232,6 +229,7 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) { * Get enumInteger * @return enumInteger */ + @JsonProperty("enum_integer") @ApiModelProperty(value = "") public EnumIntegerEnum getEnumInteger() { @@ -251,6 +249,7 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) { * Get enumNumber * @return enumNumber */ + @JsonProperty("enum_number") @ApiModelProperty(value = "") public EnumNumberEnum getEnumNumber() { @@ -270,6 +269,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) { * Get outerEnum * @return outerEnum */ + @JsonProperty("outerEnum") @Valid @ApiModelProperty(value = "") public OuterEnum getOuterEnum() { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/File.java index d82e4902623d..43c44fd344bb 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/File.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/File.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class File { - @JsonProperty("sourceURI") private String sourceURI; public File sourceURI(String sourceURI) { @@ -35,6 +34,7 @@ public File sourceURI(String sourceURI) { * Test capitalization * @return sourceURI */ + @JsonProperty("sourceURI") @ApiModelProperty(value = "Test capitalization") public String getSourceURI() { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 2ea153bd6468..d7815943b774 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -25,10 +25,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FileSchemaTestClass { - @JsonProperty("file") private File file; - @JsonProperty("files") @Valid private List files = null; @@ -41,6 +39,7 @@ public FileSchemaTestClass file(File file) { * Get file * @return file */ + @JsonProperty("file") @Valid @ApiModelProperty(value = "") public File getFile() { @@ -68,6 +67,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) { * Get files * @return files */ + @JsonProperty("files") @Valid @ApiModelProperty(value = "") public List getFiles() { 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 0e2aeaa78a22..ffd18f0ce221 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 @@ -30,48 +30,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FormatTest { - @JsonProperty("integer") private Integer integer; - @JsonProperty("int32") private Integer int32; - @JsonProperty("int64") private Long int64; - @JsonProperty("number") private BigDecimal number; - @JsonProperty("float") private Float _float; - @JsonProperty("double") private Double _double; - @JsonProperty("string") private String string; - @JsonProperty("byte") private byte[] _byte; - @JsonProperty("binary") private org.springframework.core.io.Resource binary; - @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("password") private String password; - @JsonProperty("BigDecimal") private BigDecimal bigDecimal; public FormatTest integer(Integer integer) { @@ -85,6 +71,7 @@ public FormatTest integer(Integer integer) { * maximum: 100 * @return integer */ + @JsonProperty("integer") @Min(10) @Max(100) @ApiModelProperty(value = "") public Integer getInteger() { @@ -106,6 +93,7 @@ public FormatTest int32(Integer int32) { * maximum: 200 * @return int32 */ + @JsonProperty("int32") @Min(20) @Max(200) @ApiModelProperty(value = "") public Integer getInt32() { @@ -125,6 +113,7 @@ public FormatTest int64(Long int64) { * Get int64 * @return int64 */ + @JsonProperty("int64") @ApiModelProperty(value = "") public Long getInt64() { @@ -146,6 +135,7 @@ public FormatTest number(BigDecimal number) { * maximum: 543.2 * @return number */ + @JsonProperty("number") @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") @ApiModelProperty(required = true, value = "") public BigDecimal getNumber() { @@ -167,6 +157,7 @@ public FormatTest _float(Float _float) { * maximum: 987.6 * @return _float */ + @JsonProperty("float") @DecimalMin("54.3") @DecimalMax("987.6") @ApiModelProperty(value = "") public Float getFloat() { @@ -188,6 +179,7 @@ public FormatTest _double(Double _double) { * maximum: 123.4 * @return _double */ + @JsonProperty("double") @DecimalMin("67.8") @DecimalMax("123.4") @ApiModelProperty(value = "") public Double getDouble() { @@ -207,6 +199,7 @@ public FormatTest string(String string) { * Get string * @return string */ + @JsonProperty("string") @Pattern(regexp = "/[a-z]/i") @ApiModelProperty(value = "") public String getString() { @@ -226,6 +219,7 @@ public FormatTest _byte(byte[] _byte) { * Get _byte * @return _byte */ + @JsonProperty("byte") @NotNull @ApiModelProperty(required = true, value = "") public byte[] getByte() { @@ -245,6 +239,7 @@ public FormatTest binary(org.springframework.core.io.Resource binary) { * Get binary * @return binary */ + @JsonProperty("binary") @Valid @ApiModelProperty(value = "") public org.springframework.core.io.Resource getBinary() { @@ -264,6 +259,7 @@ public FormatTest date(LocalDate date) { * Get date * @return date */ + @JsonProperty("date") @NotNull @Valid @ApiModelProperty(required = true, value = "") public LocalDate getDate() { @@ -283,6 +279,7 @@ public FormatTest dateTime(OffsetDateTime dateTime) { * Get dateTime * @return dateTime */ + @JsonProperty("dateTime") @Valid @ApiModelProperty(value = "") public OffsetDateTime getDateTime() { @@ -302,6 +299,7 @@ public FormatTest uuid(UUID uuid) { * Get uuid * @return uuid */ + @JsonProperty("uuid") @Valid @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") public UUID getUuid() { @@ -321,6 +319,7 @@ public FormatTest password(String password) { * Get password * @return password */ + @JsonProperty("password") @NotNull @Size(min = 10, max = 64) @ApiModelProperty(required = true, value = "") public String getPassword() { @@ -340,6 +339,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) { * Get bigDecimal * @return bigDecimal */ + @JsonProperty("BigDecimal") @Valid @ApiModelProperty(value = "") public BigDecimal getBigDecimal() { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index 224b16d1a2d3..948ed9a0731d 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -24,10 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class HasOnlyReadOnly { - @JsonProperty("bar") private String bar; - @JsonProperty("foo") private String foo; public HasOnlyReadOnly bar(String bar) { @@ -39,6 +37,7 @@ public HasOnlyReadOnly bar(String bar) { * Get bar * @return bar */ + @JsonProperty("bar") @ApiModelProperty(readOnly = true, value = "") public String getBar() { @@ -58,6 +57,7 @@ public HasOnlyReadOnly foo(String foo) { * Get foo * @return foo */ + @JsonProperty("foo") @ApiModelProperty(readOnly = true, value = "") public String getFoo() { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MapTest.java index f2867ac50403..94d4ae9a9d56 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MapTest.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MapTest { - @JsonProperty("map_map_of_string") @Valid private Map> mapMapOfString = null; @@ -64,15 +63,12 @@ public static InnerEnum fromValue(String value) { } } - @JsonProperty("map_of_enum_string") @Valid private Map mapOfEnumString = null; - @JsonProperty("direct_map") @Valid private Map directMap = null; - @JsonProperty("indirect_map") @Valid private Map indirectMap = null; @@ -93,6 +89,7 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapMapOfString * @return mapMapOfString */ + @JsonProperty("map_map_of_string") @Valid @ApiModelProperty(value = "") public Map> getMapMapOfString() { @@ -120,6 +117,7 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) * Get mapOfEnumString * @return mapOfEnumString */ + @JsonProperty("map_of_enum_string") @ApiModelProperty(value = "") public Map getMapOfEnumString() { @@ -147,6 +145,7 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) { * Get directMap * @return directMap */ + @JsonProperty("direct_map") @ApiModelProperty(value = "") public Map getDirectMap() { @@ -174,6 +173,7 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) { * Get indirectMap * @return indirectMap */ + @JsonProperty("indirect_map") @ApiModelProperty(value = "") public Map getIndirectMap() { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 901c65b2924d..89a2475d82fb 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -28,14 +28,11 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("map") @Valid private Map map = null; @@ -48,6 +45,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { * Get uuid * @return uuid */ + @JsonProperty("uuid") @Valid @ApiModelProperty(value = "") public UUID getUuid() { @@ -67,6 +65,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT * Get dateTime * @return dateTime */ + @JsonProperty("dateTime") @Valid @ApiModelProperty(value = "") public OffsetDateTime getDateTime() { @@ -94,6 +93,7 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * Get map * @return map */ + @JsonProperty("map") @Valid @ApiModelProperty(value = "") public Map getMap() { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Model200Response.java index 36dfd34883e8..220b6493f31a 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Model200Response.java @@ -25,10 +25,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Model200Response { - @JsonProperty("name") private Integer name; - @JsonProperty("class") private String propertyClass; public Model200Response name(Integer name) { @@ -40,6 +38,7 @@ public Model200Response name(Integer name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public Integer getName() { @@ -59,6 +58,7 @@ public Model200Response propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ + @JsonProperty("class") @ApiModelProperty(value = "") public String getPropertyClass() { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelApiResponse.java index dfba6cb672d4..29f3f43cf20e 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -24,13 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -42,6 +39,7 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ + @JsonProperty("code") @ApiModelProperty(value = "") public Integer getCode() { @@ -61,6 +59,7 @@ public ModelApiResponse type(String type) { * Get type * @return type */ + @JsonProperty("type") @ApiModelProperty(value = "") public String getType() { @@ -80,6 +79,7 @@ public ModelApiResponse message(String message) { * Get message * @return message */ + @JsonProperty("message") @ApiModelProperty(value = "") public String getMessage() { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelList.java index 97ddf5359aa0..a374fe83d52a 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelList.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelList { - @JsonProperty("123-list") private String _123list; public ModelList _123list(String _123list) { @@ -36,6 +35,7 @@ public ModelList _123list(String _123list) { * Get _123list * @return _123list */ + @JsonProperty("123-list") @ApiModelProperty(value = "") public String get123list() { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelReturn.java index 4505ddfeeeca..d8fc618d9dfb 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelReturn.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelReturn { - @JsonProperty("return") private Integer _return; public ModelReturn _return(Integer _return) { @@ -37,6 +36,7 @@ public ModelReturn _return(Integer _return) { * Get _return * @return _return */ + @JsonProperty("return") @ApiModelProperty(value = "") public Integer getReturn() { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Name.java index 51cc37bbeea7..054901b488d6 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Name.java @@ -23,16 +23,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Name { - @JsonProperty("name") private Integer name; - @JsonProperty("snake_case") private Integer snakeCase; - @JsonProperty("property") private String property; - @JsonProperty("123Number") private Integer _123number; public Name name(Integer name) { @@ -44,6 +40,7 @@ public Name name(Integer name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @ApiModelProperty(required = true, value = "") public Integer getName() { @@ -63,6 +60,7 @@ public Name snakeCase(Integer snakeCase) { * Get snakeCase * @return snakeCase */ + @JsonProperty("snake_case") @ApiModelProperty(readOnly = true, value = "") public Integer getSnakeCase() { @@ -82,6 +80,7 @@ public Name property(String property) { * Get property * @return property */ + @JsonProperty("property") @ApiModelProperty(value = "") public String getProperty() { @@ -101,6 +100,7 @@ public Name _123number(Integer _123number) { * Get _123number * @return _123number */ + @JsonProperty("123Number") @ApiModelProperty(readOnly = true, value = "") public Integer get123number() { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/NumberOnly.java index 278146bfb899..8f2f2b19b191 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/NumberOnly.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class NumberOnly { - @JsonProperty("JustNumber") private BigDecimal justNumber; public NumberOnly justNumber(BigDecimal justNumber) { @@ -35,6 +34,7 @@ public NumberOnly justNumber(BigDecimal justNumber) { * Get justNumber * @return justNumber */ + @JsonProperty("JustNumber") @Valid @ApiModelProperty(value = "") public BigDecimal getJustNumber() { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Order.java index 9a9ed4f6c960..feac4d2cad8d 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Order.java @@ -25,16 +25,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -75,10 +71,8 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -90,6 +84,7 @@ public Order id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -109,6 +104,7 @@ public Order petId(Long petId) { * Get petId * @return petId */ + @JsonProperty("petId") @ApiModelProperty(value = "") public Long getPetId() { @@ -128,6 +124,7 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ + @JsonProperty("quantity") @ApiModelProperty(value = "") public Integer getQuantity() { @@ -147,6 +144,7 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ + @JsonProperty("shipDate") @Valid @ApiModelProperty(value = "") public OffsetDateTime getShipDate() { @@ -166,6 +164,7 @@ public Order status(StatusEnum status) { * Order Status * @return status */ + @JsonProperty("status") @ApiModelProperty(value = "Order Status") public StatusEnum getStatus() { @@ -185,6 +184,7 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ + @JsonProperty("complete") @ApiModelProperty(value = "") public Boolean getComplete() { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/OuterComposite.java index c1a709bb26ad..00cce99097d7 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/OuterComposite.java @@ -23,13 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class OuterComposite { - @JsonProperty("my_number") private BigDecimal myNumber; - @JsonProperty("my_string") private String myString; - @JsonProperty("my_boolean") private Boolean myBoolean; public OuterComposite myNumber(BigDecimal myNumber) { @@ -41,6 +38,7 @@ public OuterComposite myNumber(BigDecimal myNumber) { * Get myNumber * @return myNumber */ + @JsonProperty("my_number") @Valid @ApiModelProperty(value = "") public BigDecimal getMyNumber() { @@ -60,6 +58,7 @@ public OuterComposite myString(String myString) { * Get myString * @return myString */ + @JsonProperty("my_string") @ApiModelProperty(value = "") public String getMyString() { @@ -79,6 +78,7 @@ public OuterComposite myBoolean(Boolean myBoolean) { * Get myBoolean * @return myBoolean */ + @JsonProperty("my_boolean") @ApiModelProperty(value = "") public Boolean getMyBoolean() { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Pet.java index f8fa05d91c38..1d8ef7f7160f 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Pet.java @@ -27,20 +27,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private List photoUrls = new ArrayList<>(); - @JsonProperty("tags") @Valid private List tags = null; @@ -81,7 +76,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; public Pet id(Long id) { @@ -93,6 +87,7 @@ public Pet id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -112,6 +107,7 @@ public Pet category(Category category) { * Get category * @return category */ + @JsonProperty("category") @Valid @ApiModelProperty(value = "") public Category getCategory() { @@ -131,6 +127,7 @@ public Pet name(String name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") public String getName() { @@ -155,6 +152,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ + @JsonProperty("photoUrls") @NotNull @ApiModelProperty(required = true, value = "") public List getPhotoUrls() { @@ -182,6 +180,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ + @JsonProperty("tags") @Valid @ApiModelProperty(value = "") public List getTags() { @@ -201,6 +200,7 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ + @JsonProperty("status") @ApiModelProperty(value = "pet status in the store") public StatusEnum getStatus() { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java index b7a0a416782e..d02b8c8cfd53 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -22,10 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ReadOnlyFirst { - @JsonProperty("bar") private String bar; - @JsonProperty("baz") private String baz; public ReadOnlyFirst bar(String bar) { @@ -37,6 +35,7 @@ public ReadOnlyFirst bar(String bar) { * Get bar * @return bar */ + @JsonProperty("bar") @ApiModelProperty(readOnly = true, value = "") public String getBar() { @@ -56,6 +55,7 @@ public ReadOnlyFirst baz(String baz) { * Get baz * @return baz */ + @JsonProperty("baz") @ApiModelProperty(value = "") public String getBaz() { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java index f321ab78cd56..8f176362e027 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class SpecialModelName { - @JsonProperty("$special[property.name]") private Long $specialPropertyName; public SpecialModelName $specialPropertyName(Long $specialPropertyName) { @@ -36,6 +35,7 @@ public class SpecialModelName { * Get $specialPropertyName * @return $specialPropertyName */ + @JsonProperty("$special[property.name]") @ApiModelProperty(value = "") public Long get$SpecialPropertyName() { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Tag.java index 6161be4a9229..f7797bef2f19 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Tag.java @@ -22,10 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -37,6 +35,7 @@ public Tag id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -56,6 +55,7 @@ public Tag name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java index f10cff73bb78..506efbf431c1 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -25,19 +25,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderDefault { - @JsonProperty("string_item") private String stringItem = "what"; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem = true; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -50,6 +45,7 @@ public TypeHolderDefault stringItem(String stringItem) { * Get stringItem * @return stringItem */ + @JsonProperty("string_item") @NotNull @ApiModelProperty(required = true, value = "") public String getStringItem() { @@ -69,6 +65,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ + @JsonProperty("number_item") @NotNull @Valid @ApiModelProperty(required = true, value = "") public BigDecimal getNumberItem() { @@ -88,6 +85,7 @@ public TypeHolderDefault integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ + @JsonProperty("integer_item") @NotNull @ApiModelProperty(required = true, value = "") public Integer getIntegerItem() { @@ -107,6 +105,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ + @JsonProperty("bool_item") @NotNull @ApiModelProperty(required = true, value = "") public Boolean getBoolItem() { @@ -131,6 +130,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ + @JsonProperty("array_item") @NotNull @ApiModelProperty(required = true, value = "") public List getArrayItem() { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java index d2ae69a4e5a8..806c0c90fa18 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -25,22 +25,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderExample { - @JsonProperty("string_item") private String stringItem; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("float_item") private Float floatItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -53,6 +47,7 @@ public TypeHolderExample stringItem(String stringItem) { * Get stringItem * @return stringItem */ + @JsonProperty("string_item") @NotNull @ApiModelProperty(example = "what", required = true, value = "") public String getStringItem() { @@ -72,6 +67,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ + @JsonProperty("number_item") @NotNull @Valid @ApiModelProperty(example = "1.234", required = true, value = "") public BigDecimal getNumberItem() { @@ -91,6 +87,7 @@ public TypeHolderExample floatItem(Float floatItem) { * Get floatItem * @return floatItem */ + @JsonProperty("float_item") @NotNull @ApiModelProperty(example = "1.234", required = true, value = "") public Float getFloatItem() { @@ -110,6 +107,7 @@ public TypeHolderExample integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ + @JsonProperty("integer_item") @NotNull @ApiModelProperty(example = "-2", required = true, value = "") public Integer getIntegerItem() { @@ -129,6 +127,7 @@ public TypeHolderExample boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ + @JsonProperty("bool_item") @NotNull @ApiModelProperty(example = "true", required = true, value = "") public Boolean getBoolItem() { @@ -153,6 +152,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ + @JsonProperty("array_item") @NotNull @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "") public List getArrayItem() { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/User.java index ec85459bc99a..f42832389ffe 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/User.java @@ -22,28 +22,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -55,6 +47,7 @@ public User id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -74,6 +67,7 @@ public User username(String username) { * Get username * @return username */ + @JsonProperty("username") @ApiModelProperty(value = "") public String getUsername() { @@ -93,6 +87,7 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ + @JsonProperty("firstName") @ApiModelProperty(value = "") public String getFirstName() { @@ -112,6 +107,7 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ + @JsonProperty("lastName") @ApiModelProperty(value = "") public String getLastName() { @@ -131,6 +127,7 @@ public User email(String email) { * Get email * @return email */ + @JsonProperty("email") @ApiModelProperty(value = "") public String getEmail() { @@ -150,6 +147,7 @@ public User password(String password) { * Get password * @return password */ + @JsonProperty("password") @ApiModelProperty(value = "") public String getPassword() { @@ -169,6 +167,7 @@ public User phone(String phone) { * Get phone * @return phone */ + @JsonProperty("phone") @ApiModelProperty(value = "") public String getPhone() { @@ -188,6 +187,7 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ + @JsonProperty("userStatus") @ApiModelProperty(value = "User Status") public Integer getUserStatus() { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/XmlItem.java index 27d5f8282818..c795b4b85e6d 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/XmlItem.java @@ -25,99 +25,70 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class XmlItem { - @JsonProperty("attribute_string") private String attributeString; - @JsonProperty("attribute_number") private BigDecimal attributeNumber; - @JsonProperty("attribute_integer") private Integer attributeInteger; - @JsonProperty("attribute_boolean") private Boolean attributeBoolean; - @JsonProperty("wrapped_array") @Valid private List wrappedArray = null; - @JsonProperty("name_string") private String nameString; - @JsonProperty("name_number") private BigDecimal nameNumber; - @JsonProperty("name_integer") private Integer nameInteger; - @JsonProperty("name_boolean") private Boolean nameBoolean; - @JsonProperty("name_array") @Valid private List nameArray = null; - @JsonProperty("name_wrapped_array") @Valid private List nameWrappedArray = null; - @JsonProperty("prefix_string") private String prefixString; - @JsonProperty("prefix_number") private BigDecimal prefixNumber; - @JsonProperty("prefix_integer") private Integer prefixInteger; - @JsonProperty("prefix_boolean") private Boolean prefixBoolean; - @JsonProperty("prefix_array") @Valid private List prefixArray = null; - @JsonProperty("prefix_wrapped_array") @Valid private List prefixWrappedArray = null; - @JsonProperty("namespace_string") private String namespaceString; - @JsonProperty("namespace_number") private BigDecimal namespaceNumber; - @JsonProperty("namespace_integer") private Integer namespaceInteger; - @JsonProperty("namespace_boolean") private Boolean namespaceBoolean; - @JsonProperty("namespace_array") @Valid private List namespaceArray = null; - @JsonProperty("namespace_wrapped_array") @Valid private List namespaceWrappedArray = null; - @JsonProperty("prefix_ns_string") private String prefixNsString; - @JsonProperty("prefix_ns_number") private BigDecimal prefixNsNumber; - @JsonProperty("prefix_ns_integer") private Integer prefixNsInteger; - @JsonProperty("prefix_ns_boolean") private Boolean prefixNsBoolean; - @JsonProperty("prefix_ns_array") @Valid private List prefixNsArray = null; - @JsonProperty("prefix_ns_wrapped_array") @Valid private List prefixNsWrappedArray = null; @@ -130,6 +101,7 @@ public XmlItem attributeString(String attributeString) { * Get attributeString * @return attributeString */ + @JsonProperty("attribute_string") @ApiModelProperty(example = "string", value = "") public String getAttributeString() { @@ -149,6 +121,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) { * Get attributeNumber * @return attributeNumber */ + @JsonProperty("attribute_number") @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getAttributeNumber() { @@ -168,6 +141,7 @@ public XmlItem attributeInteger(Integer attributeInteger) { * Get attributeInteger * @return attributeInteger */ + @JsonProperty("attribute_integer") @ApiModelProperty(example = "-2", value = "") public Integer getAttributeInteger() { @@ -187,6 +161,7 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) { * Get attributeBoolean * @return attributeBoolean */ + @JsonProperty("attribute_boolean") @ApiModelProperty(example = "true", value = "") public Boolean getAttributeBoolean() { @@ -214,6 +189,7 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) { * Get wrappedArray * @return wrappedArray */ + @JsonProperty("wrapped_array") @ApiModelProperty(value = "") public List getWrappedArray() { @@ -233,6 +209,7 @@ public XmlItem nameString(String nameString) { * Get nameString * @return nameString */ + @JsonProperty("name_string") @ApiModelProperty(example = "string", value = "") public String getNameString() { @@ -252,6 +229,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) { * Get nameNumber * @return nameNumber */ + @JsonProperty("name_number") @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getNameNumber() { @@ -271,6 +249,7 @@ public XmlItem nameInteger(Integer nameInteger) { * Get nameInteger * @return nameInteger */ + @JsonProperty("name_integer") @ApiModelProperty(example = "-2", value = "") public Integer getNameInteger() { @@ -290,6 +269,7 @@ public XmlItem nameBoolean(Boolean nameBoolean) { * Get nameBoolean * @return nameBoolean */ + @JsonProperty("name_boolean") @ApiModelProperty(example = "true", value = "") public Boolean getNameBoolean() { @@ -317,6 +297,7 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) { * Get nameArray * @return nameArray */ + @JsonProperty("name_array") @ApiModelProperty(value = "") public List getNameArray() { @@ -344,6 +325,7 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) { * Get nameWrappedArray * @return nameWrappedArray */ + @JsonProperty("name_wrapped_array") @ApiModelProperty(value = "") public List getNameWrappedArray() { @@ -363,6 +345,7 @@ public XmlItem prefixString(String prefixString) { * Get prefixString * @return prefixString */ + @JsonProperty("prefix_string") @ApiModelProperty(example = "string", value = "") public String getPrefixString() { @@ -382,6 +365,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) { * Get prefixNumber * @return prefixNumber */ + @JsonProperty("prefix_number") @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getPrefixNumber() { @@ -401,6 +385,7 @@ public XmlItem prefixInteger(Integer prefixInteger) { * Get prefixInteger * @return prefixInteger */ + @JsonProperty("prefix_integer") @ApiModelProperty(example = "-2", value = "") public Integer getPrefixInteger() { @@ -420,6 +405,7 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) { * Get prefixBoolean * @return prefixBoolean */ + @JsonProperty("prefix_boolean") @ApiModelProperty(example = "true", value = "") public Boolean getPrefixBoolean() { @@ -447,6 +433,7 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) { * Get prefixArray * @return prefixArray */ + @JsonProperty("prefix_array") @ApiModelProperty(value = "") public List getPrefixArray() { @@ -474,6 +461,7 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) { * Get prefixWrappedArray * @return prefixWrappedArray */ + @JsonProperty("prefix_wrapped_array") @ApiModelProperty(value = "") public List getPrefixWrappedArray() { @@ -493,6 +481,7 @@ public XmlItem namespaceString(String namespaceString) { * Get namespaceString * @return namespaceString */ + @JsonProperty("namespace_string") @ApiModelProperty(example = "string", value = "") public String getNamespaceString() { @@ -512,6 +501,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) { * Get namespaceNumber * @return namespaceNumber */ + @JsonProperty("namespace_number") @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getNamespaceNumber() { @@ -531,6 +521,7 @@ public XmlItem namespaceInteger(Integer namespaceInteger) { * Get namespaceInteger * @return namespaceInteger */ + @JsonProperty("namespace_integer") @ApiModelProperty(example = "-2", value = "") public Integer getNamespaceInteger() { @@ -550,6 +541,7 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) { * Get namespaceBoolean * @return namespaceBoolean */ + @JsonProperty("namespace_boolean") @ApiModelProperty(example = "true", value = "") public Boolean getNamespaceBoolean() { @@ -577,6 +569,7 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) { * Get namespaceArray * @return namespaceArray */ + @JsonProperty("namespace_array") @ApiModelProperty(value = "") public List getNamespaceArray() { @@ -604,6 +597,7 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) { * Get namespaceWrappedArray * @return namespaceWrappedArray */ + @JsonProperty("namespace_wrapped_array") @ApiModelProperty(value = "") public List getNamespaceWrappedArray() { @@ -623,6 +617,7 @@ public XmlItem prefixNsString(String prefixNsString) { * Get prefixNsString * @return prefixNsString */ + @JsonProperty("prefix_ns_string") @ApiModelProperty(example = "string", value = "") public String getPrefixNsString() { @@ -642,6 +637,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) { * Get prefixNsNumber * @return prefixNsNumber */ + @JsonProperty("prefix_ns_number") @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getPrefixNsNumber() { @@ -661,6 +657,7 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) { * Get prefixNsInteger * @return prefixNsInteger */ + @JsonProperty("prefix_ns_integer") @ApiModelProperty(example = "-2", value = "") public Integer getPrefixNsInteger() { @@ -680,6 +677,7 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) { * Get prefixNsBoolean * @return prefixNsBoolean */ + @JsonProperty("prefix_ns_boolean") @ApiModelProperty(example = "true", value = "") public Boolean getPrefixNsBoolean() { @@ -707,6 +705,7 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) { * Get prefixNsArray * @return prefixNsArray */ + @JsonProperty("prefix_ns_array") @ApiModelProperty(value = "") public List getPrefixNsArray() { @@ -734,6 +733,7 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) { * Get prefixNsWrappedArray * @return prefixNsWrappedArray */ + @JsonProperty("prefix_ns_wrapped_array") @ApiModelProperty(value = "") public List getPrefixNsWrappedArray() { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 8e4c17989762..cb51920a8c28 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesAnyType extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesAnyType name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesAnyType name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 27a8f01607f1..1c66a636116f 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesArray extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesArray name(String name) { @@ -37,6 +36,7 @@ public AdditionalPropertiesArray name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index bc7b87d760a9..1dcc607639bf 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesBoolean extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesBoolean name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesBoolean name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index b5e88d5d7ccb..74250eb564ad 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -26,45 +26,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesClass { - @JsonProperty("map_string") @Valid private Map mapString = null; - @JsonProperty("map_number") @Valid private Map mapNumber = null; - @JsonProperty("map_integer") @Valid private Map mapInteger = null; - @JsonProperty("map_boolean") @Valid private Map mapBoolean = null; - @JsonProperty("map_array_integer") @Valid private Map> mapArrayInteger = null; - @JsonProperty("map_array_anytype") @Valid private Map> mapArrayAnytype = null; - @JsonProperty("map_map_string") @Valid private Map> mapMapString = null; - @JsonProperty("map_map_anytype") @Valid private Map> mapMapAnytype = null; - @JsonProperty("anytype_1") private Object anytype1; - @JsonProperty("anytype_2") private Object anytype2; - @JsonProperty("anytype_3") private Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { @@ -84,6 +73,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt * Get mapString * @return mapString */ + @JsonProperty("map_string") @ApiModelProperty(value = "") public Map getMapString() { @@ -111,6 +101,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * Get mapNumber * @return mapNumber */ + @JsonProperty("map_number") @Valid @ApiModelProperty(value = "") public Map getMapNumber() { @@ -138,6 +129,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege * Get mapInteger * @return mapInteger */ + @JsonProperty("map_integer") @ApiModelProperty(value = "") public Map getMapInteger() { @@ -165,6 +157,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea * Get mapBoolean * @return mapBoolean */ + @JsonProperty("map_boolean") @ApiModelProperty(value = "") public Map getMapBoolean() { @@ -192,6 +185,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { @@ -219,6 +213,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * Get mapArrayAnytype * @return mapArrayAnytype */ + @JsonProperty("map_array_anytype") @Valid @ApiModelProperty(value = "") public Map> getMapArrayAnytype() { @@ -246,6 +241,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { @@ -273,6 +269,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { @@ -292,6 +289,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) { * Get anytype1 * @return anytype1 */ + @JsonProperty("anytype_1") @ApiModelProperty(value = "") public Object getAnytype1() { @@ -311,6 +309,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) { * Get anytype2 * @return anytype2 */ + @JsonProperty("anytype_2") @ApiModelProperty(value = "") public Object getAnytype2() { @@ -330,6 +329,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) { * Get anytype3 * @return anytype3 */ + @JsonProperty("anytype_3") @ApiModelProperty(value = "") public Object getAnytype3() { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 00b5174e93b7..ce8b8d62436c 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesInteger extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesInteger name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesInteger name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 8fec423ffb1b..dec791e0a273 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesNumber extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesNumber name(String name) { @@ -37,6 +36,7 @@ public AdditionalPropertiesNumber name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 67033332b0d6..546d0ab9216f 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesObject extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesObject name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesObject name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 993f83bb2cc1..c1f95cf62e81 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesString extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesString name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesString name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Animal.java index 798ec01a7fbe..4673ab974ce8 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Animal.java @@ -37,10 +37,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Animal { - @JsonProperty("className") private String className; - @JsonProperty("color") private String color = "red"; public Animal className(String className) { @@ -52,6 +50,7 @@ public Animal className(String className) { * Get className * @return className */ + @JsonProperty("className") @NotNull @ApiModelProperty(required = true, value = "") public String getClassName() { @@ -71,6 +70,7 @@ public Animal color(String color) { * Get color * @return color */ + @JsonProperty("color") @ApiModelProperty(value = "") public String getColor() { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index df67eda87fd1..46ab3b631960 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfArrayOfNumberOnly { - @JsonProperty("ArrayArrayNumber") @Valid private List> arrayArrayNumber = null; @@ -46,6 +45,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * Get arrayArrayNumber * @return arrayArrayNumber */ + @JsonProperty("ArrayArrayNumber") @Valid @ApiModelProperty(value = "") public List> getArrayArrayNumber() { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 05f1ca376a68..cb5358905469 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfNumberOnly { - @JsonProperty("ArrayNumber") @Valid private List arrayNumber = null; @@ -46,6 +45,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ + @JsonProperty("ArrayNumber") @Valid @ApiModelProperty(value = "") public List getArrayNumber() { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayTest.java index ba67885edc8a..55cc431ecde6 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayTest.java @@ -25,15 +25,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayTest { - @JsonProperty("array_of_string") @Valid private List arrayOfString = null; - @JsonProperty("array_array_of_integer") @Valid private List> arrayArrayOfInteger = null; - @JsonProperty("array_array_of_model") @Valid private List> arrayArrayOfModel = null; @@ -54,6 +51,7 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) { * Get arrayOfString * @return arrayOfString */ + @JsonProperty("array_of_string") @ApiModelProperty(value = "") public List getArrayOfString() { @@ -81,6 +79,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ + @JsonProperty("array_array_of_integer") @Valid @ApiModelProperty(value = "") public List> getArrayArrayOfInteger() { @@ -108,6 +107,7 @@ public ArrayTest addArrayArrayOfModelItem(List arrayArrayOfModelI * Get arrayArrayOfModel * @return arrayArrayOfModel */ + @JsonProperty("array_array_of_model") @Valid @ApiModelProperty(value = "") public List> getArrayArrayOfModel() { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Capitalization.java index e9cce9de0115..e0fdbe78bae2 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Capitalization.java @@ -22,22 +22,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Capitalization { - @JsonProperty("smallCamel") private String smallCamel; - @JsonProperty("CapitalCamel") private String capitalCamel; - @JsonProperty("small_Snake") private String smallSnake; - @JsonProperty("Capital_Snake") private String capitalSnake; - @JsonProperty("SCA_ETH_Flow_Points") private String scAETHFlowPoints; - @JsonProperty("ATT_NAME") private String ATT_NAME; public Capitalization smallCamel(String smallCamel) { @@ -49,6 +43,7 @@ public Capitalization smallCamel(String smallCamel) { * Get smallCamel * @return smallCamel */ + @JsonProperty("smallCamel") @ApiModelProperty(value = "") public String getSmallCamel() { @@ -68,6 +63,7 @@ public Capitalization capitalCamel(String capitalCamel) { * Get capitalCamel * @return capitalCamel */ + @JsonProperty("CapitalCamel") @ApiModelProperty(value = "") public String getCapitalCamel() { @@ -87,6 +83,7 @@ public Capitalization smallSnake(String smallSnake) { * Get smallSnake * @return smallSnake */ + @JsonProperty("small_Snake") @ApiModelProperty(value = "") public String getSmallSnake() { @@ -106,6 +103,7 @@ public Capitalization capitalSnake(String capitalSnake) { * Get capitalSnake * @return capitalSnake */ + @JsonProperty("Capital_Snake") @ApiModelProperty(value = "") public String getCapitalSnake() { @@ -125,6 +123,7 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) { * Get scAETHFlowPoints * @return scAETHFlowPoints */ + @JsonProperty("SCA_ETH_Flow_Points") @ApiModelProperty(value = "") public String getScAETHFlowPoints() { @@ -144,6 +143,7 @@ public Capitalization ATT_NAME(String ATT_NAME) { * Name of the pet * @return ATT_NAME */ + @JsonProperty("ATT_NAME") @ApiModelProperty(value = "Name of the pet ") public String getATTNAME() { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Cat.java index 9c77b07695d5..9b798b7b5a25 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Cat.java @@ -27,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Cat extends Animal { - @JsonProperty("declawed") private Boolean declawed; public Cat declawed(Boolean declawed) { @@ -39,6 +38,7 @@ public Cat declawed(Boolean declawed) { * Get declawed * @return declawed */ + @JsonProperty("declawed") @ApiModelProperty(value = "") public Boolean getDeclawed() { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/CatAllOf.java index eed74bea751a..63de2ad8818e 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/CatAllOf.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/CatAllOf.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class CatAllOf { - @JsonProperty("declawed") private Boolean declawed; public CatAllOf declawed(Boolean declawed) { @@ -36,6 +35,7 @@ public CatAllOf declawed(Boolean declawed) { * Get declawed * @return declawed */ + @JsonProperty("declawed") @ApiModelProperty(value = "") public Boolean getDeclawed() { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Category.java index 27a4a9f25665..b63268b2c8ce 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Category.java @@ -22,10 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name = "default-name"; public Category id(Long id) { @@ -37,6 +35,7 @@ public Category id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -56,6 +55,7 @@ public Category name(String name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @ApiModelProperty(required = true, value = "") public String getName() { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ClassModel.java index 69296da7e60e..976f0b01d071 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ClassModel.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ClassModel { - @JsonProperty("_class") private String propertyClass; public ClassModel propertyClass(String propertyClass) { @@ -35,6 +34,7 @@ public ClassModel propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ + @JsonProperty("_class") @ApiModelProperty(value = "") public String getPropertyClass() { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Client.java index b788daea14a3..a3c4731f3339 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Client.java @@ -22,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Client { - @JsonProperty("client") private String client; public Client client(String client) { @@ -34,6 +33,7 @@ public Client client(String client) { * Get client * @return client */ + @JsonProperty("client") @ApiModelProperty(value = "") public String getClient() { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Dog.java index 9b61a2fa29b6..593562fabb42 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Dog.java @@ -27,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Dog extends Animal { - @JsonProperty("breed") private String breed; public Dog breed(String breed) { @@ -39,6 +38,7 @@ public Dog breed(String breed) { * Get breed * @return breed */ + @JsonProperty("breed") @ApiModelProperty(value = "") public String getBreed() { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/DogAllOf.java index 4f275e535333..7ddb24717737 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/DogAllOf.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/DogAllOf.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class DogAllOf { - @JsonProperty("breed") private String breed; public DogAllOf breed(String breed) { @@ -36,6 +35,7 @@ public DogAllOf breed(String breed) { * Get breed * @return breed */ + @JsonProperty("breed") @ApiModelProperty(value = "") public String getBreed() { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumArrays.java index dba32cf2b710..04e850b1cf17 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumArrays.java @@ -60,7 +60,6 @@ public static JustSymbolEnum fromValue(String value) { } } - @JsonProperty("just_symbol") private JustSymbolEnum justSymbol; /** @@ -98,7 +97,6 @@ public static ArrayEnumEnum fromValue(String value) { } } - @JsonProperty("array_enum") @Valid private List arrayEnum = null; @@ -111,6 +109,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) { * Get justSymbol * @return justSymbol */ + @JsonProperty("just_symbol") @ApiModelProperty(value = "") public JustSymbolEnum getJustSymbol() { @@ -138,6 +137,7 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) { * Get arrayEnum * @return arrayEnum */ + @JsonProperty("array_enum") @ApiModelProperty(value = "") public List getArrayEnum() { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumTest.java index c20bc1460143..49747f67dccf 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumTest.java @@ -63,7 +63,6 @@ public static EnumStringEnum fromValue(String value) { } } - @JsonProperty("enum_string") private EnumStringEnum enumString; /** @@ -103,7 +102,6 @@ public static EnumStringRequiredEnum fromValue(String value) { } } - @JsonProperty("enum_string_required") private EnumStringRequiredEnum enumStringRequired; /** @@ -141,7 +139,6 @@ public static EnumIntegerEnum fromValue(Integer value) { } } - @JsonProperty("enum_integer") private EnumIntegerEnum enumInteger; /** @@ -179,10 +176,8 @@ public static EnumNumberEnum fromValue(Double value) { } } - @JsonProperty("enum_number") private EnumNumberEnum enumNumber; - @JsonProperty("outerEnum") private OuterEnum outerEnum; public EnumTest enumString(EnumStringEnum enumString) { @@ -194,6 +189,7 @@ public EnumTest enumString(EnumStringEnum enumString) { * Get enumString * @return enumString */ + @JsonProperty("enum_string") @ApiModelProperty(value = "") public EnumStringEnum getEnumString() { @@ -213,6 +209,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) { * Get enumStringRequired * @return enumStringRequired */ + @JsonProperty("enum_string_required") @NotNull @ApiModelProperty(required = true, value = "") public EnumStringRequiredEnum getEnumStringRequired() { @@ -232,6 +229,7 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) { * Get enumInteger * @return enumInteger */ + @JsonProperty("enum_integer") @ApiModelProperty(value = "") public EnumIntegerEnum getEnumInteger() { @@ -251,6 +249,7 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) { * Get enumNumber * @return enumNumber */ + @JsonProperty("enum_number") @ApiModelProperty(value = "") public EnumNumberEnum getEnumNumber() { @@ -270,6 +269,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) { * Get outerEnum * @return outerEnum */ + @JsonProperty("outerEnum") @Valid @ApiModelProperty(value = "") public OuterEnum getOuterEnum() { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/File.java index d82e4902623d..43c44fd344bb 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/File.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/File.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class File { - @JsonProperty("sourceURI") private String sourceURI; public File sourceURI(String sourceURI) { @@ -35,6 +34,7 @@ public File sourceURI(String sourceURI) { * Test capitalization * @return sourceURI */ + @JsonProperty("sourceURI") @ApiModelProperty(value = "Test capitalization") public String getSourceURI() { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 2ea153bd6468..d7815943b774 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -25,10 +25,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FileSchemaTestClass { - @JsonProperty("file") private File file; - @JsonProperty("files") @Valid private List files = null; @@ -41,6 +39,7 @@ public FileSchemaTestClass file(File file) { * Get file * @return file */ + @JsonProperty("file") @Valid @ApiModelProperty(value = "") public File getFile() { @@ -68,6 +67,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) { * Get files * @return files */ + @JsonProperty("files") @Valid @ApiModelProperty(value = "") public List getFiles() { 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 0e2aeaa78a22..ffd18f0ce221 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 @@ -30,48 +30,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FormatTest { - @JsonProperty("integer") private Integer integer; - @JsonProperty("int32") private Integer int32; - @JsonProperty("int64") private Long int64; - @JsonProperty("number") private BigDecimal number; - @JsonProperty("float") private Float _float; - @JsonProperty("double") private Double _double; - @JsonProperty("string") private String string; - @JsonProperty("byte") private byte[] _byte; - @JsonProperty("binary") private org.springframework.core.io.Resource binary; - @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("password") private String password; - @JsonProperty("BigDecimal") private BigDecimal bigDecimal; public FormatTest integer(Integer integer) { @@ -85,6 +71,7 @@ public FormatTest integer(Integer integer) { * maximum: 100 * @return integer */ + @JsonProperty("integer") @Min(10) @Max(100) @ApiModelProperty(value = "") public Integer getInteger() { @@ -106,6 +93,7 @@ public FormatTest int32(Integer int32) { * maximum: 200 * @return int32 */ + @JsonProperty("int32") @Min(20) @Max(200) @ApiModelProperty(value = "") public Integer getInt32() { @@ -125,6 +113,7 @@ public FormatTest int64(Long int64) { * Get int64 * @return int64 */ + @JsonProperty("int64") @ApiModelProperty(value = "") public Long getInt64() { @@ -146,6 +135,7 @@ public FormatTest number(BigDecimal number) { * maximum: 543.2 * @return number */ + @JsonProperty("number") @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") @ApiModelProperty(required = true, value = "") public BigDecimal getNumber() { @@ -167,6 +157,7 @@ public FormatTest _float(Float _float) { * maximum: 987.6 * @return _float */ + @JsonProperty("float") @DecimalMin("54.3") @DecimalMax("987.6") @ApiModelProperty(value = "") public Float getFloat() { @@ -188,6 +179,7 @@ public FormatTest _double(Double _double) { * maximum: 123.4 * @return _double */ + @JsonProperty("double") @DecimalMin("67.8") @DecimalMax("123.4") @ApiModelProperty(value = "") public Double getDouble() { @@ -207,6 +199,7 @@ public FormatTest string(String string) { * Get string * @return string */ + @JsonProperty("string") @Pattern(regexp = "/[a-z]/i") @ApiModelProperty(value = "") public String getString() { @@ -226,6 +219,7 @@ public FormatTest _byte(byte[] _byte) { * Get _byte * @return _byte */ + @JsonProperty("byte") @NotNull @ApiModelProperty(required = true, value = "") public byte[] getByte() { @@ -245,6 +239,7 @@ public FormatTest binary(org.springframework.core.io.Resource binary) { * Get binary * @return binary */ + @JsonProperty("binary") @Valid @ApiModelProperty(value = "") public org.springframework.core.io.Resource getBinary() { @@ -264,6 +259,7 @@ public FormatTest date(LocalDate date) { * Get date * @return date */ + @JsonProperty("date") @NotNull @Valid @ApiModelProperty(required = true, value = "") public LocalDate getDate() { @@ -283,6 +279,7 @@ public FormatTest dateTime(OffsetDateTime dateTime) { * Get dateTime * @return dateTime */ + @JsonProperty("dateTime") @Valid @ApiModelProperty(value = "") public OffsetDateTime getDateTime() { @@ -302,6 +299,7 @@ public FormatTest uuid(UUID uuid) { * Get uuid * @return uuid */ + @JsonProperty("uuid") @Valid @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") public UUID getUuid() { @@ -321,6 +319,7 @@ public FormatTest password(String password) { * Get password * @return password */ + @JsonProperty("password") @NotNull @Size(min = 10, max = 64) @ApiModelProperty(required = true, value = "") public String getPassword() { @@ -340,6 +339,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) { * Get bigDecimal * @return bigDecimal */ + @JsonProperty("BigDecimal") @Valid @ApiModelProperty(value = "") public BigDecimal getBigDecimal() { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index 224b16d1a2d3..948ed9a0731d 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -24,10 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class HasOnlyReadOnly { - @JsonProperty("bar") private String bar; - @JsonProperty("foo") private String foo; public HasOnlyReadOnly bar(String bar) { @@ -39,6 +37,7 @@ public HasOnlyReadOnly bar(String bar) { * Get bar * @return bar */ + @JsonProperty("bar") @ApiModelProperty(readOnly = true, value = "") public String getBar() { @@ -58,6 +57,7 @@ public HasOnlyReadOnly foo(String foo) { * Get foo * @return foo */ + @JsonProperty("foo") @ApiModelProperty(readOnly = true, value = "") public String getFoo() { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MapTest.java index f2867ac50403..94d4ae9a9d56 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MapTest.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MapTest { - @JsonProperty("map_map_of_string") @Valid private Map> mapMapOfString = null; @@ -64,15 +63,12 @@ public static InnerEnum fromValue(String value) { } } - @JsonProperty("map_of_enum_string") @Valid private Map mapOfEnumString = null; - @JsonProperty("direct_map") @Valid private Map directMap = null; - @JsonProperty("indirect_map") @Valid private Map indirectMap = null; @@ -93,6 +89,7 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapMapOfString * @return mapMapOfString */ + @JsonProperty("map_map_of_string") @Valid @ApiModelProperty(value = "") public Map> getMapMapOfString() { @@ -120,6 +117,7 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) * Get mapOfEnumString * @return mapOfEnumString */ + @JsonProperty("map_of_enum_string") @ApiModelProperty(value = "") public Map getMapOfEnumString() { @@ -147,6 +145,7 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) { * Get directMap * @return directMap */ + @JsonProperty("direct_map") @ApiModelProperty(value = "") public Map getDirectMap() { @@ -174,6 +173,7 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) { * Get indirectMap * @return indirectMap */ + @JsonProperty("indirect_map") @ApiModelProperty(value = "") public Map getIndirectMap() { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 901c65b2924d..89a2475d82fb 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -28,14 +28,11 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("map") @Valid private Map map = null; @@ -48,6 +45,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { * Get uuid * @return uuid */ + @JsonProperty("uuid") @Valid @ApiModelProperty(value = "") public UUID getUuid() { @@ -67,6 +65,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT * Get dateTime * @return dateTime */ + @JsonProperty("dateTime") @Valid @ApiModelProperty(value = "") public OffsetDateTime getDateTime() { @@ -94,6 +93,7 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * Get map * @return map */ + @JsonProperty("map") @Valid @ApiModelProperty(value = "") public Map getMap() { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Model200Response.java index 36dfd34883e8..220b6493f31a 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Model200Response.java @@ -25,10 +25,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Model200Response { - @JsonProperty("name") private Integer name; - @JsonProperty("class") private String propertyClass; public Model200Response name(Integer name) { @@ -40,6 +38,7 @@ public Model200Response name(Integer name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public Integer getName() { @@ -59,6 +58,7 @@ public Model200Response propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ + @JsonProperty("class") @ApiModelProperty(value = "") public String getPropertyClass() { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java index dfba6cb672d4..29f3f43cf20e 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -24,13 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -42,6 +39,7 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ + @JsonProperty("code") @ApiModelProperty(value = "") public Integer getCode() { @@ -61,6 +59,7 @@ public ModelApiResponse type(String type) { * Get type * @return type */ + @JsonProperty("type") @ApiModelProperty(value = "") public String getType() { @@ -80,6 +79,7 @@ public ModelApiResponse message(String message) { * Get message * @return message */ + @JsonProperty("message") @ApiModelProperty(value = "") public String getMessage() { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelList.java index 97ddf5359aa0..a374fe83d52a 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelList.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelList { - @JsonProperty("123-list") private String _123list; public ModelList _123list(String _123list) { @@ -36,6 +35,7 @@ public ModelList _123list(String _123list) { * Get _123list * @return _123list */ + @JsonProperty("123-list") @ApiModelProperty(value = "") public String get123list() { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelReturn.java index 4505ddfeeeca..d8fc618d9dfb 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelReturn.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelReturn { - @JsonProperty("return") private Integer _return; public ModelReturn _return(Integer _return) { @@ -37,6 +36,7 @@ public ModelReturn _return(Integer _return) { * Get _return * @return _return */ + @JsonProperty("return") @ApiModelProperty(value = "") public Integer getReturn() { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Name.java index 51cc37bbeea7..054901b488d6 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Name.java @@ -23,16 +23,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Name { - @JsonProperty("name") private Integer name; - @JsonProperty("snake_case") private Integer snakeCase; - @JsonProperty("property") private String property; - @JsonProperty("123Number") private Integer _123number; public Name name(Integer name) { @@ -44,6 +40,7 @@ public Name name(Integer name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @ApiModelProperty(required = true, value = "") public Integer getName() { @@ -63,6 +60,7 @@ public Name snakeCase(Integer snakeCase) { * Get snakeCase * @return snakeCase */ + @JsonProperty("snake_case") @ApiModelProperty(readOnly = true, value = "") public Integer getSnakeCase() { @@ -82,6 +80,7 @@ public Name property(String property) { * Get property * @return property */ + @JsonProperty("property") @ApiModelProperty(value = "") public String getProperty() { @@ -101,6 +100,7 @@ public Name _123number(Integer _123number) { * Get _123number * @return _123number */ + @JsonProperty("123Number") @ApiModelProperty(readOnly = true, value = "") public Integer get123number() { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/NumberOnly.java index 278146bfb899..8f2f2b19b191 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/NumberOnly.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class NumberOnly { - @JsonProperty("JustNumber") private BigDecimal justNumber; public NumberOnly justNumber(BigDecimal justNumber) { @@ -35,6 +34,7 @@ public NumberOnly justNumber(BigDecimal justNumber) { * Get justNumber * @return justNumber */ + @JsonProperty("JustNumber") @Valid @ApiModelProperty(value = "") public BigDecimal getJustNumber() { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Order.java index 9a9ed4f6c960..feac4d2cad8d 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Order.java @@ -25,16 +25,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -75,10 +71,8 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -90,6 +84,7 @@ public Order id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -109,6 +104,7 @@ public Order petId(Long petId) { * Get petId * @return petId */ + @JsonProperty("petId") @ApiModelProperty(value = "") public Long getPetId() { @@ -128,6 +124,7 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ + @JsonProperty("quantity") @ApiModelProperty(value = "") public Integer getQuantity() { @@ -147,6 +144,7 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ + @JsonProperty("shipDate") @Valid @ApiModelProperty(value = "") public OffsetDateTime getShipDate() { @@ -166,6 +164,7 @@ public Order status(StatusEnum status) { * Order Status * @return status */ + @JsonProperty("status") @ApiModelProperty(value = "Order Status") public StatusEnum getStatus() { @@ -185,6 +184,7 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ + @JsonProperty("complete") @ApiModelProperty(value = "") public Boolean getComplete() { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/OuterComposite.java index c1a709bb26ad..00cce99097d7 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/OuterComposite.java @@ -23,13 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class OuterComposite { - @JsonProperty("my_number") private BigDecimal myNumber; - @JsonProperty("my_string") private String myString; - @JsonProperty("my_boolean") private Boolean myBoolean; public OuterComposite myNumber(BigDecimal myNumber) { @@ -41,6 +38,7 @@ public OuterComposite myNumber(BigDecimal myNumber) { * Get myNumber * @return myNumber */ + @JsonProperty("my_number") @Valid @ApiModelProperty(value = "") public BigDecimal getMyNumber() { @@ -60,6 +58,7 @@ public OuterComposite myString(String myString) { * Get myString * @return myString */ + @JsonProperty("my_string") @ApiModelProperty(value = "") public String getMyString() { @@ -79,6 +78,7 @@ public OuterComposite myBoolean(Boolean myBoolean) { * Get myBoolean * @return myBoolean */ + @JsonProperty("my_boolean") @ApiModelProperty(value = "") public Boolean getMyBoolean() { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Pet.java index f8fa05d91c38..1d8ef7f7160f 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Pet.java @@ -27,20 +27,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private List photoUrls = new ArrayList<>(); - @JsonProperty("tags") @Valid private List tags = null; @@ -81,7 +76,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; public Pet id(Long id) { @@ -93,6 +87,7 @@ public Pet id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -112,6 +107,7 @@ public Pet category(Category category) { * Get category * @return category */ + @JsonProperty("category") @Valid @ApiModelProperty(value = "") public Category getCategory() { @@ -131,6 +127,7 @@ public Pet name(String name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") public String getName() { @@ -155,6 +152,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ + @JsonProperty("photoUrls") @NotNull @ApiModelProperty(required = true, value = "") public List getPhotoUrls() { @@ -182,6 +180,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ + @JsonProperty("tags") @Valid @ApiModelProperty(value = "") public List getTags() { @@ -201,6 +200,7 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ + @JsonProperty("status") @ApiModelProperty(value = "pet status in the store") public StatusEnum getStatus() { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ReadOnlyFirst.java index b7a0a416782e..d02b8c8cfd53 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -22,10 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ReadOnlyFirst { - @JsonProperty("bar") private String bar; - @JsonProperty("baz") private String baz; public ReadOnlyFirst bar(String bar) { @@ -37,6 +35,7 @@ public ReadOnlyFirst bar(String bar) { * Get bar * @return bar */ + @JsonProperty("bar") @ApiModelProperty(readOnly = true, value = "") public String getBar() { @@ -56,6 +55,7 @@ public ReadOnlyFirst baz(String baz) { * Get baz * @return baz */ + @JsonProperty("baz") @ApiModelProperty(value = "") public String getBaz() { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/SpecialModelName.java index f321ab78cd56..8f176362e027 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/SpecialModelName.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class SpecialModelName { - @JsonProperty("$special[property.name]") private Long $specialPropertyName; public SpecialModelName $specialPropertyName(Long $specialPropertyName) { @@ -36,6 +35,7 @@ public class SpecialModelName { * Get $specialPropertyName * @return $specialPropertyName */ + @JsonProperty("$special[property.name]") @ApiModelProperty(value = "") public Long get$SpecialPropertyName() { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Tag.java index 6161be4a9229..f7797bef2f19 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Tag.java @@ -22,10 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -37,6 +35,7 @@ public Tag id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -56,6 +55,7 @@ public Tag name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderDefault.java index f10cff73bb78..506efbf431c1 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -25,19 +25,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderDefault { - @JsonProperty("string_item") private String stringItem = "what"; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem = true; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -50,6 +45,7 @@ public TypeHolderDefault stringItem(String stringItem) { * Get stringItem * @return stringItem */ + @JsonProperty("string_item") @NotNull @ApiModelProperty(required = true, value = "") public String getStringItem() { @@ -69,6 +65,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ + @JsonProperty("number_item") @NotNull @Valid @ApiModelProperty(required = true, value = "") public BigDecimal getNumberItem() { @@ -88,6 +85,7 @@ public TypeHolderDefault integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ + @JsonProperty("integer_item") @NotNull @ApiModelProperty(required = true, value = "") public Integer getIntegerItem() { @@ -107,6 +105,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ + @JsonProperty("bool_item") @NotNull @ApiModelProperty(required = true, value = "") public Boolean getBoolItem() { @@ -131,6 +130,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ + @JsonProperty("array_item") @NotNull @ApiModelProperty(required = true, value = "") public List getArrayItem() { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderExample.java index d2ae69a4e5a8..806c0c90fa18 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -25,22 +25,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderExample { - @JsonProperty("string_item") private String stringItem; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("float_item") private Float floatItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -53,6 +47,7 @@ public TypeHolderExample stringItem(String stringItem) { * Get stringItem * @return stringItem */ + @JsonProperty("string_item") @NotNull @ApiModelProperty(example = "what", required = true, value = "") public String getStringItem() { @@ -72,6 +67,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ + @JsonProperty("number_item") @NotNull @Valid @ApiModelProperty(example = "1.234", required = true, value = "") public BigDecimal getNumberItem() { @@ -91,6 +87,7 @@ public TypeHolderExample floatItem(Float floatItem) { * Get floatItem * @return floatItem */ + @JsonProperty("float_item") @NotNull @ApiModelProperty(example = "1.234", required = true, value = "") public Float getFloatItem() { @@ -110,6 +107,7 @@ public TypeHolderExample integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ + @JsonProperty("integer_item") @NotNull @ApiModelProperty(example = "-2", required = true, value = "") public Integer getIntegerItem() { @@ -129,6 +127,7 @@ public TypeHolderExample boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ + @JsonProperty("bool_item") @NotNull @ApiModelProperty(example = "true", required = true, value = "") public Boolean getBoolItem() { @@ -153,6 +152,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ + @JsonProperty("array_item") @NotNull @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "") public List getArrayItem() { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/User.java index ec85459bc99a..f42832389ffe 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/User.java @@ -22,28 +22,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -55,6 +47,7 @@ public User id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -74,6 +67,7 @@ public User username(String username) { * Get username * @return username */ + @JsonProperty("username") @ApiModelProperty(value = "") public String getUsername() { @@ -93,6 +87,7 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ + @JsonProperty("firstName") @ApiModelProperty(value = "") public String getFirstName() { @@ -112,6 +107,7 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ + @JsonProperty("lastName") @ApiModelProperty(value = "") public String getLastName() { @@ -131,6 +127,7 @@ public User email(String email) { * Get email * @return email */ + @JsonProperty("email") @ApiModelProperty(value = "") public String getEmail() { @@ -150,6 +147,7 @@ public User password(String password) { * Get password * @return password */ + @JsonProperty("password") @ApiModelProperty(value = "") public String getPassword() { @@ -169,6 +167,7 @@ public User phone(String phone) { * Get phone * @return phone */ + @JsonProperty("phone") @ApiModelProperty(value = "") public String getPhone() { @@ -188,6 +187,7 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ + @JsonProperty("userStatus") @ApiModelProperty(value = "User Status") public Integer getUserStatus() { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/XmlItem.java index 27d5f8282818..c795b4b85e6d 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/XmlItem.java @@ -25,99 +25,70 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class XmlItem { - @JsonProperty("attribute_string") private String attributeString; - @JsonProperty("attribute_number") private BigDecimal attributeNumber; - @JsonProperty("attribute_integer") private Integer attributeInteger; - @JsonProperty("attribute_boolean") private Boolean attributeBoolean; - @JsonProperty("wrapped_array") @Valid private List wrappedArray = null; - @JsonProperty("name_string") private String nameString; - @JsonProperty("name_number") private BigDecimal nameNumber; - @JsonProperty("name_integer") private Integer nameInteger; - @JsonProperty("name_boolean") private Boolean nameBoolean; - @JsonProperty("name_array") @Valid private List nameArray = null; - @JsonProperty("name_wrapped_array") @Valid private List nameWrappedArray = null; - @JsonProperty("prefix_string") private String prefixString; - @JsonProperty("prefix_number") private BigDecimal prefixNumber; - @JsonProperty("prefix_integer") private Integer prefixInteger; - @JsonProperty("prefix_boolean") private Boolean prefixBoolean; - @JsonProperty("prefix_array") @Valid private List prefixArray = null; - @JsonProperty("prefix_wrapped_array") @Valid private List prefixWrappedArray = null; - @JsonProperty("namespace_string") private String namespaceString; - @JsonProperty("namespace_number") private BigDecimal namespaceNumber; - @JsonProperty("namespace_integer") private Integer namespaceInteger; - @JsonProperty("namespace_boolean") private Boolean namespaceBoolean; - @JsonProperty("namespace_array") @Valid private List namespaceArray = null; - @JsonProperty("namespace_wrapped_array") @Valid private List namespaceWrappedArray = null; - @JsonProperty("prefix_ns_string") private String prefixNsString; - @JsonProperty("prefix_ns_number") private BigDecimal prefixNsNumber; - @JsonProperty("prefix_ns_integer") private Integer prefixNsInteger; - @JsonProperty("prefix_ns_boolean") private Boolean prefixNsBoolean; - @JsonProperty("prefix_ns_array") @Valid private List prefixNsArray = null; - @JsonProperty("prefix_ns_wrapped_array") @Valid private List prefixNsWrappedArray = null; @@ -130,6 +101,7 @@ public XmlItem attributeString(String attributeString) { * Get attributeString * @return attributeString */ + @JsonProperty("attribute_string") @ApiModelProperty(example = "string", value = "") public String getAttributeString() { @@ -149,6 +121,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) { * Get attributeNumber * @return attributeNumber */ + @JsonProperty("attribute_number") @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getAttributeNumber() { @@ -168,6 +141,7 @@ public XmlItem attributeInteger(Integer attributeInteger) { * Get attributeInteger * @return attributeInteger */ + @JsonProperty("attribute_integer") @ApiModelProperty(example = "-2", value = "") public Integer getAttributeInteger() { @@ -187,6 +161,7 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) { * Get attributeBoolean * @return attributeBoolean */ + @JsonProperty("attribute_boolean") @ApiModelProperty(example = "true", value = "") public Boolean getAttributeBoolean() { @@ -214,6 +189,7 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) { * Get wrappedArray * @return wrappedArray */ + @JsonProperty("wrapped_array") @ApiModelProperty(value = "") public List getWrappedArray() { @@ -233,6 +209,7 @@ public XmlItem nameString(String nameString) { * Get nameString * @return nameString */ + @JsonProperty("name_string") @ApiModelProperty(example = "string", value = "") public String getNameString() { @@ -252,6 +229,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) { * Get nameNumber * @return nameNumber */ + @JsonProperty("name_number") @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getNameNumber() { @@ -271,6 +249,7 @@ public XmlItem nameInteger(Integer nameInteger) { * Get nameInteger * @return nameInteger */ + @JsonProperty("name_integer") @ApiModelProperty(example = "-2", value = "") public Integer getNameInteger() { @@ -290,6 +269,7 @@ public XmlItem nameBoolean(Boolean nameBoolean) { * Get nameBoolean * @return nameBoolean */ + @JsonProperty("name_boolean") @ApiModelProperty(example = "true", value = "") public Boolean getNameBoolean() { @@ -317,6 +297,7 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) { * Get nameArray * @return nameArray */ + @JsonProperty("name_array") @ApiModelProperty(value = "") public List getNameArray() { @@ -344,6 +325,7 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) { * Get nameWrappedArray * @return nameWrappedArray */ + @JsonProperty("name_wrapped_array") @ApiModelProperty(value = "") public List getNameWrappedArray() { @@ -363,6 +345,7 @@ public XmlItem prefixString(String prefixString) { * Get prefixString * @return prefixString */ + @JsonProperty("prefix_string") @ApiModelProperty(example = "string", value = "") public String getPrefixString() { @@ -382,6 +365,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) { * Get prefixNumber * @return prefixNumber */ + @JsonProperty("prefix_number") @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getPrefixNumber() { @@ -401,6 +385,7 @@ public XmlItem prefixInteger(Integer prefixInteger) { * Get prefixInteger * @return prefixInteger */ + @JsonProperty("prefix_integer") @ApiModelProperty(example = "-2", value = "") public Integer getPrefixInteger() { @@ -420,6 +405,7 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) { * Get prefixBoolean * @return prefixBoolean */ + @JsonProperty("prefix_boolean") @ApiModelProperty(example = "true", value = "") public Boolean getPrefixBoolean() { @@ -447,6 +433,7 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) { * Get prefixArray * @return prefixArray */ + @JsonProperty("prefix_array") @ApiModelProperty(value = "") public List getPrefixArray() { @@ -474,6 +461,7 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) { * Get prefixWrappedArray * @return prefixWrappedArray */ + @JsonProperty("prefix_wrapped_array") @ApiModelProperty(value = "") public List getPrefixWrappedArray() { @@ -493,6 +481,7 @@ public XmlItem namespaceString(String namespaceString) { * Get namespaceString * @return namespaceString */ + @JsonProperty("namespace_string") @ApiModelProperty(example = "string", value = "") public String getNamespaceString() { @@ -512,6 +501,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) { * Get namespaceNumber * @return namespaceNumber */ + @JsonProperty("namespace_number") @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getNamespaceNumber() { @@ -531,6 +521,7 @@ public XmlItem namespaceInteger(Integer namespaceInteger) { * Get namespaceInteger * @return namespaceInteger */ + @JsonProperty("namespace_integer") @ApiModelProperty(example = "-2", value = "") public Integer getNamespaceInteger() { @@ -550,6 +541,7 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) { * Get namespaceBoolean * @return namespaceBoolean */ + @JsonProperty("namespace_boolean") @ApiModelProperty(example = "true", value = "") public Boolean getNamespaceBoolean() { @@ -577,6 +569,7 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) { * Get namespaceArray * @return namespaceArray */ + @JsonProperty("namespace_array") @ApiModelProperty(value = "") public List getNamespaceArray() { @@ -604,6 +597,7 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) { * Get namespaceWrappedArray * @return namespaceWrappedArray */ + @JsonProperty("namespace_wrapped_array") @ApiModelProperty(value = "") public List getNamespaceWrappedArray() { @@ -623,6 +617,7 @@ public XmlItem prefixNsString(String prefixNsString) { * Get prefixNsString * @return prefixNsString */ + @JsonProperty("prefix_ns_string") @ApiModelProperty(example = "string", value = "") public String getPrefixNsString() { @@ -642,6 +637,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) { * Get prefixNsNumber * @return prefixNsNumber */ + @JsonProperty("prefix_ns_number") @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getPrefixNsNumber() { @@ -661,6 +657,7 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) { * Get prefixNsInteger * @return prefixNsInteger */ + @JsonProperty("prefix_ns_integer") @ApiModelProperty(example = "-2", value = "") public Integer getPrefixNsInteger() { @@ -680,6 +677,7 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) { * Get prefixNsBoolean * @return prefixNsBoolean */ + @JsonProperty("prefix_ns_boolean") @ApiModelProperty(example = "true", value = "") public Boolean getPrefixNsBoolean() { @@ -707,6 +705,7 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) { * Get prefixNsArray * @return prefixNsArray */ + @JsonProperty("prefix_ns_array") @ApiModelProperty(value = "") public List getPrefixNsArray() { @@ -734,6 +733,7 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) { * Get prefixNsWrappedArray * @return prefixNsWrappedArray */ + @JsonProperty("prefix_ns_wrapped_array") @ApiModelProperty(value = "") public List getPrefixNsWrappedArray() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 8e4c17989762..cb51920a8c28 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesAnyType extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesAnyType name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesAnyType name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 27a8f01607f1..1c66a636116f 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesArray extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesArray name(String name) { @@ -37,6 +36,7 @@ public AdditionalPropertiesArray name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index bc7b87d760a9..1dcc607639bf 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesBoolean extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesBoolean name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesBoolean name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index b5e88d5d7ccb..74250eb564ad 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -26,45 +26,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesClass { - @JsonProperty("map_string") @Valid private Map mapString = null; - @JsonProperty("map_number") @Valid private Map mapNumber = null; - @JsonProperty("map_integer") @Valid private Map mapInteger = null; - @JsonProperty("map_boolean") @Valid private Map mapBoolean = null; - @JsonProperty("map_array_integer") @Valid private Map> mapArrayInteger = null; - @JsonProperty("map_array_anytype") @Valid private Map> mapArrayAnytype = null; - @JsonProperty("map_map_string") @Valid private Map> mapMapString = null; - @JsonProperty("map_map_anytype") @Valid private Map> mapMapAnytype = null; - @JsonProperty("anytype_1") private Object anytype1; - @JsonProperty("anytype_2") private Object anytype2; - @JsonProperty("anytype_3") private Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { @@ -84,6 +73,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt * Get mapString * @return mapString */ + @JsonProperty("map_string") @ApiModelProperty(value = "") public Map getMapString() { @@ -111,6 +101,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * Get mapNumber * @return mapNumber */ + @JsonProperty("map_number") @Valid @ApiModelProperty(value = "") public Map getMapNumber() { @@ -138,6 +129,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege * Get mapInteger * @return mapInteger */ + @JsonProperty("map_integer") @ApiModelProperty(value = "") public Map getMapInteger() { @@ -165,6 +157,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea * Get mapBoolean * @return mapBoolean */ + @JsonProperty("map_boolean") @ApiModelProperty(value = "") public Map getMapBoolean() { @@ -192,6 +185,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { @@ -219,6 +213,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * Get mapArrayAnytype * @return mapArrayAnytype */ + @JsonProperty("map_array_anytype") @Valid @ApiModelProperty(value = "") public Map> getMapArrayAnytype() { @@ -246,6 +241,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { @@ -273,6 +269,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { @@ -292,6 +289,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) { * Get anytype1 * @return anytype1 */ + @JsonProperty("anytype_1") @ApiModelProperty(value = "") public Object getAnytype1() { @@ -311,6 +309,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) { * Get anytype2 * @return anytype2 */ + @JsonProperty("anytype_2") @ApiModelProperty(value = "") public Object getAnytype2() { @@ -330,6 +329,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) { * Get anytype3 * @return anytype3 */ + @JsonProperty("anytype_3") @ApiModelProperty(value = "") public Object getAnytype3() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 00b5174e93b7..ce8b8d62436c 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesInteger extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesInteger name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesInteger name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 8fec423ffb1b..dec791e0a273 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesNumber extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesNumber name(String name) { @@ -37,6 +36,7 @@ public AdditionalPropertiesNumber name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 67033332b0d6..546d0ab9216f 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesObject extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesObject name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesObject name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 993f83bb2cc1..c1f95cf62e81 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesString extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesString name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesString name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Animal.java index e11ae425d9e9..e880f829164c 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Animal.java @@ -39,10 +39,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Animal { - @JsonProperty("className") private String className; - @JsonProperty("color") private String color = "red"; public Animal className(String className) { @@ -54,6 +52,7 @@ public Animal className(String className) { * Get className * @return className */ + @JsonProperty("className") @NotNull @ApiModelProperty(required = true, value = "") public String getClassName() { @@ -73,6 +72,7 @@ public Animal color(String color) { * Get color * @return color */ + @JsonProperty("color") @ApiModelProperty(value = "") public String getColor() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index df67eda87fd1..46ab3b631960 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfArrayOfNumberOnly { - @JsonProperty("ArrayArrayNumber") @Valid private List> arrayArrayNumber = null; @@ -46,6 +45,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * Get arrayArrayNumber * @return arrayArrayNumber */ + @JsonProperty("ArrayArrayNumber") @Valid @ApiModelProperty(value = "") public List> getArrayArrayNumber() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 05f1ca376a68..cb5358905469 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfNumberOnly { - @JsonProperty("ArrayNumber") @Valid private List arrayNumber = null; @@ -46,6 +45,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ + @JsonProperty("ArrayNumber") @Valid @ApiModelProperty(value = "") public List getArrayNumber() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java index ba67885edc8a..55cc431ecde6 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java @@ -25,15 +25,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayTest { - @JsonProperty("array_of_string") @Valid private List arrayOfString = null; - @JsonProperty("array_array_of_integer") @Valid private List> arrayArrayOfInteger = null; - @JsonProperty("array_array_of_model") @Valid private List> arrayArrayOfModel = null; @@ -54,6 +51,7 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) { * Get arrayOfString * @return arrayOfString */ + @JsonProperty("array_of_string") @ApiModelProperty(value = "") public List getArrayOfString() { @@ -81,6 +79,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ + @JsonProperty("array_array_of_integer") @Valid @ApiModelProperty(value = "") public List> getArrayArrayOfInteger() { @@ -108,6 +107,7 @@ public ArrayTest addArrayArrayOfModelItem(List arrayArrayOfModelI * Get arrayArrayOfModel * @return arrayArrayOfModel */ + @JsonProperty("array_array_of_model") @Valid @ApiModelProperty(value = "") public List> getArrayArrayOfModel() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java index ec95c1253fad..70bbb0b93532 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java @@ -67,7 +67,6 @@ public static KindEnum fromValue(String value) { } } - @JsonProperty("kind") private KindEnum kind; public BigCat kind(KindEnum kind) { @@ -79,6 +78,7 @@ public BigCat kind(KindEnum kind) { * Get kind * @return kind */ + @JsonProperty("kind") @ApiModelProperty(value = "") public KindEnum getKind() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCatAllOf.java index 35ae937c0009..1a86665050e6 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCatAllOf.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCatAllOf.java @@ -64,7 +64,6 @@ public static KindEnum fromValue(String value) { } } - @JsonProperty("kind") private KindEnum kind; public BigCatAllOf kind(KindEnum kind) { @@ -76,6 +75,7 @@ public BigCatAllOf kind(KindEnum kind) { * Get kind * @return kind */ + @JsonProperty("kind") @ApiModelProperty(value = "") public KindEnum getKind() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Capitalization.java index e9cce9de0115..e0fdbe78bae2 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Capitalization.java @@ -22,22 +22,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Capitalization { - @JsonProperty("smallCamel") private String smallCamel; - @JsonProperty("CapitalCamel") private String capitalCamel; - @JsonProperty("small_Snake") private String smallSnake; - @JsonProperty("Capital_Snake") private String capitalSnake; - @JsonProperty("SCA_ETH_Flow_Points") private String scAETHFlowPoints; - @JsonProperty("ATT_NAME") private String ATT_NAME; public Capitalization smallCamel(String smallCamel) { @@ -49,6 +43,7 @@ public Capitalization smallCamel(String smallCamel) { * Get smallCamel * @return smallCamel */ + @JsonProperty("smallCamel") @ApiModelProperty(value = "") public String getSmallCamel() { @@ -68,6 +63,7 @@ public Capitalization capitalCamel(String capitalCamel) { * Get capitalCamel * @return capitalCamel */ + @JsonProperty("CapitalCamel") @ApiModelProperty(value = "") public String getCapitalCamel() { @@ -87,6 +83,7 @@ public Capitalization smallSnake(String smallSnake) { * Get smallSnake * @return smallSnake */ + @JsonProperty("small_Snake") @ApiModelProperty(value = "") public String getSmallSnake() { @@ -106,6 +103,7 @@ public Capitalization capitalSnake(String capitalSnake) { * Get capitalSnake * @return capitalSnake */ + @JsonProperty("Capital_Snake") @ApiModelProperty(value = "") public String getCapitalSnake() { @@ -125,6 +123,7 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) { * Get scAETHFlowPoints * @return scAETHFlowPoints */ + @JsonProperty("SCA_ETH_Flow_Points") @ApiModelProperty(value = "") public String getScAETHFlowPoints() { @@ -144,6 +143,7 @@ public Capitalization ATT_NAME(String ATT_NAME) { * Name of the pet * @return ATT_NAME */ + @JsonProperty("ATT_NAME") @ApiModelProperty(value = "Name of the pet ") public String getATTNAME() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java index 097ddbef7980..958fcb2298e0 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java @@ -36,7 +36,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Cat extends Animal { - @JsonProperty("declawed") private Boolean declawed; public Cat declawed(Boolean declawed) { @@ -48,6 +47,7 @@ public Cat declawed(Boolean declawed) { * Get declawed * @return declawed */ + @JsonProperty("declawed") @ApiModelProperty(value = "") public Boolean getDeclawed() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/CatAllOf.java index eed74bea751a..63de2ad8818e 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/CatAllOf.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/CatAllOf.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class CatAllOf { - @JsonProperty("declawed") private Boolean declawed; public CatAllOf declawed(Boolean declawed) { @@ -36,6 +35,7 @@ public CatAllOf declawed(Boolean declawed) { * Get declawed * @return declawed */ + @JsonProperty("declawed") @ApiModelProperty(value = "") public Boolean getDeclawed() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Category.java index 27a4a9f25665..b63268b2c8ce 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Category.java @@ -22,10 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name = "default-name"; public Category id(Long id) { @@ -37,6 +35,7 @@ public Category id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -56,6 +55,7 @@ public Category name(String name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @ApiModelProperty(required = true, value = "") public String getName() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ClassModel.java index 69296da7e60e..976f0b01d071 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ClassModel.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ClassModel { - @JsonProperty("_class") private String propertyClass; public ClassModel propertyClass(String propertyClass) { @@ -35,6 +34,7 @@ public ClassModel propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ + @JsonProperty("_class") @ApiModelProperty(value = "") public String getPropertyClass() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Client.java index b788daea14a3..a3c4731f3339 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Client.java @@ -22,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Client { - @JsonProperty("client") private String client; public Client client(String client) { @@ -34,6 +33,7 @@ public Client client(String client) { * Get client * @return client */ + @JsonProperty("client") @ApiModelProperty(value = "") public String getClient() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Dog.java index 9b61a2fa29b6..593562fabb42 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Dog.java @@ -27,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Dog extends Animal { - @JsonProperty("breed") private String breed; public Dog breed(String breed) { @@ -39,6 +38,7 @@ public Dog breed(String breed) { * Get breed * @return breed */ + @JsonProperty("breed") @ApiModelProperty(value = "") public String getBreed() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/DogAllOf.java index 4f275e535333..7ddb24717737 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/DogAllOf.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/DogAllOf.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class DogAllOf { - @JsonProperty("breed") private String breed; public DogAllOf breed(String breed) { @@ -36,6 +35,7 @@ public DogAllOf breed(String breed) { * Get breed * @return breed */ + @JsonProperty("breed") @ApiModelProperty(value = "") public String getBreed() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java index dba32cf2b710..04e850b1cf17 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java @@ -60,7 +60,6 @@ public static JustSymbolEnum fromValue(String value) { } } - @JsonProperty("just_symbol") private JustSymbolEnum justSymbol; /** @@ -98,7 +97,6 @@ public static ArrayEnumEnum fromValue(String value) { } } - @JsonProperty("array_enum") @Valid private List arrayEnum = null; @@ -111,6 +109,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) { * Get justSymbol * @return justSymbol */ + @JsonProperty("just_symbol") @ApiModelProperty(value = "") public JustSymbolEnum getJustSymbol() { @@ -138,6 +137,7 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) { * Get arrayEnum * @return arrayEnum */ + @JsonProperty("array_enum") @ApiModelProperty(value = "") public List getArrayEnum() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java index c20bc1460143..49747f67dccf 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java @@ -63,7 +63,6 @@ public static EnumStringEnum fromValue(String value) { } } - @JsonProperty("enum_string") private EnumStringEnum enumString; /** @@ -103,7 +102,6 @@ public static EnumStringRequiredEnum fromValue(String value) { } } - @JsonProperty("enum_string_required") private EnumStringRequiredEnum enumStringRequired; /** @@ -141,7 +139,6 @@ public static EnumIntegerEnum fromValue(Integer value) { } } - @JsonProperty("enum_integer") private EnumIntegerEnum enumInteger; /** @@ -179,10 +176,8 @@ public static EnumNumberEnum fromValue(Double value) { } } - @JsonProperty("enum_number") private EnumNumberEnum enumNumber; - @JsonProperty("outerEnum") private OuterEnum outerEnum; public EnumTest enumString(EnumStringEnum enumString) { @@ -194,6 +189,7 @@ public EnumTest enumString(EnumStringEnum enumString) { * Get enumString * @return enumString */ + @JsonProperty("enum_string") @ApiModelProperty(value = "") public EnumStringEnum getEnumString() { @@ -213,6 +209,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) { * Get enumStringRequired * @return enumStringRequired */ + @JsonProperty("enum_string_required") @NotNull @ApiModelProperty(required = true, value = "") public EnumStringRequiredEnum getEnumStringRequired() { @@ -232,6 +229,7 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) { * Get enumInteger * @return enumInteger */ + @JsonProperty("enum_integer") @ApiModelProperty(value = "") public EnumIntegerEnum getEnumInteger() { @@ -251,6 +249,7 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) { * Get enumNumber * @return enumNumber */ + @JsonProperty("enum_number") @ApiModelProperty(value = "") public EnumNumberEnum getEnumNumber() { @@ -270,6 +269,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) { * Get outerEnum * @return outerEnum */ + @JsonProperty("outerEnum") @Valid @ApiModelProperty(value = "") public OuterEnum getOuterEnum() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/File.java index d82e4902623d..43c44fd344bb 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/File.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/File.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class File { - @JsonProperty("sourceURI") private String sourceURI; public File sourceURI(String sourceURI) { @@ -35,6 +34,7 @@ public File sourceURI(String sourceURI) { * Test capitalization * @return sourceURI */ + @JsonProperty("sourceURI") @ApiModelProperty(value = "Test capitalization") public String getSourceURI() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 2ea153bd6468..d7815943b774 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -25,10 +25,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FileSchemaTestClass { - @JsonProperty("file") private File file; - @JsonProperty("files") @Valid private List files = null; @@ -41,6 +39,7 @@ public FileSchemaTestClass file(File file) { * Get file * @return file */ + @JsonProperty("file") @Valid @ApiModelProperty(value = "") public File getFile() { @@ -68,6 +67,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) { * Get files * @return files */ + @JsonProperty("files") @Valid @ApiModelProperty(value = "") public List getFiles() { 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 0e2aeaa78a22..ffd18f0ce221 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 @@ -30,48 +30,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FormatTest { - @JsonProperty("integer") private Integer integer; - @JsonProperty("int32") private Integer int32; - @JsonProperty("int64") private Long int64; - @JsonProperty("number") private BigDecimal number; - @JsonProperty("float") private Float _float; - @JsonProperty("double") private Double _double; - @JsonProperty("string") private String string; - @JsonProperty("byte") private byte[] _byte; - @JsonProperty("binary") private org.springframework.core.io.Resource binary; - @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("password") private String password; - @JsonProperty("BigDecimal") private BigDecimal bigDecimal; public FormatTest integer(Integer integer) { @@ -85,6 +71,7 @@ public FormatTest integer(Integer integer) { * maximum: 100 * @return integer */ + @JsonProperty("integer") @Min(10) @Max(100) @ApiModelProperty(value = "") public Integer getInteger() { @@ -106,6 +93,7 @@ public FormatTest int32(Integer int32) { * maximum: 200 * @return int32 */ + @JsonProperty("int32") @Min(20) @Max(200) @ApiModelProperty(value = "") public Integer getInt32() { @@ -125,6 +113,7 @@ public FormatTest int64(Long int64) { * Get int64 * @return int64 */ + @JsonProperty("int64") @ApiModelProperty(value = "") public Long getInt64() { @@ -146,6 +135,7 @@ public FormatTest number(BigDecimal number) { * maximum: 543.2 * @return number */ + @JsonProperty("number") @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") @ApiModelProperty(required = true, value = "") public BigDecimal getNumber() { @@ -167,6 +157,7 @@ public FormatTest _float(Float _float) { * maximum: 987.6 * @return _float */ + @JsonProperty("float") @DecimalMin("54.3") @DecimalMax("987.6") @ApiModelProperty(value = "") public Float getFloat() { @@ -188,6 +179,7 @@ public FormatTest _double(Double _double) { * maximum: 123.4 * @return _double */ + @JsonProperty("double") @DecimalMin("67.8") @DecimalMax("123.4") @ApiModelProperty(value = "") public Double getDouble() { @@ -207,6 +199,7 @@ public FormatTest string(String string) { * Get string * @return string */ + @JsonProperty("string") @Pattern(regexp = "/[a-z]/i") @ApiModelProperty(value = "") public String getString() { @@ -226,6 +219,7 @@ public FormatTest _byte(byte[] _byte) { * Get _byte * @return _byte */ + @JsonProperty("byte") @NotNull @ApiModelProperty(required = true, value = "") public byte[] getByte() { @@ -245,6 +239,7 @@ public FormatTest binary(org.springframework.core.io.Resource binary) { * Get binary * @return binary */ + @JsonProperty("binary") @Valid @ApiModelProperty(value = "") public org.springframework.core.io.Resource getBinary() { @@ -264,6 +259,7 @@ public FormatTest date(LocalDate date) { * Get date * @return date */ + @JsonProperty("date") @NotNull @Valid @ApiModelProperty(required = true, value = "") public LocalDate getDate() { @@ -283,6 +279,7 @@ public FormatTest dateTime(OffsetDateTime dateTime) { * Get dateTime * @return dateTime */ + @JsonProperty("dateTime") @Valid @ApiModelProperty(value = "") public OffsetDateTime getDateTime() { @@ -302,6 +299,7 @@ public FormatTest uuid(UUID uuid) { * Get uuid * @return uuid */ + @JsonProperty("uuid") @Valid @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") public UUID getUuid() { @@ -321,6 +319,7 @@ public FormatTest password(String password) { * Get password * @return password */ + @JsonProperty("password") @NotNull @Size(min = 10, max = 64) @ApiModelProperty(required = true, value = "") public String getPassword() { @@ -340,6 +339,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) { * Get bigDecimal * @return bigDecimal */ + @JsonProperty("BigDecimal") @Valid @ApiModelProperty(value = "") public BigDecimal getBigDecimal() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index 224b16d1a2d3..948ed9a0731d 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -24,10 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class HasOnlyReadOnly { - @JsonProperty("bar") private String bar; - @JsonProperty("foo") private String foo; public HasOnlyReadOnly bar(String bar) { @@ -39,6 +37,7 @@ public HasOnlyReadOnly bar(String bar) { * Get bar * @return bar */ + @JsonProperty("bar") @ApiModelProperty(readOnly = true, value = "") public String getBar() { @@ -58,6 +57,7 @@ public HasOnlyReadOnly foo(String foo) { * Get foo * @return foo */ + @JsonProperty("foo") @ApiModelProperty(readOnly = true, value = "") public String getFoo() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MapTest.java index f2867ac50403..94d4ae9a9d56 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MapTest.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MapTest { - @JsonProperty("map_map_of_string") @Valid private Map> mapMapOfString = null; @@ -64,15 +63,12 @@ public static InnerEnum fromValue(String value) { } } - @JsonProperty("map_of_enum_string") @Valid private Map mapOfEnumString = null; - @JsonProperty("direct_map") @Valid private Map directMap = null; - @JsonProperty("indirect_map") @Valid private Map indirectMap = null; @@ -93,6 +89,7 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapMapOfString * @return mapMapOfString */ + @JsonProperty("map_map_of_string") @Valid @ApiModelProperty(value = "") public Map> getMapMapOfString() { @@ -120,6 +117,7 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) * Get mapOfEnumString * @return mapOfEnumString */ + @JsonProperty("map_of_enum_string") @ApiModelProperty(value = "") public Map getMapOfEnumString() { @@ -147,6 +145,7 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) { * Get directMap * @return directMap */ + @JsonProperty("direct_map") @ApiModelProperty(value = "") public Map getDirectMap() { @@ -174,6 +173,7 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) { * Get indirectMap * @return indirectMap */ + @JsonProperty("indirect_map") @ApiModelProperty(value = "") public Map getIndirectMap() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 901c65b2924d..89a2475d82fb 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -28,14 +28,11 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("map") @Valid private Map map = null; @@ -48,6 +45,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { * Get uuid * @return uuid */ + @JsonProperty("uuid") @Valid @ApiModelProperty(value = "") public UUID getUuid() { @@ -67,6 +65,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT * Get dateTime * @return dateTime */ + @JsonProperty("dateTime") @Valid @ApiModelProperty(value = "") public OffsetDateTime getDateTime() { @@ -94,6 +93,7 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * Get map * @return map */ + @JsonProperty("map") @Valid @ApiModelProperty(value = "") public Map getMap() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Model200Response.java index 36dfd34883e8..220b6493f31a 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Model200Response.java @@ -25,10 +25,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Model200Response { - @JsonProperty("name") private Integer name; - @JsonProperty("class") private String propertyClass; public Model200Response name(Integer name) { @@ -40,6 +38,7 @@ public Model200Response name(Integer name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public Integer getName() { @@ -59,6 +58,7 @@ public Model200Response propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ + @JsonProperty("class") @ApiModelProperty(value = "") public String getPropertyClass() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelApiResponse.java index dfba6cb672d4..29f3f43cf20e 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -24,13 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -42,6 +39,7 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ + @JsonProperty("code") @ApiModelProperty(value = "") public Integer getCode() { @@ -61,6 +59,7 @@ public ModelApiResponse type(String type) { * Get type * @return type */ + @JsonProperty("type") @ApiModelProperty(value = "") public String getType() { @@ -80,6 +79,7 @@ public ModelApiResponse message(String message) { * Get message * @return message */ + @JsonProperty("message") @ApiModelProperty(value = "") public String getMessage() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelList.java index 97ddf5359aa0..a374fe83d52a 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelList.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelList { - @JsonProperty("123-list") private String _123list; public ModelList _123list(String _123list) { @@ -36,6 +35,7 @@ public ModelList _123list(String _123list) { * Get _123list * @return _123list */ + @JsonProperty("123-list") @ApiModelProperty(value = "") public String get123list() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelReturn.java index 4505ddfeeeca..d8fc618d9dfb 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelReturn.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelReturn { - @JsonProperty("return") private Integer _return; public ModelReturn _return(Integer _return) { @@ -37,6 +36,7 @@ public ModelReturn _return(Integer _return) { * Get _return * @return _return */ + @JsonProperty("return") @ApiModelProperty(value = "") public Integer getReturn() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Name.java index 51cc37bbeea7..054901b488d6 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Name.java @@ -23,16 +23,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Name { - @JsonProperty("name") private Integer name; - @JsonProperty("snake_case") private Integer snakeCase; - @JsonProperty("property") private String property; - @JsonProperty("123Number") private Integer _123number; public Name name(Integer name) { @@ -44,6 +40,7 @@ public Name name(Integer name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @ApiModelProperty(required = true, value = "") public Integer getName() { @@ -63,6 +60,7 @@ public Name snakeCase(Integer snakeCase) { * Get snakeCase * @return snakeCase */ + @JsonProperty("snake_case") @ApiModelProperty(readOnly = true, value = "") public Integer getSnakeCase() { @@ -82,6 +80,7 @@ public Name property(String property) { * Get property * @return property */ + @JsonProperty("property") @ApiModelProperty(value = "") public String getProperty() { @@ -101,6 +100,7 @@ public Name _123number(Integer _123number) { * Get _123number * @return _123number */ + @JsonProperty("123Number") @ApiModelProperty(readOnly = true, value = "") public Integer get123number() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NumberOnly.java index 278146bfb899..8f2f2b19b191 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NumberOnly.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class NumberOnly { - @JsonProperty("JustNumber") private BigDecimal justNumber; public NumberOnly justNumber(BigDecimal justNumber) { @@ -35,6 +34,7 @@ public NumberOnly justNumber(BigDecimal justNumber) { * Get justNumber * @return justNumber */ + @JsonProperty("JustNumber") @Valid @ApiModelProperty(value = "") public BigDecimal getJustNumber() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Order.java index 9a9ed4f6c960..feac4d2cad8d 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Order.java @@ -25,16 +25,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -75,10 +71,8 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -90,6 +84,7 @@ public Order id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -109,6 +104,7 @@ public Order petId(Long petId) { * Get petId * @return petId */ + @JsonProperty("petId") @ApiModelProperty(value = "") public Long getPetId() { @@ -128,6 +124,7 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ + @JsonProperty("quantity") @ApiModelProperty(value = "") public Integer getQuantity() { @@ -147,6 +144,7 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ + @JsonProperty("shipDate") @Valid @ApiModelProperty(value = "") public OffsetDateTime getShipDate() { @@ -166,6 +164,7 @@ public Order status(StatusEnum status) { * Order Status * @return status */ + @JsonProperty("status") @ApiModelProperty(value = "Order Status") public StatusEnum getStatus() { @@ -185,6 +184,7 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ + @JsonProperty("complete") @ApiModelProperty(value = "") public Boolean getComplete() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/OuterComposite.java index c1a709bb26ad..00cce99097d7 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/OuterComposite.java @@ -23,13 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class OuterComposite { - @JsonProperty("my_number") private BigDecimal myNumber; - @JsonProperty("my_string") private String myString; - @JsonProperty("my_boolean") private Boolean myBoolean; public OuterComposite myNumber(BigDecimal myNumber) { @@ -41,6 +38,7 @@ public OuterComposite myNumber(BigDecimal myNumber) { * Get myNumber * @return myNumber */ + @JsonProperty("my_number") @Valid @ApiModelProperty(value = "") public BigDecimal getMyNumber() { @@ -60,6 +58,7 @@ public OuterComposite myString(String myString) { * Get myString * @return myString */ + @JsonProperty("my_string") @ApiModelProperty(value = "") public String getMyString() { @@ -79,6 +78,7 @@ public OuterComposite myBoolean(Boolean myBoolean) { * Get myBoolean * @return myBoolean */ + @JsonProperty("my_boolean") @ApiModelProperty(value = "") public Boolean getMyBoolean() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java index 4d705acedcd2..e39c22373324 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java @@ -30,20 +30,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private Set photoUrls = new LinkedHashSet<>(); - @JsonProperty("tags") @Valid private List tags = null; @@ -84,7 +79,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; public Pet id(Long id) { @@ -96,6 +90,7 @@ public Pet id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -115,6 +110,7 @@ public Pet category(Category category) { * Get category * @return category */ + @JsonProperty("category") @Valid @ApiModelProperty(value = "") public Category getCategory() { @@ -134,6 +130,7 @@ public Pet name(String name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") public String getName() { @@ -158,6 +155,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ + @JsonProperty("photoUrls") @NotNull @ApiModelProperty(required = true, value = "") public Set getPhotoUrls() { @@ -186,6 +184,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ + @JsonProperty("tags") @Valid @ApiModelProperty(value = "") public List getTags() { @@ -205,6 +204,7 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ + @JsonProperty("status") @ApiModelProperty(value = "pet status in the store") public StatusEnum getStatus() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ReadOnlyFirst.java index b7a0a416782e..d02b8c8cfd53 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -22,10 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ReadOnlyFirst { - @JsonProperty("bar") private String bar; - @JsonProperty("baz") private String baz; public ReadOnlyFirst bar(String bar) { @@ -37,6 +35,7 @@ public ReadOnlyFirst bar(String bar) { * Get bar * @return bar */ + @JsonProperty("bar") @ApiModelProperty(readOnly = true, value = "") public String getBar() { @@ -56,6 +55,7 @@ public ReadOnlyFirst baz(String baz) { * Get baz * @return baz */ + @JsonProperty("baz") @ApiModelProperty(value = "") public String getBaz() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/SpecialModelName.java index f321ab78cd56..8f176362e027 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/SpecialModelName.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class SpecialModelName { - @JsonProperty("$special[property.name]") private Long $specialPropertyName; public SpecialModelName $specialPropertyName(Long $specialPropertyName) { @@ -36,6 +35,7 @@ public class SpecialModelName { * Get $specialPropertyName * @return $specialPropertyName */ + @JsonProperty("$special[property.name]") @ApiModelProperty(value = "") public Long get$SpecialPropertyName() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Tag.java index 6161be4a9229..f7797bef2f19 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Tag.java @@ -22,10 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -37,6 +35,7 @@ public Tag id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -56,6 +55,7 @@ public Tag name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java index f10cff73bb78..506efbf431c1 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -25,19 +25,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderDefault { - @JsonProperty("string_item") private String stringItem = "what"; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem = true; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -50,6 +45,7 @@ public TypeHolderDefault stringItem(String stringItem) { * Get stringItem * @return stringItem */ + @JsonProperty("string_item") @NotNull @ApiModelProperty(required = true, value = "") public String getStringItem() { @@ -69,6 +65,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ + @JsonProperty("number_item") @NotNull @Valid @ApiModelProperty(required = true, value = "") public BigDecimal getNumberItem() { @@ -88,6 +85,7 @@ public TypeHolderDefault integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ + @JsonProperty("integer_item") @NotNull @ApiModelProperty(required = true, value = "") public Integer getIntegerItem() { @@ -107,6 +105,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ + @JsonProperty("bool_item") @NotNull @ApiModelProperty(required = true, value = "") public Boolean getBoolItem() { @@ -131,6 +130,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ + @JsonProperty("array_item") @NotNull @ApiModelProperty(required = true, value = "") public List getArrayItem() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java index d2ae69a4e5a8..806c0c90fa18 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -25,22 +25,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderExample { - @JsonProperty("string_item") private String stringItem; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("float_item") private Float floatItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -53,6 +47,7 @@ public TypeHolderExample stringItem(String stringItem) { * Get stringItem * @return stringItem */ + @JsonProperty("string_item") @NotNull @ApiModelProperty(example = "what", required = true, value = "") public String getStringItem() { @@ -72,6 +67,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ + @JsonProperty("number_item") @NotNull @Valid @ApiModelProperty(example = "1.234", required = true, value = "") public BigDecimal getNumberItem() { @@ -91,6 +87,7 @@ public TypeHolderExample floatItem(Float floatItem) { * Get floatItem * @return floatItem */ + @JsonProperty("float_item") @NotNull @ApiModelProperty(example = "1.234", required = true, value = "") public Float getFloatItem() { @@ -110,6 +107,7 @@ public TypeHolderExample integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ + @JsonProperty("integer_item") @NotNull @ApiModelProperty(example = "-2", required = true, value = "") public Integer getIntegerItem() { @@ -129,6 +127,7 @@ public TypeHolderExample boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ + @JsonProperty("bool_item") @NotNull @ApiModelProperty(example = "true", required = true, value = "") public Boolean getBoolItem() { @@ -153,6 +152,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ + @JsonProperty("array_item") @NotNull @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "") public List getArrayItem() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/User.java index ec85459bc99a..f42832389ffe 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/User.java @@ -22,28 +22,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -55,6 +47,7 @@ public User id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -74,6 +67,7 @@ public User username(String username) { * Get username * @return username */ + @JsonProperty("username") @ApiModelProperty(value = "") public String getUsername() { @@ -93,6 +87,7 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ + @JsonProperty("firstName") @ApiModelProperty(value = "") public String getFirstName() { @@ -112,6 +107,7 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ + @JsonProperty("lastName") @ApiModelProperty(value = "") public String getLastName() { @@ -131,6 +127,7 @@ public User email(String email) { * Get email * @return email */ + @JsonProperty("email") @ApiModelProperty(value = "") public String getEmail() { @@ -150,6 +147,7 @@ public User password(String password) { * Get password * @return password */ + @JsonProperty("password") @ApiModelProperty(value = "") public String getPassword() { @@ -169,6 +167,7 @@ public User phone(String phone) { * Get phone * @return phone */ + @JsonProperty("phone") @ApiModelProperty(value = "") public String getPhone() { @@ -188,6 +187,7 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ + @JsonProperty("userStatus") @ApiModelProperty(value = "User Status") public Integer getUserStatus() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java index 27d5f8282818..c795b4b85e6d 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java @@ -25,99 +25,70 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class XmlItem { - @JsonProperty("attribute_string") private String attributeString; - @JsonProperty("attribute_number") private BigDecimal attributeNumber; - @JsonProperty("attribute_integer") private Integer attributeInteger; - @JsonProperty("attribute_boolean") private Boolean attributeBoolean; - @JsonProperty("wrapped_array") @Valid private List wrappedArray = null; - @JsonProperty("name_string") private String nameString; - @JsonProperty("name_number") private BigDecimal nameNumber; - @JsonProperty("name_integer") private Integer nameInteger; - @JsonProperty("name_boolean") private Boolean nameBoolean; - @JsonProperty("name_array") @Valid private List nameArray = null; - @JsonProperty("name_wrapped_array") @Valid private List nameWrappedArray = null; - @JsonProperty("prefix_string") private String prefixString; - @JsonProperty("prefix_number") private BigDecimal prefixNumber; - @JsonProperty("prefix_integer") private Integer prefixInteger; - @JsonProperty("prefix_boolean") private Boolean prefixBoolean; - @JsonProperty("prefix_array") @Valid private List prefixArray = null; - @JsonProperty("prefix_wrapped_array") @Valid private List prefixWrappedArray = null; - @JsonProperty("namespace_string") private String namespaceString; - @JsonProperty("namespace_number") private BigDecimal namespaceNumber; - @JsonProperty("namespace_integer") private Integer namespaceInteger; - @JsonProperty("namespace_boolean") private Boolean namespaceBoolean; - @JsonProperty("namespace_array") @Valid private List namespaceArray = null; - @JsonProperty("namespace_wrapped_array") @Valid private List namespaceWrappedArray = null; - @JsonProperty("prefix_ns_string") private String prefixNsString; - @JsonProperty("prefix_ns_number") private BigDecimal prefixNsNumber; - @JsonProperty("prefix_ns_integer") private Integer prefixNsInteger; - @JsonProperty("prefix_ns_boolean") private Boolean prefixNsBoolean; - @JsonProperty("prefix_ns_array") @Valid private List prefixNsArray = null; - @JsonProperty("prefix_ns_wrapped_array") @Valid private List prefixNsWrappedArray = null; @@ -130,6 +101,7 @@ public XmlItem attributeString(String attributeString) { * Get attributeString * @return attributeString */ + @JsonProperty("attribute_string") @ApiModelProperty(example = "string", value = "") public String getAttributeString() { @@ -149,6 +121,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) { * Get attributeNumber * @return attributeNumber */ + @JsonProperty("attribute_number") @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getAttributeNumber() { @@ -168,6 +141,7 @@ public XmlItem attributeInteger(Integer attributeInteger) { * Get attributeInteger * @return attributeInteger */ + @JsonProperty("attribute_integer") @ApiModelProperty(example = "-2", value = "") public Integer getAttributeInteger() { @@ -187,6 +161,7 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) { * Get attributeBoolean * @return attributeBoolean */ + @JsonProperty("attribute_boolean") @ApiModelProperty(example = "true", value = "") public Boolean getAttributeBoolean() { @@ -214,6 +189,7 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) { * Get wrappedArray * @return wrappedArray */ + @JsonProperty("wrapped_array") @ApiModelProperty(value = "") public List getWrappedArray() { @@ -233,6 +209,7 @@ public XmlItem nameString(String nameString) { * Get nameString * @return nameString */ + @JsonProperty("name_string") @ApiModelProperty(example = "string", value = "") public String getNameString() { @@ -252,6 +229,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) { * Get nameNumber * @return nameNumber */ + @JsonProperty("name_number") @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getNameNumber() { @@ -271,6 +249,7 @@ public XmlItem nameInteger(Integer nameInteger) { * Get nameInteger * @return nameInteger */ + @JsonProperty("name_integer") @ApiModelProperty(example = "-2", value = "") public Integer getNameInteger() { @@ -290,6 +269,7 @@ public XmlItem nameBoolean(Boolean nameBoolean) { * Get nameBoolean * @return nameBoolean */ + @JsonProperty("name_boolean") @ApiModelProperty(example = "true", value = "") public Boolean getNameBoolean() { @@ -317,6 +297,7 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) { * Get nameArray * @return nameArray */ + @JsonProperty("name_array") @ApiModelProperty(value = "") public List getNameArray() { @@ -344,6 +325,7 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) { * Get nameWrappedArray * @return nameWrappedArray */ + @JsonProperty("name_wrapped_array") @ApiModelProperty(value = "") public List getNameWrappedArray() { @@ -363,6 +345,7 @@ public XmlItem prefixString(String prefixString) { * Get prefixString * @return prefixString */ + @JsonProperty("prefix_string") @ApiModelProperty(example = "string", value = "") public String getPrefixString() { @@ -382,6 +365,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) { * Get prefixNumber * @return prefixNumber */ + @JsonProperty("prefix_number") @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getPrefixNumber() { @@ -401,6 +385,7 @@ public XmlItem prefixInteger(Integer prefixInteger) { * Get prefixInteger * @return prefixInteger */ + @JsonProperty("prefix_integer") @ApiModelProperty(example = "-2", value = "") public Integer getPrefixInteger() { @@ -420,6 +405,7 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) { * Get prefixBoolean * @return prefixBoolean */ + @JsonProperty("prefix_boolean") @ApiModelProperty(example = "true", value = "") public Boolean getPrefixBoolean() { @@ -447,6 +433,7 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) { * Get prefixArray * @return prefixArray */ + @JsonProperty("prefix_array") @ApiModelProperty(value = "") public List getPrefixArray() { @@ -474,6 +461,7 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) { * Get prefixWrappedArray * @return prefixWrappedArray */ + @JsonProperty("prefix_wrapped_array") @ApiModelProperty(value = "") public List getPrefixWrappedArray() { @@ -493,6 +481,7 @@ public XmlItem namespaceString(String namespaceString) { * Get namespaceString * @return namespaceString */ + @JsonProperty("namespace_string") @ApiModelProperty(example = "string", value = "") public String getNamespaceString() { @@ -512,6 +501,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) { * Get namespaceNumber * @return namespaceNumber */ + @JsonProperty("namespace_number") @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getNamespaceNumber() { @@ -531,6 +521,7 @@ public XmlItem namespaceInteger(Integer namespaceInteger) { * Get namespaceInteger * @return namespaceInteger */ + @JsonProperty("namespace_integer") @ApiModelProperty(example = "-2", value = "") public Integer getNamespaceInteger() { @@ -550,6 +541,7 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) { * Get namespaceBoolean * @return namespaceBoolean */ + @JsonProperty("namespace_boolean") @ApiModelProperty(example = "true", value = "") public Boolean getNamespaceBoolean() { @@ -577,6 +569,7 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) { * Get namespaceArray * @return namespaceArray */ + @JsonProperty("namespace_array") @ApiModelProperty(value = "") public List getNamespaceArray() { @@ -604,6 +597,7 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) { * Get namespaceWrappedArray * @return namespaceWrappedArray */ + @JsonProperty("namespace_wrapped_array") @ApiModelProperty(value = "") public List getNamespaceWrappedArray() { @@ -623,6 +617,7 @@ public XmlItem prefixNsString(String prefixNsString) { * Get prefixNsString * @return prefixNsString */ + @JsonProperty("prefix_ns_string") @ApiModelProperty(example = "string", value = "") public String getPrefixNsString() { @@ -642,6 +637,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) { * Get prefixNsNumber * @return prefixNsNumber */ + @JsonProperty("prefix_ns_number") @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getPrefixNsNumber() { @@ -661,6 +657,7 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) { * Get prefixNsInteger * @return prefixNsInteger */ + @JsonProperty("prefix_ns_integer") @ApiModelProperty(example = "-2", value = "") public Integer getPrefixNsInteger() { @@ -680,6 +677,7 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) { * Get prefixNsBoolean * @return prefixNsBoolean */ + @JsonProperty("prefix_ns_boolean") @ApiModelProperty(example = "true", value = "") public Boolean getPrefixNsBoolean() { @@ -707,6 +705,7 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) { * Get prefixNsArray * @return prefixNsArray */ + @JsonProperty("prefix_ns_array") @ApiModelProperty(value = "") public List getPrefixNsArray() { @@ -734,6 +733,7 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) { * Get prefixNsWrappedArray * @return prefixNsWrappedArray */ + @JsonProperty("prefix_ns_wrapped_array") @ApiModelProperty(value = "") public List getPrefixNsWrappedArray() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesAnyType.java index 05466a3fc21f..1264511924a3 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesAnyType.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesAnyType extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesAnyType name(String name) { @@ -35,6 +34,7 @@ public AdditionalPropertiesAnyType name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesArray.java index c210e8ba863a..9854173bdb10 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesArray.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesArray extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesArray name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesArray name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesBoolean.java index 47f6c5c10541..dbf5f68bef99 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesBoolean.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesBoolean extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesBoolean name(String name) { @@ -35,6 +34,7 @@ public AdditionalPropertiesBoolean name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesClass.java index 051fc2256174..aff98b03f1ab 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesClass.java @@ -25,45 +25,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesClass { - @JsonProperty("map_string") @Valid private Map mapString = null; - @JsonProperty("map_number") @Valid private Map mapNumber = null; - @JsonProperty("map_integer") @Valid private Map mapInteger = null; - @JsonProperty("map_boolean") @Valid private Map mapBoolean = null; - @JsonProperty("map_array_integer") @Valid private Map> mapArrayInteger = null; - @JsonProperty("map_array_anytype") @Valid private Map> mapArrayAnytype = null; - @JsonProperty("map_map_string") @Valid private Map> mapMapString = null; - @JsonProperty("map_map_anytype") @Valid private Map> mapMapAnytype = null; - @JsonProperty("anytype_1") private Object anytype1; - @JsonProperty("anytype_2") private Object anytype2; - @JsonProperty("anytype_3") private Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { @@ -83,6 +72,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt * Get mapString * @return mapString */ + @JsonProperty("map_string") @Schema(name = "map_string", required = false) public Map getMapString() { @@ -110,6 +100,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * Get mapNumber * @return mapNumber */ + @JsonProperty("map_number") @Valid @Schema(name = "map_number", required = false) public Map getMapNumber() { @@ -137,6 +128,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege * Get mapInteger * @return mapInteger */ + @JsonProperty("map_integer") @Schema(name = "map_integer", required = false) public Map getMapInteger() { @@ -164,6 +156,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea * Get mapBoolean * @return mapBoolean */ + @JsonProperty("map_boolean") @Schema(name = "map_boolean", required = false) public Map getMapBoolean() { @@ -191,6 +184,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { @@ -218,6 +212,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * Get mapArrayAnytype * @return mapArrayAnytype */ + @JsonProperty("map_array_anytype") @Valid @Schema(name = "map_array_anytype", required = false) public Map> getMapArrayAnytype() { @@ -245,6 +240,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { @@ -272,6 +268,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { @@ -291,6 +288,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) { * Get anytype1 * @return anytype1 */ + @JsonProperty("anytype_1") @Schema(name = "anytype_1", required = false) public Object getAnytype1() { @@ -310,6 +308,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) { * Get anytype2 * @return anytype2 */ + @JsonProperty("anytype_2") @Schema(name = "anytype_2", required = false) public Object getAnytype2() { @@ -329,6 +328,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) { * Get anytype3 * @return anytype3 */ + @JsonProperty("anytype_3") @Schema(name = "anytype_3", required = false) public Object getAnytype3() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesInteger.java index 18ad45a07554..83646477dcd2 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesInteger.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesInteger extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesInteger name(String name) { @@ -35,6 +34,7 @@ public AdditionalPropertiesInteger name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesNumber.java index 0dae708a3c25..513f1b778995 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesNumber.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesNumber extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesNumber name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesNumber name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesObject.java index a4a85527c5dd..73455c9b6265 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesObject.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesObject extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesObject name(String name) { @@ -35,6 +34,7 @@ public AdditionalPropertiesObject name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesString.java index a8ae509b3546..a173f4bc1f38 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesString.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesString extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesString name(String name) { @@ -35,6 +34,7 @@ public AdditionalPropertiesString name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Animal.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Animal.java index 7238fc7b80b6..601b2c51c171 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Animal.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Animal.java @@ -38,10 +38,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Animal { - @JsonProperty("className") private String className; - @JsonProperty("color") private String color = "red"; public Animal className(String className) { @@ -53,6 +51,7 @@ public Animal className(String className) { * Get className * @return className */ + @JsonProperty("className") @NotNull @Schema(name = "className", required = true) public String getClassName() { @@ -72,6 +71,7 @@ public Animal color(String color) { * Get color * @return color */ + @JsonProperty("color") @Schema(name = "color", required = false) public String getColor() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfArrayOfNumberOnly.java index 7882ddfa0365..4bfcbdd77550 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfArrayOfNumberOnly.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfArrayOfNumberOnly { - @JsonProperty("ArrayArrayNumber") @Valid private List> arrayArrayNumber = null; @@ -45,6 +44,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * Get arrayArrayNumber * @return arrayArrayNumber */ + @JsonProperty("ArrayArrayNumber") @Valid @Schema(name = "ArrayArrayNumber", required = false) public List> getArrayArrayNumber() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfNumberOnly.java index ef93d88d750e..6ddc96cd598f 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfNumberOnly.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfNumberOnly { - @JsonProperty("ArrayNumber") @Valid private List arrayNumber = null; @@ -45,6 +44,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ + @JsonProperty("ArrayNumber") @Valid @Schema(name = "ArrayNumber", required = false) public List getArrayNumber() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayTest.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayTest.java index 2398d2c3c4ff..02b98c9f3244 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayTest.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayTest.java @@ -24,15 +24,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayTest { - @JsonProperty("array_of_string") @Valid private List arrayOfString = null; - @JsonProperty("array_array_of_integer") @Valid private List> arrayArrayOfInteger = null; - @JsonProperty("array_array_of_model") @Valid private List> arrayArrayOfModel = null; @@ -53,6 +50,7 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) { * Get arrayOfString * @return arrayOfString */ + @JsonProperty("array_of_string") @Schema(name = "array_of_string", required = false) public List getArrayOfString() { @@ -80,6 +78,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ + @JsonProperty("array_array_of_integer") @Valid @Schema(name = "array_array_of_integer", required = false) public List> getArrayArrayOfInteger() { @@ -107,6 +106,7 @@ public ArrayTest addArrayArrayOfModelItem(List arrayArrayOfModelI * Get arrayArrayOfModel * @return arrayArrayOfModel */ + @JsonProperty("array_array_of_model") @Valid @Schema(name = "array_array_of_model", required = false) public List> getArrayArrayOfModel() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/BigCat.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/BigCat.java index e63d67bb8fe8..9a6a3a0d8e06 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/BigCat.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/BigCat.java @@ -66,7 +66,6 @@ public static KindEnum fromValue(String value) { } } - @JsonProperty("kind") private KindEnum kind; public BigCat kind(KindEnum kind) { @@ -78,6 +77,7 @@ public BigCat kind(KindEnum kind) { * Get kind * @return kind */ + @JsonProperty("kind") @Schema(name = "kind", required = false) public KindEnum getKind() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/BigCatAllOf.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/BigCatAllOf.java index e3269825bc2d..d21e45d7b86c 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/BigCatAllOf.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/BigCatAllOf.java @@ -63,7 +63,6 @@ public static KindEnum fromValue(String value) { } } - @JsonProperty("kind") private KindEnum kind; public BigCatAllOf kind(KindEnum kind) { @@ -75,6 +74,7 @@ public BigCatAllOf kind(KindEnum kind) { * Get kind * @return kind */ + @JsonProperty("kind") @Schema(name = "kind", required = false) public KindEnum getKind() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Capitalization.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Capitalization.java index 8e049e975760..324588999dd8 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Capitalization.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Capitalization.java @@ -21,22 +21,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Capitalization { - @JsonProperty("smallCamel") private String smallCamel; - @JsonProperty("CapitalCamel") private String capitalCamel; - @JsonProperty("small_Snake") private String smallSnake; - @JsonProperty("Capital_Snake") private String capitalSnake; - @JsonProperty("SCA_ETH_Flow_Points") private String scAETHFlowPoints; - @JsonProperty("ATT_NAME") private String ATT_NAME; public Capitalization smallCamel(String smallCamel) { @@ -48,6 +42,7 @@ public Capitalization smallCamel(String smallCamel) { * Get smallCamel * @return smallCamel */ + @JsonProperty("smallCamel") @Schema(name = "smallCamel", required = false) public String getSmallCamel() { @@ -67,6 +62,7 @@ public Capitalization capitalCamel(String capitalCamel) { * Get capitalCamel * @return capitalCamel */ + @JsonProperty("CapitalCamel") @Schema(name = "CapitalCamel", required = false) public String getCapitalCamel() { @@ -86,6 +82,7 @@ public Capitalization smallSnake(String smallSnake) { * Get smallSnake * @return smallSnake */ + @JsonProperty("small_Snake") @Schema(name = "small_Snake", required = false) public String getSmallSnake() { @@ -105,6 +102,7 @@ public Capitalization capitalSnake(String capitalSnake) { * Get capitalSnake * @return capitalSnake */ + @JsonProperty("Capital_Snake") @Schema(name = "Capital_Snake", required = false) public String getCapitalSnake() { @@ -124,6 +122,7 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) { * Get scAETHFlowPoints * @return scAETHFlowPoints */ + @JsonProperty("SCA_ETH_Flow_Points") @Schema(name = "SCA_ETH_Flow_Points", required = false) public String getScAETHFlowPoints() { @@ -143,6 +142,7 @@ public Capitalization ATT_NAME(String ATT_NAME) { * Name of the pet * @return ATT_NAME */ + @JsonProperty("ATT_NAME") @Schema(name = "ATT_NAME", description = "Name of the pet ", required = false) public String getATTNAME() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Cat.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Cat.java index c72be537261d..58bea11e9a6b 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Cat.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Cat.java @@ -35,7 +35,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Cat extends Animal { - @JsonProperty("declawed") private Boolean declawed; public Cat declawed(Boolean declawed) { @@ -47,6 +46,7 @@ public Cat declawed(Boolean declawed) { * Get declawed * @return declawed */ + @JsonProperty("declawed") @Schema(name = "declawed", required = false) public Boolean getDeclawed() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/CatAllOf.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/CatAllOf.java index 7d8a54bbb25f..248b96ec7a39 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/CatAllOf.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/CatAllOf.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class CatAllOf { - @JsonProperty("declawed") private Boolean declawed; public CatAllOf declawed(Boolean declawed) { @@ -35,6 +34,7 @@ public CatAllOf declawed(Boolean declawed) { * Get declawed * @return declawed */ + @JsonProperty("declawed") @Schema(name = "declawed", required = false) public Boolean getDeclawed() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Category.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Category.java index 7196d93ac034..c2f43d03bb2a 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Category.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Category.java @@ -21,10 +21,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name = "default-name"; public Category id(Long id) { @@ -36,6 +34,7 @@ public Category id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -55,6 +54,7 @@ public Category name(String name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @Schema(name = "name", required = true) public String getName() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ClassModel.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ClassModel.java index 7258b2403083..ca39fd04f7ee 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ClassModel.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ClassModel.java @@ -22,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ClassModel { - @JsonProperty("_class") private String propertyClass; public ClassModel propertyClass(String propertyClass) { @@ -34,6 +33,7 @@ public ClassModel propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ + @JsonProperty("_class") @Schema(name = "_class", required = false) public String getPropertyClass() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Client.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Client.java index aba5b243b70f..427399764aa5 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Client.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Client.java @@ -21,7 +21,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Client { - @JsonProperty("client") private String client; public Client client(String client) { @@ -33,6 +32,7 @@ public Client client(String client) { * Get client * @return client */ + @JsonProperty("client") @Schema(name = "client", required = false) public String getClient() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Dog.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Dog.java index 435e02050696..fc3951e0e563 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Dog.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Dog.java @@ -26,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Dog extends Animal { - @JsonProperty("breed") private String breed; public Dog breed(String breed) { @@ -38,6 +37,7 @@ public Dog breed(String breed) { * Get breed * @return breed */ + @JsonProperty("breed") @Schema(name = "breed", required = false) public String getBreed() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/DogAllOf.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/DogAllOf.java index fc1e59acc0eb..b5c04183e07e 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/DogAllOf.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/DogAllOf.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class DogAllOf { - @JsonProperty("breed") private String breed; public DogAllOf breed(String breed) { @@ -35,6 +34,7 @@ public DogAllOf breed(String breed) { * Get breed * @return breed */ + @JsonProperty("breed") @Schema(name = "breed", required = false) public String getBreed() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumArrays.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumArrays.java index 78612a18929d..c341bbad13d4 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumArrays.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumArrays.java @@ -59,7 +59,6 @@ public static JustSymbolEnum fromValue(String value) { } } - @JsonProperty("just_symbol") private JustSymbolEnum justSymbol; /** @@ -97,7 +96,6 @@ public static ArrayEnumEnum fromValue(String value) { } } - @JsonProperty("array_enum") @Valid private List arrayEnum = null; @@ -110,6 +108,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) { * Get justSymbol * @return justSymbol */ + @JsonProperty("just_symbol") @Schema(name = "just_symbol", required = false) public JustSymbolEnum getJustSymbol() { @@ -137,6 +136,7 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) { * Get arrayEnum * @return arrayEnum */ + @JsonProperty("array_enum") @Schema(name = "array_enum", required = false) public List getArrayEnum() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumTest.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumTest.java index dc6498a49748..e9862cc8314b 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumTest.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumTest.java @@ -62,7 +62,6 @@ public static EnumStringEnum fromValue(String value) { } } - @JsonProperty("enum_string") private EnumStringEnum enumString; /** @@ -102,7 +101,6 @@ public static EnumStringRequiredEnum fromValue(String value) { } } - @JsonProperty("enum_string_required") private EnumStringRequiredEnum enumStringRequired; /** @@ -140,7 +138,6 @@ public static EnumIntegerEnum fromValue(Integer value) { } } - @JsonProperty("enum_integer") private EnumIntegerEnum enumInteger; /** @@ -178,10 +175,8 @@ public static EnumNumberEnum fromValue(Double value) { } } - @JsonProperty("enum_number") private EnumNumberEnum enumNumber; - @JsonProperty("outerEnum") private OuterEnum outerEnum; public EnumTest enumString(EnumStringEnum enumString) { @@ -193,6 +188,7 @@ public EnumTest enumString(EnumStringEnum enumString) { * Get enumString * @return enumString */ + @JsonProperty("enum_string") @Schema(name = "enum_string", required = false) public EnumStringEnum getEnumString() { @@ -212,6 +208,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) { * Get enumStringRequired * @return enumStringRequired */ + @JsonProperty("enum_string_required") @NotNull @Schema(name = "enum_string_required", required = true) public EnumStringRequiredEnum getEnumStringRequired() { @@ -231,6 +228,7 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) { * Get enumInteger * @return enumInteger */ + @JsonProperty("enum_integer") @Schema(name = "enum_integer", required = false) public EnumIntegerEnum getEnumInteger() { @@ -250,6 +248,7 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) { * Get enumNumber * @return enumNumber */ + @JsonProperty("enum_number") @Schema(name = "enum_number", required = false) public EnumNumberEnum getEnumNumber() { @@ -269,6 +268,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) { * Get outerEnum * @return outerEnum */ + @JsonProperty("outerEnum") @Valid @Schema(name = "outerEnum", required = false) public OuterEnum getOuterEnum() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/File.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/File.java index 2ac7e4d1767e..cd590f9f2f62 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/File.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/File.java @@ -22,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class File { - @JsonProperty("sourceURI") private String sourceURI; public File sourceURI(String sourceURI) { @@ -34,6 +33,7 @@ public File sourceURI(String sourceURI) { * Test capitalization * @return sourceURI */ + @JsonProperty("sourceURI") @Schema(name = "sourceURI", description = "Test capitalization", required = false) public String getSourceURI() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FileSchemaTestClass.java index 351da9606617..d4c3f6255ae8 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FileSchemaTestClass.java @@ -24,10 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FileSchemaTestClass { - @JsonProperty("file") private File file; - @JsonProperty("files") @Valid private List files = null; @@ -40,6 +38,7 @@ public FileSchemaTestClass file(File file) { * Get file * @return file */ + @JsonProperty("file") @Valid @Schema(name = "file", required = false) public File getFile() { @@ -67,6 +66,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) { * Get files * @return files */ + @JsonProperty("files") @Valid @Schema(name = "files", required = false) public List getFiles() { 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 00b2379c9e7a..0f4173abd29b 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 @@ -29,48 +29,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FormatTest { - @JsonProperty("integer") private Integer integer; - @JsonProperty("int32") private Integer int32; - @JsonProperty("int64") private Long int64; - @JsonProperty("number") private BigDecimal number; - @JsonProperty("float") private Float _float; - @JsonProperty("double") private Double _double; - @JsonProperty("string") private String string; - @JsonProperty("byte") private byte[] _byte; - @JsonProperty("binary") private org.springframework.core.io.Resource binary; - @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("password") private String password; - @JsonProperty("BigDecimal") private BigDecimal bigDecimal; public FormatTest integer(Integer integer) { @@ -84,6 +70,7 @@ public FormatTest integer(Integer integer) { * maximum: 100 * @return integer */ + @JsonProperty("integer") @Min(10) @Max(100) @Schema(name = "integer", required = false) public Integer getInteger() { @@ -105,6 +92,7 @@ public FormatTest int32(Integer int32) { * maximum: 200 * @return int32 */ + @JsonProperty("int32") @Min(20) @Max(200) @Schema(name = "int32", required = false) public Integer getInt32() { @@ -124,6 +112,7 @@ public FormatTest int64(Long int64) { * Get int64 * @return int64 */ + @JsonProperty("int64") @Schema(name = "int64", required = false) public Long getInt64() { @@ -145,6 +134,7 @@ public FormatTest number(BigDecimal number) { * maximum: 543.2 * @return number */ + @JsonProperty("number") @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") @Schema(name = "number", required = true) public BigDecimal getNumber() { @@ -166,6 +156,7 @@ public FormatTest _float(Float _float) { * maximum: 987.6 * @return _float */ + @JsonProperty("float") @DecimalMin("54.3") @DecimalMax("987.6") @Schema(name = "float", required = false) public Float getFloat() { @@ -187,6 +178,7 @@ public FormatTest _double(Double _double) { * maximum: 123.4 * @return _double */ + @JsonProperty("double") @DecimalMin("67.8") @DecimalMax("123.4") @Schema(name = "double", required = false) public Double getDouble() { @@ -206,6 +198,7 @@ public FormatTest string(String string) { * Get string * @return string */ + @JsonProperty("string") @Pattern(regexp = "/[a-z]/i") @Schema(name = "string", required = false) public String getString() { @@ -225,6 +218,7 @@ public FormatTest _byte(byte[] _byte) { * Get _byte * @return _byte */ + @JsonProperty("byte") @NotNull @Schema(name = "byte", required = true) public byte[] getByte() { @@ -244,6 +238,7 @@ public FormatTest binary(org.springframework.core.io.Resource binary) { * Get binary * @return binary */ + @JsonProperty("binary") @Valid @Schema(name = "binary", required = false) public org.springframework.core.io.Resource getBinary() { @@ -263,6 +258,7 @@ public FormatTest date(LocalDate date) { * Get date * @return date */ + @JsonProperty("date") @NotNull @Valid @Schema(name = "date", required = true) public LocalDate getDate() { @@ -282,6 +278,7 @@ public FormatTest dateTime(OffsetDateTime dateTime) { * Get dateTime * @return dateTime */ + @JsonProperty("dateTime") @Valid @Schema(name = "dateTime", required = false) public OffsetDateTime getDateTime() { @@ -301,6 +298,7 @@ public FormatTest uuid(UUID uuid) { * Get uuid * @return uuid */ + @JsonProperty("uuid") @Valid @Schema(name = "uuid", example = "72f98069-206d-4f12-9f12-3d1e525a8e84", required = false) public UUID getUuid() { @@ -320,6 +318,7 @@ public FormatTest password(String password) { * Get password * @return password */ + @JsonProperty("password") @NotNull @Size(min = 10, max = 64) @Schema(name = "password", required = true) public String getPassword() { @@ -339,6 +338,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) { * Get bigDecimal * @return bigDecimal */ + @JsonProperty("BigDecimal") @Valid @Schema(name = "BigDecimal", required = false) public BigDecimal getBigDecimal() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/HasOnlyReadOnly.java index 7a7571cfc37c..84f13a291a80 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/HasOnlyReadOnly.java @@ -23,10 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class HasOnlyReadOnly { - @JsonProperty("bar") private String bar; - @JsonProperty("foo") private String foo; public HasOnlyReadOnly bar(String bar) { @@ -38,6 +36,7 @@ public HasOnlyReadOnly bar(String bar) { * Get bar * @return bar */ + @JsonProperty("bar") @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, required = false) public String getBar() { @@ -57,6 +56,7 @@ public HasOnlyReadOnly foo(String foo) { * Get foo * @return foo */ + @JsonProperty("foo") @Schema(name = "foo", accessMode = Schema.AccessMode.READ_ONLY, required = false) public String getFoo() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MapTest.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MapTest.java index 2478f4c10590..aed48db27b48 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MapTest.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MapTest.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MapTest { - @JsonProperty("map_map_of_string") @Valid private Map> mapMapOfString = null; @@ -63,15 +62,12 @@ public static InnerEnum fromValue(String value) { } } - @JsonProperty("map_of_enum_string") @Valid private Map mapOfEnumString = null; - @JsonProperty("direct_map") @Valid private Map directMap = null; - @JsonProperty("indirect_map") @Valid private Map indirectMap = null; @@ -92,6 +88,7 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapMapOfString * @return mapMapOfString */ + @JsonProperty("map_map_of_string") @Valid @Schema(name = "map_map_of_string", required = false) public Map> getMapMapOfString() { @@ -119,6 +116,7 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) * Get mapOfEnumString * @return mapOfEnumString */ + @JsonProperty("map_of_enum_string") @Schema(name = "map_of_enum_string", required = false) public Map getMapOfEnumString() { @@ -146,6 +144,7 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) { * Get directMap * @return directMap */ + @JsonProperty("direct_map") @Schema(name = "direct_map", required = false) public Map getDirectMap() { @@ -173,6 +172,7 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) { * Get indirectMap * @return indirectMap */ + @JsonProperty("indirect_map") @Schema(name = "indirect_map", required = false) public Map getIndirectMap() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MixedPropertiesAndAdditionalPropertiesClass.java index 1f48c51c733a..146e6ec15f29 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -27,14 +27,11 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("map") @Valid private Map map = null; @@ -47,6 +44,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { * Get uuid * @return uuid */ + @JsonProperty("uuid") @Valid @Schema(name = "uuid", required = false) public UUID getUuid() { @@ -66,6 +64,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT * Get dateTime * @return dateTime */ + @JsonProperty("dateTime") @Valid @Schema(name = "dateTime", required = false) public OffsetDateTime getDateTime() { @@ -93,6 +92,7 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * Get map * @return map */ + @JsonProperty("map") @Valid @Schema(name = "map", required = false) public Map getMap() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Model200Response.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Model200Response.java index a3e6d6c9563a..fb66f7341953 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Model200Response.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Model200Response.java @@ -24,10 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Model200Response { - @JsonProperty("name") private Integer name; - @JsonProperty("class") private String propertyClass; public Model200Response name(Integer name) { @@ -39,6 +37,7 @@ public Model200Response name(Integer name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public Integer getName() { @@ -58,6 +57,7 @@ public Model200Response propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ + @JsonProperty("class") @Schema(name = "class", required = false) public String getPropertyClass() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelApiResponse.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelApiResponse.java index a26037d5676f..1827391b22bf 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelApiResponse.java @@ -23,13 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -41,6 +38,7 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ + @JsonProperty("code") @Schema(name = "code", required = false) public Integer getCode() { @@ -60,6 +58,7 @@ public ModelApiResponse type(String type) { * Get type * @return type */ + @JsonProperty("type") @Schema(name = "type", required = false) public String getType() { @@ -79,6 +78,7 @@ public ModelApiResponse message(String message) { * Get message * @return message */ + @JsonProperty("message") @Schema(name = "message", required = false) public String getMessage() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelList.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelList.java index da454648982d..98832ee2d6ca 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelList.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelList.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelList { - @JsonProperty("123-list") private String _123list; public ModelList _123list(String _123list) { @@ -35,6 +34,7 @@ public ModelList _123list(String _123list) { * Get _123list * @return _123list */ + @JsonProperty("123-list") @Schema(name = "123-list", required = false) public String get123list() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelReturn.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelReturn.java index dae82c648447..8f9650f16a3e 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelReturn.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelReturn.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelReturn { - @JsonProperty("return") private Integer _return; public ModelReturn _return(Integer _return) { @@ -36,6 +35,7 @@ public ModelReturn _return(Integer _return) { * Get _return * @return _return */ + @JsonProperty("return") @Schema(name = "return", required = false) public Integer getReturn() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Name.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Name.java index 30a39b907274..775a9f6b15ac 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Name.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Name.java @@ -22,16 +22,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Name { - @JsonProperty("name") private Integer name; - @JsonProperty("snake_case") private Integer snakeCase; - @JsonProperty("property") private String property; - @JsonProperty("123Number") private Integer _123number; public Name name(Integer name) { @@ -43,6 +39,7 @@ public Name name(Integer name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @Schema(name = "name", required = true) public Integer getName() { @@ -62,6 +59,7 @@ public Name snakeCase(Integer snakeCase) { * Get snakeCase * @return snakeCase */ + @JsonProperty("snake_case") @Schema(name = "snake_case", accessMode = Schema.AccessMode.READ_ONLY, required = false) public Integer getSnakeCase() { @@ -81,6 +79,7 @@ public Name property(String property) { * Get property * @return property */ + @JsonProperty("property") @Schema(name = "property", required = false) public String getProperty() { @@ -100,6 +99,7 @@ public Name _123number(Integer _123number) { * Get _123number * @return _123number */ + @JsonProperty("123Number") @Schema(name = "123Number", accessMode = Schema.AccessMode.READ_ONLY, required = false) public Integer get123number() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/NumberOnly.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/NumberOnly.java index d244ec9f0506..4f3075751469 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/NumberOnly.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/NumberOnly.java @@ -22,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class NumberOnly { - @JsonProperty("JustNumber") private BigDecimal justNumber; public NumberOnly justNumber(BigDecimal justNumber) { @@ -34,6 +33,7 @@ public NumberOnly justNumber(BigDecimal justNumber) { * Get justNumber * @return justNumber */ + @JsonProperty("JustNumber") @Valid @Schema(name = "JustNumber", required = false) public BigDecimal getJustNumber() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Order.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Order.java index 97fdeb05392f..ab9f818fdd93 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Order.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Order.java @@ -24,16 +24,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -74,10 +70,8 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -89,6 +83,7 @@ public Order id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -108,6 +103,7 @@ public Order petId(Long petId) { * Get petId * @return petId */ + @JsonProperty("petId") @Schema(name = "petId", required = false) public Long getPetId() { @@ -127,6 +123,7 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ + @JsonProperty("quantity") @Schema(name = "quantity", required = false) public Integer getQuantity() { @@ -146,6 +143,7 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ + @JsonProperty("shipDate") @Valid @Schema(name = "shipDate", required = false) public OffsetDateTime getShipDate() { @@ -165,6 +163,7 @@ public Order status(StatusEnum status) { * Order Status * @return status */ + @JsonProperty("status") @Schema(name = "status", description = "Order Status", required = false) public StatusEnum getStatus() { @@ -184,6 +183,7 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ + @JsonProperty("complete") @Schema(name = "complete", required = false) public Boolean getComplete() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/OuterComposite.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/OuterComposite.java index 49051ed09a6a..34947d07d086 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/OuterComposite.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/OuterComposite.java @@ -22,13 +22,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class OuterComposite { - @JsonProperty("my_number") private BigDecimal myNumber; - @JsonProperty("my_string") private String myString; - @JsonProperty("my_boolean") private Boolean myBoolean; public OuterComposite myNumber(BigDecimal myNumber) { @@ -40,6 +37,7 @@ public OuterComposite myNumber(BigDecimal myNumber) { * Get myNumber * @return myNumber */ + @JsonProperty("my_number") @Valid @Schema(name = "my_number", required = false) public BigDecimal getMyNumber() { @@ -59,6 +57,7 @@ public OuterComposite myString(String myString) { * Get myString * @return myString */ + @JsonProperty("my_string") @Schema(name = "my_string", required = false) public String getMyString() { @@ -78,6 +77,7 @@ public OuterComposite myBoolean(Boolean myBoolean) { * Get myBoolean * @return myBoolean */ + @JsonProperty("my_boolean") @Schema(name = "my_boolean", required = false) public Boolean getMyBoolean() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Pet.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Pet.java index e89318ef871a..da80bf6f8a45 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Pet.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Pet.java @@ -29,20 +29,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private Set photoUrls = new LinkedHashSet<>(); - @JsonProperty("tags") @Valid private List tags = null; @@ -83,7 +78,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; public Pet id(Long id) { @@ -95,6 +89,7 @@ public Pet id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -114,6 +109,7 @@ public Pet category(Category category) { * Get category * @return category */ + @JsonProperty("category") @Valid @Schema(name = "category", required = false) public Category getCategory() { @@ -133,6 +129,7 @@ public Pet name(String name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @Schema(name = "name", example = "doggie", required = true) public String getName() { @@ -157,6 +154,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ + @JsonProperty("photoUrls") @NotNull @Schema(name = "photoUrls", required = true) public Set getPhotoUrls() { @@ -185,6 +183,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ + @JsonProperty("tags") @Valid @Schema(name = "tags", required = false) public List getTags() { @@ -204,6 +203,7 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ + @JsonProperty("status") @Schema(name = "status", description = "pet status in the store", required = false) public StatusEnum getStatus() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ReadOnlyFirst.java index b4b4688eb1a2..d54017b27cd5 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ReadOnlyFirst.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ReadOnlyFirst.java @@ -21,10 +21,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ReadOnlyFirst { - @JsonProperty("bar") private String bar; - @JsonProperty("baz") private String baz; public ReadOnlyFirst bar(String bar) { @@ -36,6 +34,7 @@ public ReadOnlyFirst bar(String bar) { * Get bar * @return bar */ + @JsonProperty("bar") @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, required = false) public String getBar() { @@ -55,6 +54,7 @@ public ReadOnlyFirst baz(String baz) { * Get baz * @return baz */ + @JsonProperty("baz") @Schema(name = "baz", required = false) public String getBaz() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/SpecialModelName.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/SpecialModelName.java index 7fb8738c725b..7fafc3d9f703 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/SpecialModelName.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class SpecialModelName { - @JsonProperty("$special[property.name]") private Long $specialPropertyName; public SpecialModelName $specialPropertyName(Long $specialPropertyName) { @@ -35,6 +34,7 @@ public class SpecialModelName { * Get $specialPropertyName * @return $specialPropertyName */ + @JsonProperty("$special[property.name]") @Schema(name = "$special[property.name]", required = false) public Long get$SpecialPropertyName() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Tag.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Tag.java index 7d35a9fc13c9..baf617a35b78 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Tag.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Tag.java @@ -21,10 +21,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -36,6 +34,7 @@ public Tag id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -55,6 +54,7 @@ public Tag name(String name) { * Get name * @return name */ + @JsonProperty("name") @Schema(name = "name", required = false) public String getName() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderDefault.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderDefault.java index a58fe18210fa..87985a0bf1a4 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderDefault.java @@ -24,19 +24,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderDefault { - @JsonProperty("string_item") private String stringItem = "what"; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem = true; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -49,6 +44,7 @@ public TypeHolderDefault stringItem(String stringItem) { * Get stringItem * @return stringItem */ + @JsonProperty("string_item") @NotNull @Schema(name = "string_item", required = true) public String getStringItem() { @@ -68,6 +64,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ + @JsonProperty("number_item") @NotNull @Valid @Schema(name = "number_item", required = true) public BigDecimal getNumberItem() { @@ -87,6 +84,7 @@ public TypeHolderDefault integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ + @JsonProperty("integer_item") @NotNull @Schema(name = "integer_item", required = true) public Integer getIntegerItem() { @@ -106,6 +104,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ + @JsonProperty("bool_item") @NotNull @Schema(name = "bool_item", required = true) public Boolean getBoolItem() { @@ -130,6 +129,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ + @JsonProperty("array_item") @NotNull @Schema(name = "array_item", required = true) public List getArrayItem() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderExample.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderExample.java index 1adc44928ff4..3d6c875251e2 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderExample.java @@ -24,22 +24,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderExample { - @JsonProperty("string_item") private String stringItem; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("float_item") private Float floatItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -52,6 +46,7 @@ public TypeHolderExample stringItem(String stringItem) { * Get stringItem * @return stringItem */ + @JsonProperty("string_item") @NotNull @Schema(name = "string_item", example = "what", required = true) public String getStringItem() { @@ -71,6 +66,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ + @JsonProperty("number_item") @NotNull @Valid @Schema(name = "number_item", example = "1.234", required = true) public BigDecimal getNumberItem() { @@ -90,6 +86,7 @@ public TypeHolderExample floatItem(Float floatItem) { * Get floatItem * @return floatItem */ + @JsonProperty("float_item") @NotNull @Schema(name = "float_item", example = "1.234", required = true) public Float getFloatItem() { @@ -109,6 +106,7 @@ public TypeHolderExample integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ + @JsonProperty("integer_item") @NotNull @Schema(name = "integer_item", example = "-2", required = true) public Integer getIntegerItem() { @@ -128,6 +126,7 @@ public TypeHolderExample boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ + @JsonProperty("bool_item") @NotNull @Schema(name = "bool_item", example = "true", required = true) public Boolean getBoolItem() { @@ -152,6 +151,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ + @JsonProperty("array_item") @NotNull @Schema(name = "array_item", example = "[0, 1, 2, 3]", required = true) public List getArrayItem() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/User.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/User.java index c5d187f69827..0e66e0d90459 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/User.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/User.java @@ -21,28 +21,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -54,6 +46,7 @@ public User id(Long id) { * Get id * @return id */ + @JsonProperty("id") @Schema(name = "id", required = false) public Long getId() { @@ -73,6 +66,7 @@ public User username(String username) { * Get username * @return username */ + @JsonProperty("username") @Schema(name = "username", required = false) public String getUsername() { @@ -92,6 +86,7 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ + @JsonProperty("firstName") @Schema(name = "firstName", required = false) public String getFirstName() { @@ -111,6 +106,7 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ + @JsonProperty("lastName") @Schema(name = "lastName", required = false) public String getLastName() { @@ -130,6 +126,7 @@ public User email(String email) { * Get email * @return email */ + @JsonProperty("email") @Schema(name = "email", required = false) public String getEmail() { @@ -149,6 +146,7 @@ public User password(String password) { * Get password * @return password */ + @JsonProperty("password") @Schema(name = "password", required = false) public String getPassword() { @@ -168,6 +166,7 @@ public User phone(String phone) { * Get phone * @return phone */ + @JsonProperty("phone") @Schema(name = "phone", required = false) public String getPhone() { @@ -187,6 +186,7 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ + @JsonProperty("userStatus") @Schema(name = "userStatus", description = "User Status", required = false) public Integer getUserStatus() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/XmlItem.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/XmlItem.java index 2eb74edaad87..2a82ab34e39d 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/XmlItem.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/XmlItem.java @@ -24,99 +24,70 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class XmlItem { - @JsonProperty("attribute_string") private String attributeString; - @JsonProperty("attribute_number") private BigDecimal attributeNumber; - @JsonProperty("attribute_integer") private Integer attributeInteger; - @JsonProperty("attribute_boolean") private Boolean attributeBoolean; - @JsonProperty("wrapped_array") @Valid private List wrappedArray = null; - @JsonProperty("name_string") private String nameString; - @JsonProperty("name_number") private BigDecimal nameNumber; - @JsonProperty("name_integer") private Integer nameInteger; - @JsonProperty("name_boolean") private Boolean nameBoolean; - @JsonProperty("name_array") @Valid private List nameArray = null; - @JsonProperty("name_wrapped_array") @Valid private List nameWrappedArray = null; - @JsonProperty("prefix_string") private String prefixString; - @JsonProperty("prefix_number") private BigDecimal prefixNumber; - @JsonProperty("prefix_integer") private Integer prefixInteger; - @JsonProperty("prefix_boolean") private Boolean prefixBoolean; - @JsonProperty("prefix_array") @Valid private List prefixArray = null; - @JsonProperty("prefix_wrapped_array") @Valid private List prefixWrappedArray = null; - @JsonProperty("namespace_string") private String namespaceString; - @JsonProperty("namespace_number") private BigDecimal namespaceNumber; - @JsonProperty("namespace_integer") private Integer namespaceInteger; - @JsonProperty("namespace_boolean") private Boolean namespaceBoolean; - @JsonProperty("namespace_array") @Valid private List namespaceArray = null; - @JsonProperty("namespace_wrapped_array") @Valid private List namespaceWrappedArray = null; - @JsonProperty("prefix_ns_string") private String prefixNsString; - @JsonProperty("prefix_ns_number") private BigDecimal prefixNsNumber; - @JsonProperty("prefix_ns_integer") private Integer prefixNsInteger; - @JsonProperty("prefix_ns_boolean") private Boolean prefixNsBoolean; - @JsonProperty("prefix_ns_array") @Valid private List prefixNsArray = null; - @JsonProperty("prefix_ns_wrapped_array") @Valid private List prefixNsWrappedArray = null; @@ -129,6 +100,7 @@ public XmlItem attributeString(String attributeString) { * Get attributeString * @return attributeString */ + @JsonProperty("attribute_string") @Schema(name = "attribute_string", example = "string", required = false) public String getAttributeString() { @@ -148,6 +120,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) { * Get attributeNumber * @return attributeNumber */ + @JsonProperty("attribute_number") @Valid @Schema(name = "attribute_number", example = "1.234", required = false) public BigDecimal getAttributeNumber() { @@ -167,6 +140,7 @@ public XmlItem attributeInteger(Integer attributeInteger) { * Get attributeInteger * @return attributeInteger */ + @JsonProperty("attribute_integer") @Schema(name = "attribute_integer", example = "-2", required = false) public Integer getAttributeInteger() { @@ -186,6 +160,7 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) { * Get attributeBoolean * @return attributeBoolean */ + @JsonProperty("attribute_boolean") @Schema(name = "attribute_boolean", example = "true", required = false) public Boolean getAttributeBoolean() { @@ -213,6 +188,7 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) { * Get wrappedArray * @return wrappedArray */ + @JsonProperty("wrapped_array") @Schema(name = "wrapped_array", required = false) public List getWrappedArray() { @@ -232,6 +208,7 @@ public XmlItem nameString(String nameString) { * Get nameString * @return nameString */ + @JsonProperty("name_string") @Schema(name = "name_string", example = "string", required = false) public String getNameString() { @@ -251,6 +228,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) { * Get nameNumber * @return nameNumber */ + @JsonProperty("name_number") @Valid @Schema(name = "name_number", example = "1.234", required = false) public BigDecimal getNameNumber() { @@ -270,6 +248,7 @@ public XmlItem nameInteger(Integer nameInteger) { * Get nameInteger * @return nameInteger */ + @JsonProperty("name_integer") @Schema(name = "name_integer", example = "-2", required = false) public Integer getNameInteger() { @@ -289,6 +268,7 @@ public XmlItem nameBoolean(Boolean nameBoolean) { * Get nameBoolean * @return nameBoolean */ + @JsonProperty("name_boolean") @Schema(name = "name_boolean", example = "true", required = false) public Boolean getNameBoolean() { @@ -316,6 +296,7 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) { * Get nameArray * @return nameArray */ + @JsonProperty("name_array") @Schema(name = "name_array", required = false) public List getNameArray() { @@ -343,6 +324,7 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) { * Get nameWrappedArray * @return nameWrappedArray */ + @JsonProperty("name_wrapped_array") @Schema(name = "name_wrapped_array", required = false) public List getNameWrappedArray() { @@ -362,6 +344,7 @@ public XmlItem prefixString(String prefixString) { * Get prefixString * @return prefixString */ + @JsonProperty("prefix_string") @Schema(name = "prefix_string", example = "string", required = false) public String getPrefixString() { @@ -381,6 +364,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) { * Get prefixNumber * @return prefixNumber */ + @JsonProperty("prefix_number") @Valid @Schema(name = "prefix_number", example = "1.234", required = false) public BigDecimal getPrefixNumber() { @@ -400,6 +384,7 @@ public XmlItem prefixInteger(Integer prefixInteger) { * Get prefixInteger * @return prefixInteger */ + @JsonProperty("prefix_integer") @Schema(name = "prefix_integer", example = "-2", required = false) public Integer getPrefixInteger() { @@ -419,6 +404,7 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) { * Get prefixBoolean * @return prefixBoolean */ + @JsonProperty("prefix_boolean") @Schema(name = "prefix_boolean", example = "true", required = false) public Boolean getPrefixBoolean() { @@ -446,6 +432,7 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) { * Get prefixArray * @return prefixArray */ + @JsonProperty("prefix_array") @Schema(name = "prefix_array", required = false) public List getPrefixArray() { @@ -473,6 +460,7 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) { * Get prefixWrappedArray * @return prefixWrappedArray */ + @JsonProperty("prefix_wrapped_array") @Schema(name = "prefix_wrapped_array", required = false) public List getPrefixWrappedArray() { @@ -492,6 +480,7 @@ public XmlItem namespaceString(String namespaceString) { * Get namespaceString * @return namespaceString */ + @JsonProperty("namespace_string") @Schema(name = "namespace_string", example = "string", required = false) public String getNamespaceString() { @@ -511,6 +500,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) { * Get namespaceNumber * @return namespaceNumber */ + @JsonProperty("namespace_number") @Valid @Schema(name = "namespace_number", example = "1.234", required = false) public BigDecimal getNamespaceNumber() { @@ -530,6 +520,7 @@ public XmlItem namespaceInteger(Integer namespaceInteger) { * Get namespaceInteger * @return namespaceInteger */ + @JsonProperty("namespace_integer") @Schema(name = "namespace_integer", example = "-2", required = false) public Integer getNamespaceInteger() { @@ -549,6 +540,7 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) { * Get namespaceBoolean * @return namespaceBoolean */ + @JsonProperty("namespace_boolean") @Schema(name = "namespace_boolean", example = "true", required = false) public Boolean getNamespaceBoolean() { @@ -576,6 +568,7 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) { * Get namespaceArray * @return namespaceArray */ + @JsonProperty("namespace_array") @Schema(name = "namespace_array", required = false) public List getNamespaceArray() { @@ -603,6 +596,7 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) { * Get namespaceWrappedArray * @return namespaceWrappedArray */ + @JsonProperty("namespace_wrapped_array") @Schema(name = "namespace_wrapped_array", required = false) public List getNamespaceWrappedArray() { @@ -622,6 +616,7 @@ public XmlItem prefixNsString(String prefixNsString) { * Get prefixNsString * @return prefixNsString */ + @JsonProperty("prefix_ns_string") @Schema(name = "prefix_ns_string", example = "string", required = false) public String getPrefixNsString() { @@ -641,6 +636,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) { * Get prefixNsNumber * @return prefixNsNumber */ + @JsonProperty("prefix_ns_number") @Valid @Schema(name = "prefix_ns_number", example = "1.234", required = false) public BigDecimal getPrefixNsNumber() { @@ -660,6 +656,7 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) { * Get prefixNsInteger * @return prefixNsInteger */ + @JsonProperty("prefix_ns_integer") @Schema(name = "prefix_ns_integer", example = "-2", required = false) public Integer getPrefixNsInteger() { @@ -679,6 +676,7 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) { * Get prefixNsBoolean * @return prefixNsBoolean */ + @JsonProperty("prefix_ns_boolean") @Schema(name = "prefix_ns_boolean", example = "true", required = false) public Boolean getPrefixNsBoolean() { @@ -706,6 +704,7 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) { * Get prefixNsArray * @return prefixNsArray */ + @JsonProperty("prefix_ns_array") @Schema(name = "prefix_ns_array", required = false) public List getPrefixNsArray() { @@ -733,6 +732,7 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) { * Get prefixNsWrappedArray * @return prefixNsWrappedArray */ + @JsonProperty("prefix_ns_wrapped_array") @Schema(name = "prefix_ns_wrapped_array", required = false) public List getPrefixNsWrappedArray() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 8e4c17989762..cb51920a8c28 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesAnyType extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesAnyType name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesAnyType name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 27a8f01607f1..1c66a636116f 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesArray extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesArray name(String name) { @@ -37,6 +36,7 @@ public AdditionalPropertiesArray name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index bc7b87d760a9..1dcc607639bf 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesBoolean extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesBoolean name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesBoolean name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index b5e88d5d7ccb..74250eb564ad 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -26,45 +26,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesClass { - @JsonProperty("map_string") @Valid private Map mapString = null; - @JsonProperty("map_number") @Valid private Map mapNumber = null; - @JsonProperty("map_integer") @Valid private Map mapInteger = null; - @JsonProperty("map_boolean") @Valid private Map mapBoolean = null; - @JsonProperty("map_array_integer") @Valid private Map> mapArrayInteger = null; - @JsonProperty("map_array_anytype") @Valid private Map> mapArrayAnytype = null; - @JsonProperty("map_map_string") @Valid private Map> mapMapString = null; - @JsonProperty("map_map_anytype") @Valid private Map> mapMapAnytype = null; - @JsonProperty("anytype_1") private Object anytype1; - @JsonProperty("anytype_2") private Object anytype2; - @JsonProperty("anytype_3") private Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { @@ -84,6 +73,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt * Get mapString * @return mapString */ + @JsonProperty("map_string") @ApiModelProperty(value = "") public Map getMapString() { @@ -111,6 +101,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * Get mapNumber * @return mapNumber */ + @JsonProperty("map_number") @Valid @ApiModelProperty(value = "") public Map getMapNumber() { @@ -138,6 +129,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege * Get mapInteger * @return mapInteger */ + @JsonProperty("map_integer") @ApiModelProperty(value = "") public Map getMapInteger() { @@ -165,6 +157,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea * Get mapBoolean * @return mapBoolean */ + @JsonProperty("map_boolean") @ApiModelProperty(value = "") public Map getMapBoolean() { @@ -192,6 +185,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { @@ -219,6 +213,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * Get mapArrayAnytype * @return mapArrayAnytype */ + @JsonProperty("map_array_anytype") @Valid @ApiModelProperty(value = "") public Map> getMapArrayAnytype() { @@ -246,6 +241,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { @@ -273,6 +269,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { @@ -292,6 +289,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) { * Get anytype1 * @return anytype1 */ + @JsonProperty("anytype_1") @ApiModelProperty(value = "") public Object getAnytype1() { @@ -311,6 +309,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) { * Get anytype2 * @return anytype2 */ + @JsonProperty("anytype_2") @ApiModelProperty(value = "") public Object getAnytype2() { @@ -330,6 +329,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) { * Get anytype3 * @return anytype3 */ + @JsonProperty("anytype_3") @ApiModelProperty(value = "") public Object getAnytype3() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 00b5174e93b7..ce8b8d62436c 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesInteger extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesInteger name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesInteger name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 8fec423ffb1b..dec791e0a273 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesNumber extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesNumber name(String name) { @@ -37,6 +36,7 @@ public AdditionalPropertiesNumber name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 67033332b0d6..546d0ab9216f 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesObject extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesObject name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesObject name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 993f83bb2cc1..c1f95cf62e81 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesString extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesString name(String name) { @@ -36,6 +35,7 @@ public AdditionalPropertiesString name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Animal.java index e11ae425d9e9..e880f829164c 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Animal.java @@ -39,10 +39,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Animal { - @JsonProperty("className") private String className; - @JsonProperty("color") private String color = "red"; public Animal className(String className) { @@ -54,6 +52,7 @@ public Animal className(String className) { * Get className * @return className */ + @JsonProperty("className") @NotNull @ApiModelProperty(required = true, value = "") public String getClassName() { @@ -73,6 +72,7 @@ public Animal color(String color) { * Get color * @return color */ + @JsonProperty("color") @ApiModelProperty(value = "") public String getColor() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index df67eda87fd1..46ab3b631960 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfArrayOfNumberOnly { - @JsonProperty("ArrayArrayNumber") @Valid private List> arrayArrayNumber = null; @@ -46,6 +45,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * Get arrayArrayNumber * @return arrayArrayNumber */ + @JsonProperty("ArrayArrayNumber") @Valid @ApiModelProperty(value = "") public List> getArrayArrayNumber() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 05f1ca376a68..cb5358905469 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfNumberOnly { - @JsonProperty("ArrayNumber") @Valid private List arrayNumber = null; @@ -46,6 +45,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ + @JsonProperty("ArrayNumber") @Valid @ApiModelProperty(value = "") public List getArrayNumber() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayTest.java index ba67885edc8a..55cc431ecde6 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayTest.java @@ -25,15 +25,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayTest { - @JsonProperty("array_of_string") @Valid private List arrayOfString = null; - @JsonProperty("array_array_of_integer") @Valid private List> arrayArrayOfInteger = null; - @JsonProperty("array_array_of_model") @Valid private List> arrayArrayOfModel = null; @@ -54,6 +51,7 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) { * Get arrayOfString * @return arrayOfString */ + @JsonProperty("array_of_string") @ApiModelProperty(value = "") public List getArrayOfString() { @@ -81,6 +79,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ + @JsonProperty("array_array_of_integer") @Valid @ApiModelProperty(value = "") public List> getArrayArrayOfInteger() { @@ -108,6 +107,7 @@ public ArrayTest addArrayArrayOfModelItem(List arrayArrayOfModelI * Get arrayArrayOfModel * @return arrayArrayOfModel */ + @JsonProperty("array_array_of_model") @Valid @ApiModelProperty(value = "") public List> getArrayArrayOfModel() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCat.java index ec95c1253fad..70bbb0b93532 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCat.java @@ -67,7 +67,6 @@ public static KindEnum fromValue(String value) { } } - @JsonProperty("kind") private KindEnum kind; public BigCat kind(KindEnum kind) { @@ -79,6 +78,7 @@ public BigCat kind(KindEnum kind) { * Get kind * @return kind */ + @JsonProperty("kind") @ApiModelProperty(value = "") public KindEnum getKind() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCatAllOf.java index 35ae937c0009..1a86665050e6 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCatAllOf.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCatAllOf.java @@ -64,7 +64,6 @@ public static KindEnum fromValue(String value) { } } - @JsonProperty("kind") private KindEnum kind; public BigCatAllOf kind(KindEnum kind) { @@ -76,6 +75,7 @@ public BigCatAllOf kind(KindEnum kind) { * Get kind * @return kind */ + @JsonProperty("kind") @ApiModelProperty(value = "") public KindEnum getKind() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Capitalization.java index e9cce9de0115..e0fdbe78bae2 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Capitalization.java @@ -22,22 +22,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Capitalization { - @JsonProperty("smallCamel") private String smallCamel; - @JsonProperty("CapitalCamel") private String capitalCamel; - @JsonProperty("small_Snake") private String smallSnake; - @JsonProperty("Capital_Snake") private String capitalSnake; - @JsonProperty("SCA_ETH_Flow_Points") private String scAETHFlowPoints; - @JsonProperty("ATT_NAME") private String ATT_NAME; public Capitalization smallCamel(String smallCamel) { @@ -49,6 +43,7 @@ public Capitalization smallCamel(String smallCamel) { * Get smallCamel * @return smallCamel */ + @JsonProperty("smallCamel") @ApiModelProperty(value = "") public String getSmallCamel() { @@ -68,6 +63,7 @@ public Capitalization capitalCamel(String capitalCamel) { * Get capitalCamel * @return capitalCamel */ + @JsonProperty("CapitalCamel") @ApiModelProperty(value = "") public String getCapitalCamel() { @@ -87,6 +83,7 @@ public Capitalization smallSnake(String smallSnake) { * Get smallSnake * @return smallSnake */ + @JsonProperty("small_Snake") @ApiModelProperty(value = "") public String getSmallSnake() { @@ -106,6 +103,7 @@ public Capitalization capitalSnake(String capitalSnake) { * Get capitalSnake * @return capitalSnake */ + @JsonProperty("Capital_Snake") @ApiModelProperty(value = "") public String getCapitalSnake() { @@ -125,6 +123,7 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) { * Get scAETHFlowPoints * @return scAETHFlowPoints */ + @JsonProperty("SCA_ETH_Flow_Points") @ApiModelProperty(value = "") public String getScAETHFlowPoints() { @@ -144,6 +143,7 @@ public Capitalization ATT_NAME(String ATT_NAME) { * Name of the pet * @return ATT_NAME */ + @JsonProperty("ATT_NAME") @ApiModelProperty(value = "Name of the pet ") public String getATTNAME() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Cat.java index 097ddbef7980..958fcb2298e0 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Cat.java @@ -36,7 +36,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Cat extends Animal { - @JsonProperty("declawed") private Boolean declawed; public Cat declawed(Boolean declawed) { @@ -48,6 +47,7 @@ public Cat declawed(Boolean declawed) { * Get declawed * @return declawed */ + @JsonProperty("declawed") @ApiModelProperty(value = "") public Boolean getDeclawed() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CatAllOf.java index eed74bea751a..63de2ad8818e 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CatAllOf.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CatAllOf.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class CatAllOf { - @JsonProperty("declawed") private Boolean declawed; public CatAllOf declawed(Boolean declawed) { @@ -36,6 +35,7 @@ public CatAllOf declawed(Boolean declawed) { * Get declawed * @return declawed */ + @JsonProperty("declawed") @ApiModelProperty(value = "") public Boolean getDeclawed() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Category.java index 27a4a9f25665..b63268b2c8ce 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Category.java @@ -22,10 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name = "default-name"; public Category id(Long id) { @@ -37,6 +35,7 @@ public Category id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -56,6 +55,7 @@ public Category name(String name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @ApiModelProperty(required = true, value = "") public String getName() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ClassModel.java index 69296da7e60e..976f0b01d071 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ClassModel.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ClassModel { - @JsonProperty("_class") private String propertyClass; public ClassModel propertyClass(String propertyClass) { @@ -35,6 +34,7 @@ public ClassModel propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ + @JsonProperty("_class") @ApiModelProperty(value = "") public String getPropertyClass() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Client.java index b788daea14a3..a3c4731f3339 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Client.java @@ -22,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Client { - @JsonProperty("client") private String client; public Client client(String client) { @@ -34,6 +33,7 @@ public Client client(String client) { * Get client * @return client */ + @JsonProperty("client") @ApiModelProperty(value = "") public String getClient() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Dog.java index 9b61a2fa29b6..593562fabb42 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Dog.java @@ -27,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Dog extends Animal { - @JsonProperty("breed") private String breed; public Dog breed(String breed) { @@ -39,6 +38,7 @@ public Dog breed(String breed) { * Get breed * @return breed */ + @JsonProperty("breed") @ApiModelProperty(value = "") public String getBreed() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/DogAllOf.java index 4f275e535333..7ddb24717737 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/DogAllOf.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/DogAllOf.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class DogAllOf { - @JsonProperty("breed") private String breed; public DogAllOf breed(String breed) { @@ -36,6 +35,7 @@ public DogAllOf breed(String breed) { * Get breed * @return breed */ + @JsonProperty("breed") @ApiModelProperty(value = "") public String getBreed() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumArrays.java index dba32cf2b710..04e850b1cf17 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumArrays.java @@ -60,7 +60,6 @@ public static JustSymbolEnum fromValue(String value) { } } - @JsonProperty("just_symbol") private JustSymbolEnum justSymbol; /** @@ -98,7 +97,6 @@ public static ArrayEnumEnum fromValue(String value) { } } - @JsonProperty("array_enum") @Valid private List arrayEnum = null; @@ -111,6 +109,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) { * Get justSymbol * @return justSymbol */ + @JsonProperty("just_symbol") @ApiModelProperty(value = "") public JustSymbolEnum getJustSymbol() { @@ -138,6 +137,7 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) { * Get arrayEnum * @return arrayEnum */ + @JsonProperty("array_enum") @ApiModelProperty(value = "") public List getArrayEnum() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumTest.java index c20bc1460143..49747f67dccf 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumTest.java @@ -63,7 +63,6 @@ public static EnumStringEnum fromValue(String value) { } } - @JsonProperty("enum_string") private EnumStringEnum enumString; /** @@ -103,7 +102,6 @@ public static EnumStringRequiredEnum fromValue(String value) { } } - @JsonProperty("enum_string_required") private EnumStringRequiredEnum enumStringRequired; /** @@ -141,7 +139,6 @@ public static EnumIntegerEnum fromValue(Integer value) { } } - @JsonProperty("enum_integer") private EnumIntegerEnum enumInteger; /** @@ -179,10 +176,8 @@ public static EnumNumberEnum fromValue(Double value) { } } - @JsonProperty("enum_number") private EnumNumberEnum enumNumber; - @JsonProperty("outerEnum") private OuterEnum outerEnum; public EnumTest enumString(EnumStringEnum enumString) { @@ -194,6 +189,7 @@ public EnumTest enumString(EnumStringEnum enumString) { * Get enumString * @return enumString */ + @JsonProperty("enum_string") @ApiModelProperty(value = "") public EnumStringEnum getEnumString() { @@ -213,6 +209,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) { * Get enumStringRequired * @return enumStringRequired */ + @JsonProperty("enum_string_required") @NotNull @ApiModelProperty(required = true, value = "") public EnumStringRequiredEnum getEnumStringRequired() { @@ -232,6 +229,7 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) { * Get enumInteger * @return enumInteger */ + @JsonProperty("enum_integer") @ApiModelProperty(value = "") public EnumIntegerEnum getEnumInteger() { @@ -251,6 +249,7 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) { * Get enumNumber * @return enumNumber */ + @JsonProperty("enum_number") @ApiModelProperty(value = "") public EnumNumberEnum getEnumNumber() { @@ -270,6 +269,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) { * Get outerEnum * @return outerEnum */ + @JsonProperty("outerEnum") @Valid @ApiModelProperty(value = "") public OuterEnum getOuterEnum() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/File.java index d82e4902623d..43c44fd344bb 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/File.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/File.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class File { - @JsonProperty("sourceURI") private String sourceURI; public File sourceURI(String sourceURI) { @@ -35,6 +34,7 @@ public File sourceURI(String sourceURI) { * Test capitalization * @return sourceURI */ + @JsonProperty("sourceURI") @ApiModelProperty(value = "Test capitalization") public String getSourceURI() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 2ea153bd6468..d7815943b774 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -25,10 +25,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FileSchemaTestClass { - @JsonProperty("file") private File file; - @JsonProperty("files") @Valid private List files = null; @@ -41,6 +39,7 @@ public FileSchemaTestClass file(File file) { * Get file * @return file */ + @JsonProperty("file") @Valid @ApiModelProperty(value = "") public File getFile() { @@ -68,6 +67,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) { * Get files * @return files */ + @JsonProperty("files") @Valid @ApiModelProperty(value = "") public List getFiles() { 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 0e2aeaa78a22..ffd18f0ce221 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 @@ -30,48 +30,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FormatTest { - @JsonProperty("integer") private Integer integer; - @JsonProperty("int32") private Integer int32; - @JsonProperty("int64") private Long int64; - @JsonProperty("number") private BigDecimal number; - @JsonProperty("float") private Float _float; - @JsonProperty("double") private Double _double; - @JsonProperty("string") private String string; - @JsonProperty("byte") private byte[] _byte; - @JsonProperty("binary") private org.springframework.core.io.Resource binary; - @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("password") private String password; - @JsonProperty("BigDecimal") private BigDecimal bigDecimal; public FormatTest integer(Integer integer) { @@ -85,6 +71,7 @@ public FormatTest integer(Integer integer) { * maximum: 100 * @return integer */ + @JsonProperty("integer") @Min(10) @Max(100) @ApiModelProperty(value = "") public Integer getInteger() { @@ -106,6 +93,7 @@ public FormatTest int32(Integer int32) { * maximum: 200 * @return int32 */ + @JsonProperty("int32") @Min(20) @Max(200) @ApiModelProperty(value = "") public Integer getInt32() { @@ -125,6 +113,7 @@ public FormatTest int64(Long int64) { * Get int64 * @return int64 */ + @JsonProperty("int64") @ApiModelProperty(value = "") public Long getInt64() { @@ -146,6 +135,7 @@ public FormatTest number(BigDecimal number) { * maximum: 543.2 * @return number */ + @JsonProperty("number") @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") @ApiModelProperty(required = true, value = "") public BigDecimal getNumber() { @@ -167,6 +157,7 @@ public FormatTest _float(Float _float) { * maximum: 987.6 * @return _float */ + @JsonProperty("float") @DecimalMin("54.3") @DecimalMax("987.6") @ApiModelProperty(value = "") public Float getFloat() { @@ -188,6 +179,7 @@ public FormatTest _double(Double _double) { * maximum: 123.4 * @return _double */ + @JsonProperty("double") @DecimalMin("67.8") @DecimalMax("123.4") @ApiModelProperty(value = "") public Double getDouble() { @@ -207,6 +199,7 @@ public FormatTest string(String string) { * Get string * @return string */ + @JsonProperty("string") @Pattern(regexp = "/[a-z]/i") @ApiModelProperty(value = "") public String getString() { @@ -226,6 +219,7 @@ public FormatTest _byte(byte[] _byte) { * Get _byte * @return _byte */ + @JsonProperty("byte") @NotNull @ApiModelProperty(required = true, value = "") public byte[] getByte() { @@ -245,6 +239,7 @@ public FormatTest binary(org.springframework.core.io.Resource binary) { * Get binary * @return binary */ + @JsonProperty("binary") @Valid @ApiModelProperty(value = "") public org.springframework.core.io.Resource getBinary() { @@ -264,6 +259,7 @@ public FormatTest date(LocalDate date) { * Get date * @return date */ + @JsonProperty("date") @NotNull @Valid @ApiModelProperty(required = true, value = "") public LocalDate getDate() { @@ -283,6 +279,7 @@ public FormatTest dateTime(OffsetDateTime dateTime) { * Get dateTime * @return dateTime */ + @JsonProperty("dateTime") @Valid @ApiModelProperty(value = "") public OffsetDateTime getDateTime() { @@ -302,6 +299,7 @@ public FormatTest uuid(UUID uuid) { * Get uuid * @return uuid */ + @JsonProperty("uuid") @Valid @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") public UUID getUuid() { @@ -321,6 +319,7 @@ public FormatTest password(String password) { * Get password * @return password */ + @JsonProperty("password") @NotNull @Size(min = 10, max = 64) @ApiModelProperty(required = true, value = "") public String getPassword() { @@ -340,6 +339,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) { * Get bigDecimal * @return bigDecimal */ + @JsonProperty("BigDecimal") @Valid @ApiModelProperty(value = "") public BigDecimal getBigDecimal() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index 224b16d1a2d3..948ed9a0731d 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -24,10 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class HasOnlyReadOnly { - @JsonProperty("bar") private String bar; - @JsonProperty("foo") private String foo; public HasOnlyReadOnly bar(String bar) { @@ -39,6 +37,7 @@ public HasOnlyReadOnly bar(String bar) { * Get bar * @return bar */ + @JsonProperty("bar") @ApiModelProperty(readOnly = true, value = "") public String getBar() { @@ -58,6 +57,7 @@ public HasOnlyReadOnly foo(String foo) { * Get foo * @return foo */ + @JsonProperty("foo") @ApiModelProperty(readOnly = true, value = "") public String getFoo() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MapTest.java index f2867ac50403..94d4ae9a9d56 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MapTest.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MapTest { - @JsonProperty("map_map_of_string") @Valid private Map> mapMapOfString = null; @@ -64,15 +63,12 @@ public static InnerEnum fromValue(String value) { } } - @JsonProperty("map_of_enum_string") @Valid private Map mapOfEnumString = null; - @JsonProperty("direct_map") @Valid private Map directMap = null; - @JsonProperty("indirect_map") @Valid private Map indirectMap = null; @@ -93,6 +89,7 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapMapOfString * @return mapMapOfString */ + @JsonProperty("map_map_of_string") @Valid @ApiModelProperty(value = "") public Map> getMapMapOfString() { @@ -120,6 +117,7 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) * Get mapOfEnumString * @return mapOfEnumString */ + @JsonProperty("map_of_enum_string") @ApiModelProperty(value = "") public Map getMapOfEnumString() { @@ -147,6 +145,7 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) { * Get directMap * @return directMap */ + @JsonProperty("direct_map") @ApiModelProperty(value = "") public Map getDirectMap() { @@ -174,6 +173,7 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) { * Get indirectMap * @return indirectMap */ + @JsonProperty("indirect_map") @ApiModelProperty(value = "") public Map getIndirectMap() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 901c65b2924d..89a2475d82fb 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -28,14 +28,11 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("map") @Valid private Map map = null; @@ -48,6 +45,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { * Get uuid * @return uuid */ + @JsonProperty("uuid") @Valid @ApiModelProperty(value = "") public UUID getUuid() { @@ -67,6 +65,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT * Get dateTime * @return dateTime */ + @JsonProperty("dateTime") @Valid @ApiModelProperty(value = "") public OffsetDateTime getDateTime() { @@ -94,6 +93,7 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * Get map * @return map */ + @JsonProperty("map") @Valid @ApiModelProperty(value = "") public Map getMap() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Model200Response.java index 36dfd34883e8..220b6493f31a 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Model200Response.java @@ -25,10 +25,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Model200Response { - @JsonProperty("name") private Integer name; - @JsonProperty("class") private String propertyClass; public Model200Response name(Integer name) { @@ -40,6 +38,7 @@ public Model200Response name(Integer name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public Integer getName() { @@ -59,6 +58,7 @@ public Model200Response propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ + @JsonProperty("class") @ApiModelProperty(value = "") public String getPropertyClass() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ModelApiResponse.java index dfba6cb672d4..29f3f43cf20e 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -24,13 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -42,6 +39,7 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ + @JsonProperty("code") @ApiModelProperty(value = "") public Integer getCode() { @@ -61,6 +59,7 @@ public ModelApiResponse type(String type) { * Get type * @return type */ + @JsonProperty("type") @ApiModelProperty(value = "") public String getType() { @@ -80,6 +79,7 @@ public ModelApiResponse message(String message) { * Get message * @return message */ + @JsonProperty("message") @ApiModelProperty(value = "") public String getMessage() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ModelList.java index 97ddf5359aa0..a374fe83d52a 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ModelList.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelList { - @JsonProperty("123-list") private String _123list; public ModelList _123list(String _123list) { @@ -36,6 +35,7 @@ public ModelList _123list(String _123list) { * Get _123list * @return _123list */ + @JsonProperty("123-list") @ApiModelProperty(value = "") public String get123list() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ModelReturn.java index 4505ddfeeeca..d8fc618d9dfb 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ModelReturn.java @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelReturn { - @JsonProperty("return") private Integer _return; public ModelReturn _return(Integer _return) { @@ -37,6 +36,7 @@ public ModelReturn _return(Integer _return) { * Get _return * @return _return */ + @JsonProperty("return") @ApiModelProperty(value = "") public Integer getReturn() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Name.java index 51cc37bbeea7..054901b488d6 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Name.java @@ -23,16 +23,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Name { - @JsonProperty("name") private Integer name; - @JsonProperty("snake_case") private Integer snakeCase; - @JsonProperty("property") private String property; - @JsonProperty("123Number") private Integer _123number; public Name name(Integer name) { @@ -44,6 +40,7 @@ public Name name(Integer name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @ApiModelProperty(required = true, value = "") public Integer getName() { @@ -63,6 +60,7 @@ public Name snakeCase(Integer snakeCase) { * Get snakeCase * @return snakeCase */ + @JsonProperty("snake_case") @ApiModelProperty(readOnly = true, value = "") public Integer getSnakeCase() { @@ -82,6 +80,7 @@ public Name property(String property) { * Get property * @return property */ + @JsonProperty("property") @ApiModelProperty(value = "") public String getProperty() { @@ -101,6 +100,7 @@ public Name _123number(Integer _123number) { * Get _123number * @return _123number */ + @JsonProperty("123Number") @ApiModelProperty(readOnly = true, value = "") public Integer get123number() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NumberOnly.java index 278146bfb899..8f2f2b19b191 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NumberOnly.java @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class NumberOnly { - @JsonProperty("JustNumber") private BigDecimal justNumber; public NumberOnly justNumber(BigDecimal justNumber) { @@ -35,6 +34,7 @@ public NumberOnly justNumber(BigDecimal justNumber) { * Get justNumber * @return justNumber */ + @JsonProperty("JustNumber") @Valid @ApiModelProperty(value = "") public BigDecimal getJustNumber() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Order.java index 9a9ed4f6c960..feac4d2cad8d 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Order.java @@ -25,16 +25,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -75,10 +71,8 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -90,6 +84,7 @@ public Order id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -109,6 +104,7 @@ public Order petId(Long petId) { * Get petId * @return petId */ + @JsonProperty("petId") @ApiModelProperty(value = "") public Long getPetId() { @@ -128,6 +124,7 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ + @JsonProperty("quantity") @ApiModelProperty(value = "") public Integer getQuantity() { @@ -147,6 +144,7 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ + @JsonProperty("shipDate") @Valid @ApiModelProperty(value = "") public OffsetDateTime getShipDate() { @@ -166,6 +164,7 @@ public Order status(StatusEnum status) { * Order Status * @return status */ + @JsonProperty("status") @ApiModelProperty(value = "Order Status") public StatusEnum getStatus() { @@ -185,6 +184,7 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ + @JsonProperty("complete") @ApiModelProperty(value = "") public Boolean getComplete() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OuterComposite.java index c1a709bb26ad..00cce99097d7 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OuterComposite.java @@ -23,13 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class OuterComposite { - @JsonProperty("my_number") private BigDecimal myNumber; - @JsonProperty("my_string") private String myString; - @JsonProperty("my_boolean") private Boolean myBoolean; public OuterComposite myNumber(BigDecimal myNumber) { @@ -41,6 +38,7 @@ public OuterComposite myNumber(BigDecimal myNumber) { * Get myNumber * @return myNumber */ + @JsonProperty("my_number") @Valid @ApiModelProperty(value = "") public BigDecimal getMyNumber() { @@ -60,6 +58,7 @@ public OuterComposite myString(String myString) { * Get myString * @return myString */ + @JsonProperty("my_string") @ApiModelProperty(value = "") public String getMyString() { @@ -79,6 +78,7 @@ public OuterComposite myBoolean(Boolean myBoolean) { * Get myBoolean * @return myBoolean */ + @JsonProperty("my_boolean") @ApiModelProperty(value = "") public Boolean getMyBoolean() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java index 4d705acedcd2..e39c22373324 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java @@ -30,20 +30,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private Set photoUrls = new LinkedHashSet<>(); - @JsonProperty("tags") @Valid private List tags = null; @@ -84,7 +79,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; public Pet id(Long id) { @@ -96,6 +90,7 @@ public Pet id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -115,6 +110,7 @@ public Pet category(Category category) { * Get category * @return category */ + @JsonProperty("category") @Valid @ApiModelProperty(value = "") public Category getCategory() { @@ -134,6 +130,7 @@ public Pet name(String name) { * Get name * @return name */ + @JsonProperty("name") @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") public String getName() { @@ -158,6 +155,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ + @JsonProperty("photoUrls") @NotNull @ApiModelProperty(required = true, value = "") public Set getPhotoUrls() { @@ -186,6 +184,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ + @JsonProperty("tags") @Valid @ApiModelProperty(value = "") public List getTags() { @@ -205,6 +204,7 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ + @JsonProperty("status") @ApiModelProperty(value = "pet status in the store") public StatusEnum getStatus() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ReadOnlyFirst.java index b7a0a416782e..d02b8c8cfd53 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -22,10 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ReadOnlyFirst { - @JsonProperty("bar") private String bar; - @JsonProperty("baz") private String baz; public ReadOnlyFirst bar(String bar) { @@ -37,6 +35,7 @@ public ReadOnlyFirst bar(String bar) { * Get bar * @return bar */ + @JsonProperty("bar") @ApiModelProperty(readOnly = true, value = "") public String getBar() { @@ -56,6 +55,7 @@ public ReadOnlyFirst baz(String baz) { * Get baz * @return baz */ + @JsonProperty("baz") @ApiModelProperty(value = "") public String getBaz() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/SpecialModelName.java index f321ab78cd56..8f176362e027 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/SpecialModelName.java @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class SpecialModelName { - @JsonProperty("$special[property.name]") private Long $specialPropertyName; public SpecialModelName $specialPropertyName(Long $specialPropertyName) { @@ -36,6 +35,7 @@ public class SpecialModelName { * Get $specialPropertyName * @return $specialPropertyName */ + @JsonProperty("$special[property.name]") @ApiModelProperty(value = "") public Long get$SpecialPropertyName() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Tag.java index 6161be4a9229..f7797bef2f19 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Tag.java @@ -22,10 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -37,6 +35,7 @@ public Tag id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -56,6 +55,7 @@ public Tag name(String name) { * Get name * @return name */ + @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderDefault.java index f10cff73bb78..506efbf431c1 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -25,19 +25,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderDefault { - @JsonProperty("string_item") private String stringItem = "what"; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem = true; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -50,6 +45,7 @@ public TypeHolderDefault stringItem(String stringItem) { * Get stringItem * @return stringItem */ + @JsonProperty("string_item") @NotNull @ApiModelProperty(required = true, value = "") public String getStringItem() { @@ -69,6 +65,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ + @JsonProperty("number_item") @NotNull @Valid @ApiModelProperty(required = true, value = "") public BigDecimal getNumberItem() { @@ -88,6 +85,7 @@ public TypeHolderDefault integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ + @JsonProperty("integer_item") @NotNull @ApiModelProperty(required = true, value = "") public Integer getIntegerItem() { @@ -107,6 +105,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ + @JsonProperty("bool_item") @NotNull @ApiModelProperty(required = true, value = "") public Boolean getBoolItem() { @@ -131,6 +130,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ + @JsonProperty("array_item") @NotNull @ApiModelProperty(required = true, value = "") public List getArrayItem() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderExample.java index d2ae69a4e5a8..806c0c90fa18 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -25,22 +25,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderExample { - @JsonProperty("string_item") private String stringItem; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("float_item") private Float floatItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -53,6 +47,7 @@ public TypeHolderExample stringItem(String stringItem) { * Get stringItem * @return stringItem */ + @JsonProperty("string_item") @NotNull @ApiModelProperty(example = "what", required = true, value = "") public String getStringItem() { @@ -72,6 +67,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ + @JsonProperty("number_item") @NotNull @Valid @ApiModelProperty(example = "1.234", required = true, value = "") public BigDecimal getNumberItem() { @@ -91,6 +87,7 @@ public TypeHolderExample floatItem(Float floatItem) { * Get floatItem * @return floatItem */ + @JsonProperty("float_item") @NotNull @ApiModelProperty(example = "1.234", required = true, value = "") public Float getFloatItem() { @@ -110,6 +107,7 @@ public TypeHolderExample integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ + @JsonProperty("integer_item") @NotNull @ApiModelProperty(example = "-2", required = true, value = "") public Integer getIntegerItem() { @@ -129,6 +127,7 @@ public TypeHolderExample boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ + @JsonProperty("bool_item") @NotNull @ApiModelProperty(example = "true", required = true, value = "") public Boolean getBoolItem() { @@ -153,6 +152,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ + @JsonProperty("array_item") @NotNull @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "") public List getArrayItem() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/User.java index ec85459bc99a..f42832389ffe 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/User.java @@ -22,28 +22,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -55,6 +47,7 @@ public User id(Long id) { * Get id * @return id */ + @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -74,6 +67,7 @@ public User username(String username) { * Get username * @return username */ + @JsonProperty("username") @ApiModelProperty(value = "") public String getUsername() { @@ -93,6 +87,7 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ + @JsonProperty("firstName") @ApiModelProperty(value = "") public String getFirstName() { @@ -112,6 +107,7 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ + @JsonProperty("lastName") @ApiModelProperty(value = "") public String getLastName() { @@ -131,6 +127,7 @@ public User email(String email) { * Get email * @return email */ + @JsonProperty("email") @ApiModelProperty(value = "") public String getEmail() { @@ -150,6 +147,7 @@ public User password(String password) { * Get password * @return password */ + @JsonProperty("password") @ApiModelProperty(value = "") public String getPassword() { @@ -169,6 +167,7 @@ public User phone(String phone) { * Get phone * @return phone */ + @JsonProperty("phone") @ApiModelProperty(value = "") public String getPhone() { @@ -188,6 +187,7 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ + @JsonProperty("userStatus") @ApiModelProperty(value = "User Status") public Integer getUserStatus() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/XmlItem.java index 27d5f8282818..c795b4b85e6d 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/XmlItem.java @@ -25,99 +25,70 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class XmlItem { - @JsonProperty("attribute_string") private String attributeString; - @JsonProperty("attribute_number") private BigDecimal attributeNumber; - @JsonProperty("attribute_integer") private Integer attributeInteger; - @JsonProperty("attribute_boolean") private Boolean attributeBoolean; - @JsonProperty("wrapped_array") @Valid private List wrappedArray = null; - @JsonProperty("name_string") private String nameString; - @JsonProperty("name_number") private BigDecimal nameNumber; - @JsonProperty("name_integer") private Integer nameInteger; - @JsonProperty("name_boolean") private Boolean nameBoolean; - @JsonProperty("name_array") @Valid private List nameArray = null; - @JsonProperty("name_wrapped_array") @Valid private List nameWrappedArray = null; - @JsonProperty("prefix_string") private String prefixString; - @JsonProperty("prefix_number") private BigDecimal prefixNumber; - @JsonProperty("prefix_integer") private Integer prefixInteger; - @JsonProperty("prefix_boolean") private Boolean prefixBoolean; - @JsonProperty("prefix_array") @Valid private List prefixArray = null; - @JsonProperty("prefix_wrapped_array") @Valid private List prefixWrappedArray = null; - @JsonProperty("namespace_string") private String namespaceString; - @JsonProperty("namespace_number") private BigDecimal namespaceNumber; - @JsonProperty("namespace_integer") private Integer namespaceInteger; - @JsonProperty("namespace_boolean") private Boolean namespaceBoolean; - @JsonProperty("namespace_array") @Valid private List namespaceArray = null; - @JsonProperty("namespace_wrapped_array") @Valid private List namespaceWrappedArray = null; - @JsonProperty("prefix_ns_string") private String prefixNsString; - @JsonProperty("prefix_ns_number") private BigDecimal prefixNsNumber; - @JsonProperty("prefix_ns_integer") private Integer prefixNsInteger; - @JsonProperty("prefix_ns_boolean") private Boolean prefixNsBoolean; - @JsonProperty("prefix_ns_array") @Valid private List prefixNsArray = null; - @JsonProperty("prefix_ns_wrapped_array") @Valid private List prefixNsWrappedArray = null; @@ -130,6 +101,7 @@ public XmlItem attributeString(String attributeString) { * Get attributeString * @return attributeString */ + @JsonProperty("attribute_string") @ApiModelProperty(example = "string", value = "") public String getAttributeString() { @@ -149,6 +121,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) { * Get attributeNumber * @return attributeNumber */ + @JsonProperty("attribute_number") @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getAttributeNumber() { @@ -168,6 +141,7 @@ public XmlItem attributeInteger(Integer attributeInteger) { * Get attributeInteger * @return attributeInteger */ + @JsonProperty("attribute_integer") @ApiModelProperty(example = "-2", value = "") public Integer getAttributeInteger() { @@ -187,6 +161,7 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) { * Get attributeBoolean * @return attributeBoolean */ + @JsonProperty("attribute_boolean") @ApiModelProperty(example = "true", value = "") public Boolean getAttributeBoolean() { @@ -214,6 +189,7 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) { * Get wrappedArray * @return wrappedArray */ + @JsonProperty("wrapped_array") @ApiModelProperty(value = "") public List getWrappedArray() { @@ -233,6 +209,7 @@ public XmlItem nameString(String nameString) { * Get nameString * @return nameString */ + @JsonProperty("name_string") @ApiModelProperty(example = "string", value = "") public String getNameString() { @@ -252,6 +229,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) { * Get nameNumber * @return nameNumber */ + @JsonProperty("name_number") @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getNameNumber() { @@ -271,6 +249,7 @@ public XmlItem nameInteger(Integer nameInteger) { * Get nameInteger * @return nameInteger */ + @JsonProperty("name_integer") @ApiModelProperty(example = "-2", value = "") public Integer getNameInteger() { @@ -290,6 +269,7 @@ public XmlItem nameBoolean(Boolean nameBoolean) { * Get nameBoolean * @return nameBoolean */ + @JsonProperty("name_boolean") @ApiModelProperty(example = "true", value = "") public Boolean getNameBoolean() { @@ -317,6 +297,7 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) { * Get nameArray * @return nameArray */ + @JsonProperty("name_array") @ApiModelProperty(value = "") public List getNameArray() { @@ -344,6 +325,7 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) { * Get nameWrappedArray * @return nameWrappedArray */ + @JsonProperty("name_wrapped_array") @ApiModelProperty(value = "") public List getNameWrappedArray() { @@ -363,6 +345,7 @@ public XmlItem prefixString(String prefixString) { * Get prefixString * @return prefixString */ + @JsonProperty("prefix_string") @ApiModelProperty(example = "string", value = "") public String getPrefixString() { @@ -382,6 +365,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) { * Get prefixNumber * @return prefixNumber */ + @JsonProperty("prefix_number") @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getPrefixNumber() { @@ -401,6 +385,7 @@ public XmlItem prefixInteger(Integer prefixInteger) { * Get prefixInteger * @return prefixInteger */ + @JsonProperty("prefix_integer") @ApiModelProperty(example = "-2", value = "") public Integer getPrefixInteger() { @@ -420,6 +405,7 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) { * Get prefixBoolean * @return prefixBoolean */ + @JsonProperty("prefix_boolean") @ApiModelProperty(example = "true", value = "") public Boolean getPrefixBoolean() { @@ -447,6 +433,7 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) { * Get prefixArray * @return prefixArray */ + @JsonProperty("prefix_array") @ApiModelProperty(value = "") public List getPrefixArray() { @@ -474,6 +461,7 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) { * Get prefixWrappedArray * @return prefixWrappedArray */ + @JsonProperty("prefix_wrapped_array") @ApiModelProperty(value = "") public List getPrefixWrappedArray() { @@ -493,6 +481,7 @@ public XmlItem namespaceString(String namespaceString) { * Get namespaceString * @return namespaceString */ + @JsonProperty("namespace_string") @ApiModelProperty(example = "string", value = "") public String getNamespaceString() { @@ -512,6 +501,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) { * Get namespaceNumber * @return namespaceNumber */ + @JsonProperty("namespace_number") @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getNamespaceNumber() { @@ -531,6 +521,7 @@ public XmlItem namespaceInteger(Integer namespaceInteger) { * Get namespaceInteger * @return namespaceInteger */ + @JsonProperty("namespace_integer") @ApiModelProperty(example = "-2", value = "") public Integer getNamespaceInteger() { @@ -550,6 +541,7 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) { * Get namespaceBoolean * @return namespaceBoolean */ + @JsonProperty("namespace_boolean") @ApiModelProperty(example = "true", value = "") public Boolean getNamespaceBoolean() { @@ -577,6 +569,7 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) { * Get namespaceArray * @return namespaceArray */ + @JsonProperty("namespace_array") @ApiModelProperty(value = "") public List getNamespaceArray() { @@ -604,6 +597,7 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) { * Get namespaceWrappedArray * @return namespaceWrappedArray */ + @JsonProperty("namespace_wrapped_array") @ApiModelProperty(value = "") public List getNamespaceWrappedArray() { @@ -623,6 +617,7 @@ public XmlItem prefixNsString(String prefixNsString) { * Get prefixNsString * @return prefixNsString */ + @JsonProperty("prefix_ns_string") @ApiModelProperty(example = "string", value = "") public String getPrefixNsString() { @@ -642,6 +637,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) { * Get prefixNsNumber * @return prefixNsNumber */ + @JsonProperty("prefix_ns_number") @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getPrefixNsNumber() { @@ -661,6 +657,7 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) { * Get prefixNsInteger * @return prefixNsInteger */ + @JsonProperty("prefix_ns_integer") @ApiModelProperty(example = "-2", value = "") public Integer getPrefixNsInteger() { @@ -680,6 +677,7 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) { * Get prefixNsBoolean * @return prefixNsBoolean */ + @JsonProperty("prefix_ns_boolean") @ApiModelProperty(example = "true", value = "") public Boolean getPrefixNsBoolean() { @@ -707,6 +705,7 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) { * Get prefixNsArray * @return prefixNsArray */ + @JsonProperty("prefix_ns_array") @ApiModelProperty(value = "") public List getPrefixNsArray() { @@ -734,6 +733,7 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) { * Get prefixNsWrappedArray * @return prefixNsWrappedArray */ + @JsonProperty("prefix_ns_wrapped_array") @ApiModelProperty(value = "") public List getPrefixNsWrappedArray() { From 7619b031fecf391bad352dac1dfbee8f30d81f1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9sar=20Revert?= Date: Fri, 21 Oct 2022 09:11:54 +0200 Subject: [PATCH 3/8] Add jackson check --- .../src/main/resources/JavaSpring/pojo.mustache | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache index c531ef3c6204..9ea2e7c95dd0 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache @@ -139,7 +139,9 @@ public class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}{{^parent}} {{/maximum}} * @return {{name}} */ + {{#jackson}} @JsonProperty("{{baseName}}") + {{/jackson}} {{#vendorExtensions.x-extra-annotation}} {{{vendorExtensions.x-extra-annotation}}} {{/vendorExtensions.x-extra-annotation}} From 46b72bbf6724656ff438073068c173f7ebc215a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9sar=20Revert?= Date: Fri, 21 Oct 2022 09:56:59 +0200 Subject: [PATCH 4/8] Add test --- .../java/spring/SpringCodegenTest.java | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) 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 ac1f12a3eb0f..0026120fc39d 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 @@ -1696,4 +1696,27 @@ public void shouldNotUseEqualsNullableForArrayWhenNotSetInConfig_issue13385() th .assertMethod("equals") .bodyContainsLines("return Arrays.equals(this.picture, testObject.picture);"); } + + @Test + public void shouldGenerateJsonPropertyAnnotationLocatedInGetters() throws IOException { + File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); + output.deleteOnExit(); + + OpenAPI openAPI = new OpenAPIParser() + .readLocation("src/test/resources/3_0/generic.yaml", null, new ParseOptions()).getOpenAPI(); + SpringCodegen codegen = new SpringCodegen(); + codegen.setLibrary(SPRING_BOOT); + codegen.setOutputDir(output.getAbsolutePath()); + + ClientOptInput input = new ClientOptInput() + .openAPI(openAPI) + .config(codegen); + + DefaultGenerator generator = new DefaultGenerator(); + generator.opts(input).generate(); + + String jsonPropertyInGetClassName = "@JsonProperty(\"className\") @NotNull @Schema(name = \"className\", required = true) public String getClassName() {"; + String jsonPropertyInGetColor = "@JsonProperty(\"color\") @Schema(name = \"color\", required = false) public String getColor() {"; + assertFileContains(Paths.get(output.getAbsolutePath() + "/src/main/java/org/openapitools/model/Animal.java"), jsonPropertyInGetClassName, jsonPropertyInGetColor); + } } From 52126c22e7f0bb1d09f3d04b0d031bdc34b7452e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9sar=20Revert?= Date: Thu, 3 Nov 2022 16:10:31 +0100 Subject: [PATCH 5/8] Minor fix --- .../main/resources/JavaSpring/pojo.mustache | 6 +- .../.openapi-generator/VERSION | 2 +- .../java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/UserApi.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../main/java/org/openapitools/model/Tag.java | 4 +- .../java/org/openapitools/model/User.java | 16 ++--- .../.openapi-generator/VERSION | 2 +- .../java/org/openapitools/api/DefaultApi.java | 2 +- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../.openapi-generator/VERSION | 2 +- .../java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/UserApi.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../main/java/org/openapitools/model/Tag.java | 4 +- .../java/org/openapitools/model/User.java | 16 ++--- .../.openapi-generator/VERSION | 2 +- .../java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/UserApi.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../main/java/org/openapitools/model/Tag.java | 4 +- .../java/org/openapitools/model/User.java | 16 ++--- .../spring-cloud/.openapi-generator/VERSION | 2 +- .../java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/UserApi.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../main/java/org/openapitools/model/Tag.java | 4 +- .../java/org/openapitools/model/User.java | 16 ++--- .../spring-cloud-3/.openapi-generator/VERSION | 2 +- .../java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/UserApi.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../main/java/org/openapitools/model/Tag.java | 4 +- .../java/org/openapitools/model/User.java | 16 ++--- .../.openapi-generator/VERSION | 2 +- .../java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/UserApi.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../main/java/org/openapitools/model/Tag.java | 4 +- .../java/org/openapitools/model/User.java | 16 ++--- .../.openapi-generator/VERSION | 2 +- .../java/org/openapitools/api/DefaultApi.java | 2 +- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../.openapi-generator/VERSION | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 2 +- .../api/FakeClassnameTags123Api.java | 2 +- .../java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/UserApi.java | 2 +- .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 22 +++---- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../java/org/openapitools/model/Animal.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../java/org/openapitools/model/BigCat.java | 2 +- .../org/openapitools/model/BigCatAllOf.java | 2 +- .../openapitools/model/Capitalization.java | 12 ++-- .../main/java/org/openapitools/model/Cat.java | 2 +- .../java/org/openapitools/model/CatAllOf.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../org/openapitools/model/ClassModel.java | 2 +- .../java/org/openapitools/model/Client.java | 2 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../java/org/openapitools/model/DogAllOf.java | 2 +- .../org/openapitools/model/EnumArrays.java | 4 +- .../java/org/openapitools/model/EnumTest.java | 10 ++-- .../java/org/openapitools/model/File.java | 2 +- .../model/FileSchemaTestClass.java | 4 +- .../org/openapitools/model/FormatTest.java | 28 ++++----- .../openapitools/model/HasOnlyReadOnly.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +-- ...ropertiesAndAdditionalPropertiesClass.java | 6 +- .../openapitools/model/Model200Response.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../org/openapitools/model/ModelList.java | 2 +- .../org/openapitools/model/ModelReturn.java | 2 +- .../java/org/openapitools/model/Name.java | 8 +-- .../org/openapitools/model/NumberOnly.java | 2 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../openapitools/model/OuterComposite.java | 6 +- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../org/openapitools/model/ReadOnlyFirst.java | 4 +- .../openapitools/model/SpecialModelName.java | 2 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../openapitools/model/TypeHolderDefault.java | 10 ++-- .../openapitools/model/TypeHolderExample.java | 12 ++-- .../java/org/openapitools/model/User.java | 16 ++--- .../java/org/openapitools/model/XmlItem.java | 58 +++++++++---------- .../.openapi-generator/VERSION | 2 +- .../java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/UserApi.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../main/java/org/openapitools/model/Tag.java | 4 +- .../java/org/openapitools/model/User.java | 16 ++--- .../spring-cloud/.openapi-generator/VERSION | 2 +- .../java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/UserApi.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../main/java/org/openapitools/model/Tag.java | 4 +- .../java/org/openapitools/model/User.java | 16 ++--- .../.openapi-generator/VERSION | 2 +- .../java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/UserApi.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../main/java/org/openapitools/model/Tag.java | 4 +- .../java/org/openapitools/model/User.java | 16 ++--- .../spring-stubs/.openapi-generator/VERSION | 2 +- .../java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/UserApi.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../main/java/org/openapitools/model/Tag.java | 4 +- .../java/org/openapitools/model/User.java | 16 ++--- .../.openapi-generator/VERSION | 2 +- .../java/org/openapitools/api/BarApi.java | 2 +- .../openapitools/api/BarApiController.java | 1 - .../java/org/openapitools/api/FooApi.java | 2 +- .../openapitools/api/FooApiController.java | 1 - .../org/openapitools/model/Addressable.java | 4 +- .../main/java/org/openapitools/model/Bar.java | 8 +-- .../org/openapitools/model/BarCreate.java | 6 +- .../java/org/openapitools/model/Entity.java | 10 ++-- .../org/openapitools/model/EntityRef.java | 14 ++--- .../org/openapitools/model/Extensible.java | 6 +- .../main/java/org/openapitools/model/Foo.java | 4 +- .../java/org/openapitools/model/FooRef.java | 2 +- .../java/org/openapitools/model/Pasta.java | 2 +- .../java/org/openapitools/model/Pizza.java | 2 +- .../org/openapitools/model/PizzaSpeziale.java | 2 +- .../.openapi-generator/VERSION | 2 +- .../java/org/openapitools/api/PetApi.java | 2 +- .../openapitools/api/PetApiController.java | 1 - .../java/org/openapitools/api/StoreApi.java | 2 +- .../openapitools/api/StoreApiController.java | 1 - .../java/org/openapitools/api/UserApi.java | 2 +- .../openapitools/api/UserApiController.java | 1 - .../java/org/openapitools/model/Category.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../main/java/org/openapitools/model/Tag.java | 4 +- .../java/org/openapitools/model/User.java | 16 ++--- .../springboot-3/.openapi-generator/VERSION | 2 +- .../java/org/openapitools/api/PetApi.java | 2 +- .../openapitools/api/PetApiController.java | 1 - .../java/org/openapitools/api/StoreApi.java | 2 +- .../openapitools/api/StoreApiController.java | 1 - .../java/org/openapitools/api/UserApi.java | 2 +- .../openapitools/api/UserApiController.java | 1 - .../java/org/openapitools/model/Category.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../main/java/org/openapitools/model/Tag.java | 4 +- .../java/org/openapitools/model/User.java | 16 ++--- .../.openapi-generator/FILES | 1 - .../.openapi-generator/VERSION | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../api/AnotherFakeApiController.java | 1 - .../java/org/openapitools/api/FakeApi.java | 2 +- .../openapitools/api/FakeApiController.java | 1 - .../api/FakeClassnameTestApi.java | 2 +- .../api/FakeClassnameTestApiController.java | 1 - .../java/org/openapitools/api/PetApi.java | 2 +- .../openapitools/api/PetApiController.java | 1 - .../java/org/openapitools/api/StoreApi.java | 2 +- .../openapitools/api/StoreApiController.java | 1 - .../java/org/openapitools/api/UserApi.java | 2 +- .../openapitools/api/UserApiController.java | 1 - .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 22 +++---- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../java/org/openapitools/model/Animal.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../java/org/openapitools/model/BigCat.java | 2 +- .../org/openapitools/model/BigCatAllOf.java | 2 +- .../openapitools/model/Capitalization.java | 12 ++-- .../main/java/org/openapitools/model/Cat.java | 2 +- .../java/org/openapitools/model/CatAllOf.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../org/openapitools/model/ClassModel.java | 2 +- .../java/org/openapitools/model/Client.java | 2 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../java/org/openapitools/model/DogAllOf.java | 2 +- .../org/openapitools/model/EnumArrays.java | 4 +- .../java/org/openapitools/model/EnumTest.java | 10 ++-- .../java/org/openapitools/model/File.java | 2 +- .../model/FileSchemaTestClass.java | 4 +- .../org/openapitools/model/FormatTest.java | 28 ++++----- .../openapitools/model/HasOnlyReadOnly.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +-- ...ropertiesAndAdditionalPropertiesClass.java | 6 +- .../openapitools/model/Model200Response.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../org/openapitools/model/ModelList.java | 2 +- .../org/openapitools/model/ModelReturn.java | 2 +- .../java/org/openapitools/model/Name.java | 8 +-- .../org/openapitools/model/NumberOnly.java | 2 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../openapitools/model/OuterComposite.java | 6 +- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../org/openapitools/model/ReadOnlyFirst.java | 4 +- .../openapitools/model/SpecialModelName.java | 2 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../openapitools/model/TypeHolderDefault.java | 10 ++-- .../openapitools/model/TypeHolderExample.java | 12 ++-- .../java/org/openapitools/model/User.java | 16 ++--- .../java/org/openapitools/model/XmlItem.java | 58 +++++++++---------- .../src/main/resources/openapi.yaml | 6 -- .../.openapi-generator/FILES | 1 - .../.openapi-generator/VERSION | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../api/AnotherFakeApiController.java | 1 - .../java/org/openapitools/api/FakeApi.java | 2 +- .../openapitools/api/FakeApiController.java | 1 - .../api/FakeClassnameTestApi.java | 2 +- .../api/FakeClassnameTestApiController.java | 1 - .../java/org/openapitools/api/PetApi.java | 2 +- .../openapitools/api/PetApiController.java | 1 - .../java/org/openapitools/api/StoreApi.java | 2 +- .../openapitools/api/StoreApiController.java | 1 - .../java/org/openapitools/api/UserApi.java | 2 +- .../openapitools/api/UserApiController.java | 1 - .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 22 +++---- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../java/org/openapitools/model/Animal.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../java/org/openapitools/model/BigCat.java | 2 +- .../org/openapitools/model/BigCatAllOf.java | 2 +- .../openapitools/model/Capitalization.java | 12 ++-- .../main/java/org/openapitools/model/Cat.java | 2 +- .../java/org/openapitools/model/CatAllOf.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../org/openapitools/model/ClassModel.java | 2 +- .../java/org/openapitools/model/Client.java | 2 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../java/org/openapitools/model/DogAllOf.java | 2 +- .../org/openapitools/model/EnumArrays.java | 4 +- .../java/org/openapitools/model/EnumTest.java | 10 ++-- .../java/org/openapitools/model/File.java | 2 +- .../model/FileSchemaTestClass.java | 4 +- .../org/openapitools/model/FormatTest.java | 28 ++++----- .../openapitools/model/HasOnlyReadOnly.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +-- ...ropertiesAndAdditionalPropertiesClass.java | 6 +- .../openapitools/model/Model200Response.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../org/openapitools/model/ModelList.java | 2 +- .../org/openapitools/model/ModelReturn.java | 2 +- .../java/org/openapitools/model/Name.java | 8 +-- .../org/openapitools/model/NumberOnly.java | 2 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../openapitools/model/OuterComposite.java | 6 +- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../org/openapitools/model/ReadOnlyFirst.java | 4 +- .../openapitools/model/SpecialModelName.java | 2 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../openapitools/model/TypeHolderDefault.java | 10 ++-- .../openapitools/model/TypeHolderExample.java | 12 ++-- .../java/org/openapitools/model/User.java | 16 ++--- .../java/org/openapitools/model/XmlItem.java | 58 +++++++++---------- .../src/main/resources/openapi.yaml | 6 -- .../.openapi-generator/FILES | 1 - .../.openapi-generator/VERSION | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../api/AnotherFakeApiController.java | 1 - .../java/org/openapitools/api/FakeApi.java | 2 +- .../openapitools/api/FakeApiController.java | 1 - .../api/FakeClassnameTestApi.java | 2 +- .../api/FakeClassnameTestApiController.java | 1 - .../java/org/openapitools/api/PetApi.java | 2 +- .../openapitools/api/PetApiController.java | 1 - .../java/org/openapitools/api/StoreApi.java | 2 +- .../openapitools/api/StoreApiController.java | 1 - .../java/org/openapitools/api/UserApi.java | 2 +- .../openapitools/api/UserApiController.java | 1 - .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 22 +++---- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../java/org/openapitools/model/Animal.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../java/org/openapitools/model/BigCat.java | 2 +- .../org/openapitools/model/BigCatAllOf.java | 2 +- .../openapitools/model/Capitalization.java | 12 ++-- .../main/java/org/openapitools/model/Cat.java | 2 +- .../java/org/openapitools/model/CatAllOf.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../org/openapitools/model/ClassModel.java | 2 +- .../java/org/openapitools/model/Client.java | 2 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../java/org/openapitools/model/DogAllOf.java | 2 +- .../org/openapitools/model/EnumArrays.java | 4 +- .../java/org/openapitools/model/EnumTest.java | 10 ++-- .../java/org/openapitools/model/File.java | 2 +- .../model/FileSchemaTestClass.java | 4 +- .../org/openapitools/model/FormatTest.java | 28 ++++----- .../openapitools/model/HasOnlyReadOnly.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +-- ...ropertiesAndAdditionalPropertiesClass.java | 6 +- .../openapitools/model/Model200Response.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../org/openapitools/model/ModelList.java | 2 +- .../org/openapitools/model/ModelReturn.java | 2 +- .../java/org/openapitools/model/Name.java | 8 +-- .../org/openapitools/model/NumberOnly.java | 2 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../openapitools/model/OuterComposite.java | 6 +- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../org/openapitools/model/ReadOnlyFirst.java | 4 +- .../openapitools/model/SpecialModelName.java | 2 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../openapitools/model/TypeHolderDefault.java | 10 ++-- .../openapitools/model/TypeHolderExample.java | 12 ++-- .../java/org/openapitools/model/User.java | 16 ++--- .../java/org/openapitools/model/XmlItem.java | 58 +++++++++---------- .../src/main/resources/openapi.yaml | 6 -- .../.openapi-generator/FILES | 1 - .../.openapi-generator/VERSION | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../api/AnotherFakeApiController.java | 1 - .../java/org/openapitools/api/FakeApi.java | 2 +- .../openapitools/api/FakeApiController.java | 1 - .../api/FakeClassnameTestApi.java | 2 +- .../api/FakeClassnameTestApiController.java | 1 - .../java/org/openapitools/api/PetApi.java | 2 +- .../openapitools/api/PetApiController.java | 1 - .../java/org/openapitools/api/StoreApi.java | 2 +- .../openapitools/api/StoreApiController.java | 1 - .../java/org/openapitools/api/UserApi.java | 2 +- .../openapitools/api/UserApiController.java | 1 - .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 22 +++---- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../java/org/openapitools/model/Animal.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../java/org/openapitools/model/BigCat.java | 2 +- .../org/openapitools/model/BigCatAllOf.java | 2 +- .../openapitools/model/Capitalization.java | 12 ++-- .../main/java/org/openapitools/model/Cat.java | 2 +- .../java/org/openapitools/model/CatAllOf.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../org/openapitools/model/ClassModel.java | 2 +- .../java/org/openapitools/model/Client.java | 2 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../java/org/openapitools/model/DogAllOf.java | 2 +- .../org/openapitools/model/EnumArrays.java | 4 +- .../java/org/openapitools/model/EnumTest.java | 10 ++-- .../java/org/openapitools/model/File.java | 2 +- .../model/FileSchemaTestClass.java | 4 +- .../org/openapitools/model/FormatTest.java | 28 ++++----- .../openapitools/model/HasOnlyReadOnly.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +-- ...ropertiesAndAdditionalPropertiesClass.java | 6 +- .../openapitools/model/Model200Response.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../org/openapitools/model/ModelList.java | 2 +- .../org/openapitools/model/ModelReturn.java | 2 +- .../java/org/openapitools/model/Name.java | 8 +-- .../org/openapitools/model/NumberOnly.java | 2 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../openapitools/model/OuterComposite.java | 6 +- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../org/openapitools/model/ReadOnlyFirst.java | 4 +- .../openapitools/model/SpecialModelName.java | 2 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../openapitools/model/TypeHolderDefault.java | 10 ++-- .../openapitools/model/TypeHolderExample.java | 12 ++-- .../java/org/openapitools/model/User.java | 16 ++--- .../java/org/openapitools/model/XmlItem.java | 58 +++++++++---------- .../src/main/resources/openapi.yaml | 6 -- .../.openapi-generator/VERSION | 2 +- .../java/org/openapitools/api/PetApi.java | 2 +- .../openapitools/api/PetApiController.java | 1 - .../java/org/openapitools/api/StoreApi.java | 2 +- .../openapitools/api/StoreApiController.java | 1 - .../java/org/openapitools/api/UserApi.java | 2 +- .../openapitools/api/UserApiController.java | 1 - .../java/org/openapitools/model/Category.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../main/java/org/openapitools/model/Tag.java | 4 +- .../java/org/openapitools/model/User.java | 16 ++--- .../.openapi-generator/FILES | 1 - .../.openapi-generator/VERSION | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../api/AnotherFakeApiController.java | 1 - .../java/org/openapitools/api/FakeApi.java | 2 +- .../openapitools/api/FakeApiController.java | 1 - .../api/FakeClassnameTestApi.java | 2 +- .../api/FakeClassnameTestApiController.java | 1 - .../java/org/openapitools/api/PetApi.java | 2 +- .../openapitools/api/PetApiController.java | 1 - .../java/org/openapitools/api/StoreApi.java | 2 +- .../openapitools/api/StoreApiController.java | 1 - .../java/org/openapitools/api/UserApi.java | 2 +- .../openapitools/api/UserApiController.java | 1 - .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 22 +++---- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../java/org/openapitools/model/Animal.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../java/org/openapitools/model/BigCat.java | 2 +- .../org/openapitools/model/BigCatAllOf.java | 2 +- .../openapitools/model/Capitalization.java | 12 ++-- .../main/java/org/openapitools/model/Cat.java | 2 +- .../java/org/openapitools/model/CatAllOf.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../org/openapitools/model/ClassModel.java | 2 +- .../java/org/openapitools/model/Client.java | 2 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../java/org/openapitools/model/DogAllOf.java | 2 +- .../org/openapitools/model/EnumArrays.java | 4 +- .../java/org/openapitools/model/EnumTest.java | 10 ++-- .../java/org/openapitools/model/File.java | 2 +- .../model/FileSchemaTestClass.java | 4 +- .../org/openapitools/model/FormatTest.java | 28 ++++----- .../openapitools/model/HasOnlyReadOnly.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +-- ...ropertiesAndAdditionalPropertiesClass.java | 6 +- .../openapitools/model/Model200Response.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../org/openapitools/model/ModelList.java | 2 +- .../org/openapitools/model/ModelReturn.java | 2 +- .../java/org/openapitools/model/Name.java | 8 +-- .../org/openapitools/model/NumberOnly.java | 2 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../openapitools/model/OuterComposite.java | 6 +- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../org/openapitools/model/ReadOnlyFirst.java | 4 +- .../openapitools/model/SpecialModelName.java | 2 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../openapitools/model/TypeHolderDefault.java | 10 ++-- .../openapitools/model/TypeHolderExample.java | 12 ++-- .../java/org/openapitools/model/User.java | 16 ++--- .../java/org/openapitools/model/XmlItem.java | 58 +++++++++---------- .../src/main/resources/openapi.yaml | 6 -- .../springboot/.openapi-generator/VERSION | 2 +- .../java/org/openapitools/api/PetApi.java | 3 +- .../java/org/openapitools/api/StoreApi.java | 3 +- .../java/org/openapitools/api/UserApi.java | 3 +- .../java/org/openapitools/model/Category.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../main/java/org/openapitools/model/Tag.java | 4 +- .../java/org/openapitools/model/User.java | 16 ++--- .../.openapi-generator/VERSION | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 2 +- .../api/FakeClassnameTestApi.java | 2 +- .../java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/UserApi.java | 2 +- .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 22 +++---- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../java/org/openapitools/model/Animal.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../java/org/openapitools/model/BigCat.java | 2 +- .../org/openapitools/model/BigCatAllOf.java | 2 +- .../openapitools/model/Capitalization.java | 12 ++-- .../main/java/org/openapitools/model/Cat.java | 2 +- .../java/org/openapitools/model/CatAllOf.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../org/openapitools/model/ClassModel.java | 2 +- .../java/org/openapitools/model/Client.java | 2 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../java/org/openapitools/model/DogAllOf.java | 2 +- .../org/openapitools/model/EnumArrays.java | 4 +- .../java/org/openapitools/model/EnumTest.java | 10 ++-- .../java/org/openapitools/model/File.java | 2 +- .../model/FileSchemaTestClass.java | 4 +- .../org/openapitools/model/FormatTest.java | 28 ++++----- .../openapitools/model/HasOnlyReadOnly.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +-- ...ropertiesAndAdditionalPropertiesClass.java | 6 +- .../openapitools/model/Model200Response.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../org/openapitools/model/ModelList.java | 2 +- .../org/openapitools/model/ModelReturn.java | 2 +- .../java/org/openapitools/model/Name.java | 8 +-- .../org/openapitools/model/NumberOnly.java | 2 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../openapitools/model/OuterComposite.java | 6 +- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../org/openapitools/model/ReadOnlyFirst.java | 4 +- .../openapitools/model/SpecialModelName.java | 2 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../openapitools/model/TypeHolderDefault.java | 10 ++-- .../openapitools/model/TypeHolderExample.java | 12 ++-- .../java/org/openapitools/model/User.java | 16 ++--- .../java/org/openapitools/model/XmlItem.java | 58 +++++++++---------- .../.openapi-generator/VERSION | 2 +- .../org/openapitools/api/NullableApi.java | 2 +- .../model/ObjectWithUniqueItems.java | 12 ++-- .../spring-stubs/.openapi-generator/VERSION | 2 +- .../java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/UserApi.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../main/java/org/openapitools/model/Tag.java | 4 +- .../java/org/openapitools/model/User.java | 16 ++--- .../.openapi-generator/FILES | 1 - .../.openapi-generator/VERSION | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../api/AnotherFakeApiController.java | 1 - .../java/org/openapitools/api/FakeApi.java | 2 +- .../openapitools/api/FakeApiController.java | 1 - .../api/FakeClassnameTestApi.java | 2 +- .../api/FakeClassnameTestApiController.java | 1 - .../java/org/openapitools/api/PetApi.java | 2 +- .../openapitools/api/PetApiController.java | 1 - .../java/org/openapitools/api/StoreApi.java | 2 +- .../openapitools/api/StoreApiController.java | 1 - .../java/org/openapitools/api/UserApi.java | 2 +- .../openapitools/api/UserApiController.java | 1 - .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 22 +++---- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../java/org/openapitools/model/Animal.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../java/org/openapitools/model/BigCat.java | 2 +- .../org/openapitools/model/BigCatAllOf.java | 2 +- .../openapitools/model/Capitalization.java | 12 ++-- .../main/java/org/openapitools/model/Cat.java | 2 +- .../java/org/openapitools/model/CatAllOf.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../org/openapitools/model/ClassModel.java | 2 +- .../java/org/openapitools/model/Client.java | 2 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../java/org/openapitools/model/DogAllOf.java | 2 +- .../org/openapitools/model/EnumArrays.java | 4 +- .../java/org/openapitools/model/EnumTest.java | 10 ++-- .../java/org/openapitools/model/File.java | 2 +- .../model/FileSchemaTestClass.java | 4 +- .../org/openapitools/model/FormatTest.java | 28 ++++----- .../openapitools/model/HasOnlyReadOnly.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +-- ...ropertiesAndAdditionalPropertiesClass.java | 6 +- .../openapitools/model/Model200Response.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../org/openapitools/model/ModelList.java | 2 +- .../org/openapitools/model/ModelReturn.java | 2 +- .../java/org/openapitools/model/Name.java | 8 +-- .../org/openapitools/model/NumberOnly.java | 2 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../openapitools/model/OuterComposite.java | 6 +- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../org/openapitools/model/ReadOnlyFirst.java | 4 +- .../openapitools/model/SpecialModelName.java | 2 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../openapitools/model/TypeHolderDefault.java | 10 ++-- .../openapitools/model/TypeHolderExample.java | 12 ++-- .../java/org/openapitools/model/User.java | 16 ++--- .../java/org/openapitools/model/XmlItem.java | 58 +++++++++---------- .../src/main/resources/openapi.yaml | 6 -- .../.openapi-generator/FILES | 1 - .../.openapi-generator/VERSION | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../api/AnotherFakeApiController.java | 1 - .../java/org/openapitools/api/FakeApi.java | 2 +- .../openapitools/api/FakeApiController.java | 1 - .../api/FakeClassnameTestApi.java | 2 +- .../api/FakeClassnameTestApiController.java | 1 - .../java/org/openapitools/api/PetApi.java | 2 +- .../openapitools/api/PetApiController.java | 1 - .../java/org/openapitools/api/StoreApi.java | 2 +- .../openapitools/api/StoreApiController.java | 1 - .../java/org/openapitools/api/UserApi.java | 2 +- .../openapitools/api/UserApiController.java | 1 - .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 22 +++---- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../java/org/openapitools/model/Animal.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../java/org/openapitools/model/BigCat.java | 2 +- .../org/openapitools/model/BigCatAllOf.java | 2 +- .../openapitools/model/Capitalization.java | 12 ++-- .../main/java/org/openapitools/model/Cat.java | 2 +- .../java/org/openapitools/model/CatAllOf.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../org/openapitools/model/ClassModel.java | 2 +- .../java/org/openapitools/model/Client.java | 2 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../java/org/openapitools/model/DogAllOf.java | 2 +- .../org/openapitools/model/EnumArrays.java | 4 +- .../java/org/openapitools/model/EnumTest.java | 10 ++-- .../java/org/openapitools/model/File.java | 2 +- .../model/FileSchemaTestClass.java | 4 +- .../org/openapitools/model/FormatTest.java | 28 ++++----- .../openapitools/model/HasOnlyReadOnly.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +-- ...ropertiesAndAdditionalPropertiesClass.java | 6 +- .../openapitools/model/Model200Response.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../org/openapitools/model/ModelList.java | 2 +- .../org/openapitools/model/ModelReturn.java | 2 +- .../java/org/openapitools/model/Name.java | 8 +-- .../org/openapitools/model/NumberOnly.java | 2 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../openapitools/model/OuterComposite.java | 6 +- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../org/openapitools/model/ReadOnlyFirst.java | 4 +- .../openapitools/model/SpecialModelName.java | 2 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../openapitools/model/TypeHolderDefault.java | 10 ++-- .../openapitools/model/TypeHolderExample.java | 12 ++-- .../java/org/openapitools/model/User.java | 16 ++--- .../java/org/openapitools/model/XmlItem.java | 58 +++++++++---------- .../src/main/resources/openapi.yaml | 6 -- .../.openapi-generator/FILES | 1 - .../.openapi-generator/VERSION | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../api/AnotherFakeApiController.java | 1 - .../java/org/openapitools/api/FakeApi.java | 2 +- .../openapitools/api/FakeApiController.java | 1 - .../api/FakeClassnameTestApi.java | 2 +- .../api/FakeClassnameTestApiController.java | 1 - .../java/org/openapitools/api/PetApi.java | 2 +- .../openapitools/api/PetApiController.java | 1 - .../java/org/openapitools/api/StoreApi.java | 2 +- .../openapitools/api/StoreApiController.java | 1 - .../java/org/openapitools/api/UserApi.java | 2 +- .../openapitools/api/UserApiController.java | 1 - .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 22 +++---- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../java/org/openapitools/model/Animal.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../java/org/openapitools/model/BigCat.java | 2 +- .../org/openapitools/model/BigCatAllOf.java | 2 +- .../openapitools/model/Capitalization.java | 12 ++-- .../main/java/org/openapitools/model/Cat.java | 2 +- .../java/org/openapitools/model/CatAllOf.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../org/openapitools/model/ClassModel.java | 2 +- .../java/org/openapitools/model/Client.java | 2 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../java/org/openapitools/model/DogAllOf.java | 2 +- .../org/openapitools/model/EnumArrays.java | 4 +- .../java/org/openapitools/model/EnumTest.java | 10 ++-- .../java/org/openapitools/model/File.java | 2 +- .../model/FileSchemaTestClass.java | 4 +- .../org/openapitools/model/FormatTest.java | 28 ++++----- .../openapitools/model/HasOnlyReadOnly.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +-- ...ropertiesAndAdditionalPropertiesClass.java | 6 +- .../openapitools/model/Model200Response.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../org/openapitools/model/ModelList.java | 2 +- .../org/openapitools/model/ModelReturn.java | 2 +- .../java/org/openapitools/model/Name.java | 8 +-- .../org/openapitools/model/NumberOnly.java | 2 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../openapitools/model/OuterComposite.java | 6 +- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../org/openapitools/model/ReadOnlyFirst.java | 4 +- .../openapitools/model/SpecialModelName.java | 2 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../openapitools/model/TypeHolderDefault.java | 10 ++-- .../openapitools/model/TypeHolderExample.java | 12 ++-- .../java/org/openapitools/model/User.java | 16 ++--- .../java/org/openapitools/model/XmlItem.java | 58 +++++++++---------- .../src/main/resources/openapi.yaml | 6 -- .../.openapi-generator/FILES | 1 - .../.openapi-generator/VERSION | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../api/AnotherFakeApiController.java | 1 - .../java/org/openapitools/api/FakeApi.java | 2 +- .../openapitools/api/FakeApiController.java | 1 - .../api/FakeClassnameTestApi.java | 2 +- .../api/FakeClassnameTestApiController.java | 1 - .../java/org/openapitools/api/PetApi.java | 2 +- .../openapitools/api/PetApiController.java | 1 - .../java/org/openapitools/api/StoreApi.java | 2 +- .../openapitools/api/StoreApiController.java | 1 - .../java/org/openapitools/api/UserApi.java | 2 +- .../openapitools/api/UserApiController.java | 1 - .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 22 +++---- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../java/org/openapitools/model/Animal.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../java/org/openapitools/model/BigCat.java | 2 +- .../org/openapitools/model/BigCatAllOf.java | 2 +- .../openapitools/model/Capitalization.java | 12 ++-- .../main/java/org/openapitools/model/Cat.java | 2 +- .../java/org/openapitools/model/CatAllOf.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../org/openapitools/model/ClassModel.java | 2 +- .../java/org/openapitools/model/Client.java | 2 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../java/org/openapitools/model/DogAllOf.java | 2 +- .../org/openapitools/model/EnumArrays.java | 4 +- .../java/org/openapitools/model/EnumTest.java | 10 ++-- .../java/org/openapitools/model/File.java | 2 +- .../model/FileSchemaTestClass.java | 4 +- .../org/openapitools/model/FormatTest.java | 28 ++++----- .../openapitools/model/HasOnlyReadOnly.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +-- ...ropertiesAndAdditionalPropertiesClass.java | 6 +- .../openapitools/model/Model200Response.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../org/openapitools/model/ModelList.java | 2 +- .../org/openapitools/model/ModelReturn.java | 2 +- .../java/org/openapitools/model/Name.java | 8 +-- .../org/openapitools/model/NumberOnly.java | 2 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../openapitools/model/OuterComposite.java | 6 +- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../org/openapitools/model/ReadOnlyFirst.java | 4 +- .../openapitools/model/SpecialModelName.java | 2 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../openapitools/model/TypeHolderDefault.java | 10 ++-- .../openapitools/model/TypeHolderExample.java | 12 ++-- .../java/org/openapitools/model/User.java | 16 ++--- .../java/org/openapitools/model/XmlItem.java | 58 +++++++++---------- .../src/main/resources/openapi.yaml | 6 -- .../.openapi-generator/VERSION | 2 +- .../java/org/openapitools/api/PetApi.java | 2 +- .../openapitools/api/PetApiController.java | 1 - .../java/org/openapitools/api/StoreApi.java | 2 +- .../openapitools/api/StoreApiController.java | 1 - .../java/org/openapitools/api/UserApi.java | 2 +- .../openapitools/api/UserApiController.java | 1 - .../java/org/openapitools/model/Category.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../main/java/org/openapitools/model/Tag.java | 4 +- .../java/org/openapitools/model/User.java | 16 ++--- .../.openapi-generator/FILES | 1 - .../.openapi-generator/VERSION | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../api/AnotherFakeApiController.java | 1 - .../java/org/openapitools/api/FakeApi.java | 2 +- .../openapitools/api/FakeApiController.java | 1 - .../api/FakeClassnameTestApi.java | 2 +- .../api/FakeClassnameTestApiController.java | 1 - .../java/org/openapitools/api/PetApi.java | 2 +- .../openapitools/api/PetApiController.java | 1 - .../java/org/openapitools/api/StoreApi.java | 2 +- .../openapitools/api/StoreApiController.java | 1 - .../java/org/openapitools/api/UserApi.java | 2 +- .../openapitools/api/UserApiController.java | 1 - .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 22 +++---- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../java/org/openapitools/model/Animal.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../java/org/openapitools/model/BigCat.java | 2 +- .../org/openapitools/model/BigCatAllOf.java | 2 +- .../openapitools/model/Capitalization.java | 12 ++-- .../main/java/org/openapitools/model/Cat.java | 2 +- .../java/org/openapitools/model/CatAllOf.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../org/openapitools/model/ClassModel.java | 2 +- .../java/org/openapitools/model/Client.java | 2 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../java/org/openapitools/model/DogAllOf.java | 2 +- .../org/openapitools/model/EnumArrays.java | 4 +- .../java/org/openapitools/model/EnumTest.java | 10 ++-- .../java/org/openapitools/model/File.java | 2 +- .../model/FileSchemaTestClass.java | 4 +- .../org/openapitools/model/FormatTest.java | 28 ++++----- .../openapitools/model/HasOnlyReadOnly.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +-- ...ropertiesAndAdditionalPropertiesClass.java | 6 +- .../openapitools/model/Model200Response.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../org/openapitools/model/ModelList.java | 2 +- .../org/openapitools/model/ModelReturn.java | 2 +- .../java/org/openapitools/model/Name.java | 8 +-- .../org/openapitools/model/NumberOnly.java | 2 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../openapitools/model/OuterComposite.java | 6 +- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../org/openapitools/model/ReadOnlyFirst.java | 4 +- .../openapitools/model/SpecialModelName.java | 2 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../openapitools/model/TypeHolderDefault.java | 10 ++-- .../openapitools/model/TypeHolderExample.java | 12 ++-- .../java/org/openapitools/model/User.java | 16 ++--- .../java/org/openapitools/model/XmlItem.java | 58 +++++++++---------- .../src/main/resources/openapi.yaml | 6 -- .../.openapi-generator/FILES | 1 - .../.openapi-generator/VERSION | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../api/AnotherFakeApiController.java | 1 - .../java/org/openapitools/api/FakeApi.java | 2 +- .../openapitools/api/FakeApiController.java | 1 - .../api/FakeClassnameTestApi.java | 2 +- .../api/FakeClassnameTestApiController.java | 1 - .../java/org/openapitools/api/PetApi.java | 2 +- .../openapitools/api/PetApiController.java | 1 - .../java/org/openapitools/api/StoreApi.java | 2 +- .../openapitools/api/StoreApiController.java | 1 - .../java/org/openapitools/api/UserApi.java | 2 +- .../openapitools/api/UserApiController.java | 1 - .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 22 +++---- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../java/org/openapitools/model/Animal.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../java/org/openapitools/model/BigCat.java | 2 +- .../org/openapitools/model/BigCatAllOf.java | 2 +- .../openapitools/model/Capitalization.java | 12 ++-- .../main/java/org/openapitools/model/Cat.java | 2 +- .../java/org/openapitools/model/CatAllOf.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../org/openapitools/model/ClassModel.java | 2 +- .../java/org/openapitools/model/Client.java | 2 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../java/org/openapitools/model/DogAllOf.java | 2 +- .../org/openapitools/model/EnumArrays.java | 4 +- .../java/org/openapitools/model/EnumTest.java | 10 ++-- .../java/org/openapitools/model/File.java | 2 +- .../model/FileSchemaTestClass.java | 4 +- .../org/openapitools/model/FormatTest.java | 28 ++++----- .../openapitools/model/HasOnlyReadOnly.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +-- ...ropertiesAndAdditionalPropertiesClass.java | 6 +- .../openapitools/model/Model200Response.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../org/openapitools/model/ModelList.java | 2 +- .../org/openapitools/model/ModelReturn.java | 2 +- .../java/org/openapitools/model/Name.java | 8 +-- .../org/openapitools/model/NumberOnly.java | 2 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../openapitools/model/OuterComposite.java | 6 +- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../org/openapitools/model/ReadOnlyFirst.java | 4 +- .../openapitools/model/SpecialModelName.java | 2 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../openapitools/model/TypeHolderDefault.java | 10 ++-- .../openapitools/model/TypeHolderExample.java | 12 ++-- .../java/org/openapitools/model/User.java | 16 ++--- .../java/org/openapitools/model/XmlItem.java | 58 +++++++++---------- .../src/main/resources/openapi.yaml | 6 -- .../.openapi-generator/FILES | 1 - .../.openapi-generator/VERSION | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../api/AnotherFakeApiController.java | 1 - .../java/org/openapitools/api/FakeApi.java | 2 +- .../openapitools/api/FakeApiController.java | 1 - .../api/FakeClassnameTestApi.java | 2 +- .../api/FakeClassnameTestApiController.java | 1 - .../java/org/openapitools/api/PetApi.java | 2 +- .../openapitools/api/PetApiController.java | 1 - .../java/org/openapitools/api/StoreApi.java | 2 +- .../openapitools/api/StoreApiController.java | 1 - .../java/org/openapitools/api/UserApi.java | 2 +- .../openapitools/api/UserApiController.java | 1 - .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 22 +++---- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../java/org/openapitools/model/Animal.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../openapitools/model/Capitalization.java | 12 ++-- .../main/java/org/openapitools/model/Cat.java | 2 +- .../java/org/openapitools/model/CatAllOf.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../org/openapitools/model/ClassModel.java | 2 +- .../java/org/openapitools/model/Client.java | 2 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../java/org/openapitools/model/DogAllOf.java | 2 +- .../org/openapitools/model/EnumArrays.java | 4 +- .../java/org/openapitools/model/EnumTest.java | 10 ++-- .../java/org/openapitools/model/File.java | 2 +- .../model/FileSchemaTestClass.java | 4 +- .../org/openapitools/model/FormatTest.java | 28 ++++----- .../openapitools/model/HasOnlyReadOnly.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +-- ...ropertiesAndAdditionalPropertiesClass.java | 6 +- .../openapitools/model/Model200Response.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../org/openapitools/model/ModelList.java | 2 +- .../org/openapitools/model/ModelReturn.java | 2 +- .../java/org/openapitools/model/Name.java | 8 +-- .../org/openapitools/model/NumberOnly.java | 2 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../openapitools/model/OuterComposite.java | 6 +- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../org/openapitools/model/ReadOnlyFirst.java | 4 +- .../openapitools/model/SpecialModelName.java | 2 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../openapitools/model/TypeHolderDefault.java | 10 ++-- .../openapitools/model/TypeHolderExample.java | 12 ++-- .../java/org/openapitools/model/User.java | 16 ++--- .../java/org/openapitools/model/XmlItem.java | 58 +++++++++---------- .../src/main/resources/openapi.yaml | 6 -- .../.openapi-generator/FILES | 1 - .../.openapi-generator/VERSION | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../api/AnotherFakeApiController.java | 1 - .../java/org/openapitools/api/FakeApi.java | 2 +- .../openapitools/api/FakeApiController.java | 1 - .../api/FakeClassnameTestApi.java | 2 +- .../api/FakeClassnameTestApiController.java | 1 - .../java/org/openapitools/api/PetApi.java | 2 +- .../openapitools/api/PetApiController.java | 1 - .../java/org/openapitools/api/StoreApi.java | 2 +- .../openapitools/api/StoreApiController.java | 1 - .../java/org/openapitools/api/UserApi.java | 2 +- .../openapitools/api/UserApiController.java | 1 - .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 22 +++---- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../java/org/openapitools/model/Animal.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../openapitools/model/Capitalization.java | 12 ++-- .../main/java/org/openapitools/model/Cat.java | 2 +- .../java/org/openapitools/model/CatAllOf.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../org/openapitools/model/ClassModel.java | 2 +- .../java/org/openapitools/model/Client.java | 2 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../java/org/openapitools/model/DogAllOf.java | 2 +- .../org/openapitools/model/EnumArrays.java | 4 +- .../java/org/openapitools/model/EnumTest.java | 10 ++-- .../java/org/openapitools/model/File.java | 2 +- .../model/FileSchemaTestClass.java | 4 +- .../org/openapitools/model/FormatTest.java | 28 ++++----- .../openapitools/model/HasOnlyReadOnly.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +-- ...ropertiesAndAdditionalPropertiesClass.java | 6 +- .../openapitools/model/Model200Response.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../org/openapitools/model/ModelList.java | 2 +- .../org/openapitools/model/ModelReturn.java | 2 +- .../java/org/openapitools/model/Name.java | 8 +-- .../org/openapitools/model/NumberOnly.java | 2 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../openapitools/model/OuterComposite.java | 6 +- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../org/openapitools/model/ReadOnlyFirst.java | 4 +- .../openapitools/model/SpecialModelName.java | 2 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../openapitools/model/TypeHolderDefault.java | 10 ++-- .../openapitools/model/TypeHolderExample.java | 12 ++-- .../java/org/openapitools/model/User.java | 16 ++--- .../java/org/openapitools/model/XmlItem.java | 58 +++++++++---------- .../src/main/resources/openapi.yaml | 6 -- .../.openapi-generator/FILES | 1 - .../.openapi-generator/VERSION | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../api/AnotherFakeApiController.java | 1 - .../java/org/openapitools/api/FakeApi.java | 2 +- .../openapitools/api/FakeApiController.java | 1 - .../api/FakeClassnameTestApi.java | 2 +- .../api/FakeClassnameTestApiController.java | 1 - .../java/org/openapitools/api/PetApi.java | 2 +- .../openapitools/api/PetApiController.java | 1 - .../java/org/openapitools/api/StoreApi.java | 2 +- .../openapitools/api/StoreApiController.java | 1 - .../java/org/openapitools/api/UserApi.java | 2 +- .../openapitools/api/UserApiController.java | 1 - .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 22 +++---- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../java/org/openapitools/model/Animal.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../openapitools/model/Capitalization.java | 12 ++-- .../main/java/org/openapitools/model/Cat.java | 2 +- .../java/org/openapitools/model/CatAllOf.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../org/openapitools/model/ClassModel.java | 2 +- .../java/org/openapitools/model/Client.java | 2 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../java/org/openapitools/model/DogAllOf.java | 2 +- .../org/openapitools/model/EnumArrays.java | 4 +- .../java/org/openapitools/model/EnumTest.java | 10 ++-- .../java/org/openapitools/model/File.java | 2 +- .../model/FileSchemaTestClass.java | 4 +- .../org/openapitools/model/FormatTest.java | 28 ++++----- .../openapitools/model/HasOnlyReadOnly.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +-- ...ropertiesAndAdditionalPropertiesClass.java | 6 +- .../openapitools/model/Model200Response.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../org/openapitools/model/ModelList.java | 2 +- .../org/openapitools/model/ModelReturn.java | 2 +- .../java/org/openapitools/model/Name.java | 8 +-- .../org/openapitools/model/NumberOnly.java | 2 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../openapitools/model/OuterComposite.java | 6 +- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../org/openapitools/model/ReadOnlyFirst.java | 4 +- .../openapitools/model/SpecialModelName.java | 2 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../openapitools/model/TypeHolderDefault.java | 10 ++-- .../openapitools/model/TypeHolderExample.java | 12 ++-- .../java/org/openapitools/model/User.java | 16 ++--- .../java/org/openapitools/model/XmlItem.java | 58 +++++++++---------- .../src/main/resources/openapi.yaml | 6 -- .../.openapi-generator/FILES | 1 - .../.openapi-generator/VERSION | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../api/AnotherFakeApiController.java | 1 - .../java/org/openapitools/api/FakeApi.java | 2 +- .../openapitools/api/FakeApiController.java | 1 - .../api/FakeClassnameTestApi.java | 2 +- .../api/FakeClassnameTestApiController.java | 1 - .../java/org/openapitools/api/PetApi.java | 2 +- .../openapitools/api/PetApiController.java | 1 - .../java/org/openapitools/api/StoreApi.java | 2 +- .../openapitools/api/StoreApiController.java | 1 - .../java/org/openapitools/api/UserApi.java | 2 +- .../openapitools/api/UserApiController.java | 1 - .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 22 +++---- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../java/org/openapitools/model/Animal.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../openapitools/model/Capitalization.java | 12 ++-- .../main/java/org/openapitools/model/Cat.java | 2 +- .../java/org/openapitools/model/CatAllOf.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../org/openapitools/model/ClassModel.java | 2 +- .../java/org/openapitools/model/Client.java | 2 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../java/org/openapitools/model/DogAllOf.java | 2 +- .../org/openapitools/model/EnumArrays.java | 4 +- .../java/org/openapitools/model/EnumTest.java | 10 ++-- .../java/org/openapitools/model/File.java | 2 +- .../model/FileSchemaTestClass.java | 4 +- .../org/openapitools/model/FormatTest.java | 28 ++++----- .../openapitools/model/HasOnlyReadOnly.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +-- ...ropertiesAndAdditionalPropertiesClass.java | 6 +- .../openapitools/model/Model200Response.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../org/openapitools/model/ModelList.java | 2 +- .../org/openapitools/model/ModelReturn.java | 2 +- .../java/org/openapitools/model/Name.java | 8 +-- .../org/openapitools/model/NumberOnly.java | 2 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../openapitools/model/OuterComposite.java | 6 +- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../org/openapitools/model/ReadOnlyFirst.java | 4 +- .../openapitools/model/SpecialModelName.java | 2 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../openapitools/model/TypeHolderDefault.java | 10 ++-- .../openapitools/model/TypeHolderExample.java | 12 ++-- .../java/org/openapitools/model/User.java | 16 ++--- .../java/org/openapitools/model/XmlItem.java | 58 +++++++++---------- .../src/main/resources/openapi.yaml | 6 -- .../.openapi-generator/FILES | 1 - .../.openapi-generator/VERSION | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../api/AnotherFakeApiController.java | 1 - .../java/org/openapitools/api/FakeApi.java | 2 +- .../openapitools/api/FakeApiController.java | 1 - .../api/FakeClassnameTestApi.java | 2 +- .../api/FakeClassnameTestApiController.java | 1 - .../java/org/openapitools/api/PetApi.java | 2 +- .../openapitools/api/PetApiController.java | 1 - .../java/org/openapitools/api/StoreApi.java | 2 +- .../openapitools/api/StoreApiController.java | 1 - .../java/org/openapitools/api/UserApi.java | 2 +- .../openapitools/api/UserApiController.java | 1 - .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 22 +++---- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../java/org/openapitools/model/Animal.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../java/org/openapitools/model/BigCat.java | 2 +- .../org/openapitools/model/BigCatAllOf.java | 2 +- .../openapitools/model/Capitalization.java | 12 ++-- .../main/java/org/openapitools/model/Cat.java | 2 +- .../java/org/openapitools/model/CatAllOf.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../org/openapitools/model/ClassModel.java | 2 +- .../java/org/openapitools/model/Client.java | 2 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../java/org/openapitools/model/DogAllOf.java | 2 +- .../org/openapitools/model/EnumArrays.java | 4 +- .../java/org/openapitools/model/EnumTest.java | 10 ++-- .../java/org/openapitools/model/File.java | 2 +- .../model/FileSchemaTestClass.java | 4 +- .../org/openapitools/model/FormatTest.java | 28 ++++----- .../openapitools/model/HasOnlyReadOnly.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +-- ...ropertiesAndAdditionalPropertiesClass.java | 6 +- .../openapitools/model/Model200Response.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../org/openapitools/model/ModelList.java | 2 +- .../org/openapitools/model/ModelReturn.java | 2 +- .../java/org/openapitools/model/Name.java | 8 +-- .../org/openapitools/model/NumberOnly.java | 2 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../openapitools/model/OuterComposite.java | 6 +- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../org/openapitools/model/ReadOnlyFirst.java | 4 +- .../openapitools/model/SpecialModelName.java | 2 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../openapitools/model/TypeHolderDefault.java | 10 ++-- .../openapitools/model/TypeHolderExample.java | 12 ++-- .../java/org/openapitools/model/User.java | 16 ++--- .../java/org/openapitools/model/XmlItem.java | 58 +++++++++---------- .../src/main/resources/openapi.yaml | 6 -- .../.openapi-generator/FILES | 1 - .../.openapi-generator/VERSION | 2 +- .../virtualan/api/AnotherFakeApi.java | 2 +- .../api/AnotherFakeApiController.java | 1 - .../openapitools/virtualan/api/FakeApi.java | 2 +- .../virtualan/api/FakeApiController.java | 1 - .../virtualan/api/FakeClassnameTestApi.java | 2 +- .../api/FakeClassnameTestApiController.java | 1 - .../openapitools/virtualan/api/PetApi.java | 2 +- .../virtualan/api/PetApiController.java | 1 - .../openapitools/virtualan/api/StoreApi.java | 2 +- .../virtualan/api/StoreApiController.java | 1 - .../openapitools/virtualan/api/UserApi.java | 2 +- .../virtualan/api/UserApiController.java | 1 - .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 22 +++---- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../openapitools/virtualan/model/Animal.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../virtualan/model/ArrayOfNumberOnly.java | 2 +- .../virtualan/model/ArrayTest.java | 6 +- .../openapitools/virtualan/model/BigCat.java | 2 +- .../virtualan/model/BigCatAllOf.java | 2 +- .../virtualan/model/Capitalization.java | 12 ++-- .../org/openapitools/virtualan/model/Cat.java | 2 +- .../virtualan/model/CatAllOf.java | 2 +- .../virtualan/model/Category.java | 4 +- .../virtualan/model/ClassModel.java | 2 +- .../openapitools/virtualan/model/Client.java | 2 +- .../org/openapitools/virtualan/model/Dog.java | 2 +- .../virtualan/model/DogAllOf.java | 2 +- .../virtualan/model/EnumArrays.java | 4 +- .../virtualan/model/EnumTest.java | 10 ++-- .../openapitools/virtualan/model/File.java | 2 +- .../virtualan/model/FileSchemaTestClass.java | 4 +- .../virtualan/model/FormatTest.java | 28 ++++----- .../virtualan/model/HasOnlyReadOnly.java | 4 +- .../openapitools/virtualan/model/MapTest.java | 8 +-- ...ropertiesAndAdditionalPropertiesClass.java | 6 +- .../virtualan/model/Model200Response.java | 4 +- .../virtualan/model/ModelApiResponse.java | 6 +- .../virtualan/model/ModelList.java | 2 +- .../virtualan/model/ModelReturn.java | 2 +- .../openapitools/virtualan/model/Name.java | 8 +-- .../virtualan/model/NumberOnly.java | 2 +- .../openapitools/virtualan/model/Order.java | 12 ++-- .../virtualan/model/OuterComposite.java | 6 +- .../org/openapitools/virtualan/model/Pet.java | 12 ++-- .../virtualan/model/ReadOnlyFirst.java | 4 +- .../virtualan/model/SpecialModelName.java | 2 +- .../org/openapitools/virtualan/model/Tag.java | 4 +- .../virtualan/model/TypeHolderDefault.java | 10 ++-- .../virtualan/model/TypeHolderExample.java | 12 ++-- .../openapitools/virtualan/model/User.java | 16 ++--- .../openapitools/virtualan/model/XmlItem.java | 58 +++++++++---------- .../src/main/resources/openapi.yaml | 6 -- .../springboot/.openapi-generator/FILES | 1 - .../springboot/.openapi-generator/VERSION | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../api/AnotherFakeApiController.java | 1 - .../java/org/openapitools/api/FakeApi.java | 2 +- .../openapitools/api/FakeApiController.java | 1 - .../api/FakeClassnameTestApi.java | 2 +- .../api/FakeClassnameTestApiController.java | 1 - .../java/org/openapitools/api/PetApi.java | 2 +- .../openapitools/api/PetApiController.java | 1 - .../java/org/openapitools/api/StoreApi.java | 2 +- .../openapitools/api/StoreApiController.java | 1 - .../java/org/openapitools/api/UserApi.java | 2 +- .../openapitools/api/UserApiController.java | 1 - .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 22 +++---- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../java/org/openapitools/model/Animal.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../java/org/openapitools/model/BigCat.java | 2 +- .../org/openapitools/model/BigCatAllOf.java | 2 +- .../openapitools/model/Capitalization.java | 12 ++-- .../main/java/org/openapitools/model/Cat.java | 2 +- .../java/org/openapitools/model/CatAllOf.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../org/openapitools/model/ClassModel.java | 2 +- .../java/org/openapitools/model/Client.java | 2 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../java/org/openapitools/model/DogAllOf.java | 2 +- .../org/openapitools/model/EnumArrays.java | 4 +- .../java/org/openapitools/model/EnumTest.java | 10 ++-- .../java/org/openapitools/model/File.java | 2 +- .../model/FileSchemaTestClass.java | 4 +- .../org/openapitools/model/FormatTest.java | 28 ++++----- .../openapitools/model/HasOnlyReadOnly.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +-- ...ropertiesAndAdditionalPropertiesClass.java | 6 +- .../openapitools/model/Model200Response.java | 10 ++-- .../openapitools/model/ModelApiResponse.java | 6 +- .../org/openapitools/model/ModelList.java | 26 ++++----- .../org/openapitools/model/ModelReturn.java | 2 +- .../java/org/openapitools/model/Name.java | 32 +++++----- .../org/openapitools/model/NumberOnly.java | 2 +- .../java/org/openapitools/model/Order.java | 12 ++-- .../openapitools/model/OuterComposite.java | 6 +- .../main/java/org/openapitools/model/Pet.java | 12 ++-- .../org/openapitools/model/ReadOnlyFirst.java | 4 +- .../openapitools/model/SpecialModelName.java | 26 ++++----- .../main/java/org/openapitools/model/Tag.java | 4 +- .../openapitools/model/TypeHolderDefault.java | 10 ++-- .../openapitools/model/TypeHolderExample.java | 12 ++-- .../java/org/openapitools/model/User.java | 16 ++--- .../java/org/openapitools/model/XmlItem.java | 58 +++++++++---------- .../src/main/resources/openapi.yaml | 6 -- 1394 files changed, 3807 insertions(+), 4058 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache index 9ea2e7c95dd0..dacf00128365 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache @@ -139,9 +139,6 @@ public class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}{{^parent}} {{/maximum}} * @return {{name}} */ - {{#jackson}} - @JsonProperty("{{baseName}}") - {{/jackson}} {{#vendorExtensions.x-extra-annotation}} {{{vendorExtensions.x-extra-annotation}}} {{/vendorExtensions.x-extra-annotation}} @@ -157,6 +154,9 @@ public class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}{{^parent}} {{#swagger1AnnotationLibrary}} @ApiModelProperty({{#example}}example = "{{{.}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}{{#isReadOnly}}readOnly = {{{isReadOnly}}}, {{/isReadOnly}}value = "{{{description}}}") {{/swagger1AnnotationLibrary}} + {{#jackson}} + @JsonProperty("{{baseName}}") + {{/jackson}} public {{>nullableDataType}} {{getter}}() { return {{name}}; } diff --git a/samples/client/petstore/spring-cloud-async/.openapi-generator/VERSION b/samples/client/petstore/spring-cloud-async/.openapi-generator/VERSION index d6b4ec4aa783..ed829dbcddec 100644 --- a/samples/client/petstore/spring-cloud-async/.openapi-generator/VERSION +++ b/samples/client/petstore/spring-cloud-async/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0-SNAPSHOT \ No newline at end of file +6.2.1-SNAPSHOT \ No newline at end of file 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 5e6b3e191b1e..680728a5b323 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java index 9b1d6de4fe5b..473fc9104a93 100644 --- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java index 78f782e06dec..1661dfd48a1c 100644 --- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Category.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Category.java index 54981cbb60a9..4ca64dd933f3 100644 --- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Category.java +++ b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Category.java @@ -36,9 +36,9 @@ public Category id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -56,9 +56,9 @@ public Category name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/ModelApiResponse.java index 2c232dc89527..a6a565214984 100644 --- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -40,9 +40,9 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ - @JsonProperty("code") @ApiModelProperty(value = "") + @JsonProperty("code") public Integer getCode() { return code; } @@ -60,9 +60,9 @@ public ModelApiResponse type(String type) { * Get type * @return type */ - @JsonProperty("type") @ApiModelProperty(value = "") + @JsonProperty("type") public String getType() { return type; } @@ -80,9 +80,9 @@ public ModelApiResponse message(String message) { * Get message * @return message */ - @JsonProperty("message") @ApiModelProperty(value = "") + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Order.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Order.java index 71a0b505c7f4..45802212a9da 100644 --- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Order.java +++ b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Order.java @@ -85,9 +85,9 @@ public Order id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -105,9 +105,9 @@ public Order petId(Long petId) { * Get petId * @return petId */ - @JsonProperty("petId") @ApiModelProperty(value = "") + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -125,9 +125,9 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ - @JsonProperty("quantity") @ApiModelProperty(value = "") + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -145,9 +145,9 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ - @JsonProperty("shipDate") @Valid @ApiModelProperty(value = "") + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -165,9 +165,9 @@ public Order status(StatusEnum status) { * Order Status * @return status */ - @JsonProperty("status") @ApiModelProperty(value = "Order Status") + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -185,9 +185,9 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ - @JsonProperty("complete") @ApiModelProperty(value = "") + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java index 3041d644634e..4b920ce15a20 100644 --- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java +++ b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java @@ -88,9 +88,9 @@ public Pet id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -108,9 +108,9 @@ public Pet category(Category category) { * Get category * @return category */ - @JsonProperty("category") @Valid @ApiModelProperty(value = "") + @JsonProperty("category") public Category getCategory() { return category; } @@ -128,9 +128,9 @@ public Pet name(String name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") + @JsonProperty("name") public String getName() { return name; } @@ -153,9 +153,9 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ - @JsonProperty("photoUrls") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; } @@ -181,9 +181,9 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @JsonProperty("tags") @Valid @ApiModelProperty(value = "") + @JsonProperty("tags") public List getTags() { return tags; } @@ -201,9 +201,9 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ - @JsonProperty("status") @ApiModelProperty(value = "pet status in the store") + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Tag.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Tag.java index 397f28ba4b4f..b6d3df295734 100644 --- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Tag.java +++ b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Tag.java @@ -36,9 +36,9 @@ public Tag id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -56,9 +56,9 @@ public Tag name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/User.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/User.java index 42b2a02dc443..a5233b08ae5c 100644 --- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/User.java +++ b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/User.java @@ -48,9 +48,9 @@ public User id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -68,9 +68,9 @@ public User username(String username) { * Get username * @return username */ - @JsonProperty("username") @ApiModelProperty(value = "") + @JsonProperty("username") public String getUsername() { return username; } @@ -88,9 +88,9 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ - @JsonProperty("firstName") @ApiModelProperty(value = "") + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -108,9 +108,9 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ - @JsonProperty("lastName") @ApiModelProperty(value = "") + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -128,9 +128,9 @@ public User email(String email) { * Get email * @return email */ - @JsonProperty("email") @ApiModelProperty(value = "") + @JsonProperty("email") public String getEmail() { return email; } @@ -148,9 +148,9 @@ public User password(String password) { * Get password * @return password */ - @JsonProperty("password") @ApiModelProperty(value = "") + @JsonProperty("password") public String getPassword() { return password; } @@ -168,9 +168,9 @@ public User phone(String phone) { * Get phone * @return phone */ - @JsonProperty("phone") @ApiModelProperty(value = "") + @JsonProperty("phone") public String getPhone() { return phone; } @@ -188,9 +188,9 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ - @JsonProperty("userStatus") @ApiModelProperty(value = "User Status") + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/client/petstore/spring-cloud-date-time/.openapi-generator/VERSION b/samples/client/petstore/spring-cloud-date-time/.openapi-generator/VERSION index d6b4ec4aa783..ed829dbcddec 100644 --- a/samples/client/petstore/spring-cloud-date-time/.openapi-generator/VERSION +++ b/samples/client/petstore/spring-cloud-date-time/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0-SNAPSHOT \ No newline at end of file +6.2.1-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java b/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java index 8b46211dc20d..f171b092fd7c 100644 --- a/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java +++ b/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/model/Pet.java index 2fbe90843059..923cbaaa2699 100644 --- a/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/model/Pet.java +++ b/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/model/Pet.java @@ -49,9 +49,9 @@ public Pet atType(String atType) { * Get atType * @return atType */ - @JsonProperty("@type") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("@type") public String getAtType() { return atType; } @@ -69,9 +69,9 @@ public Pet age(Integer age) { * Get age * @return age */ - @JsonProperty("age") @ApiModelProperty(value = "") + @JsonProperty("age") public Integer getAge() { return age; } @@ -89,9 +89,9 @@ public Pet happy(Boolean happy) { * Get happy * @return happy */ - @JsonProperty("happy") @ApiModelProperty(value = "") + @JsonProperty("happy") public Boolean getHappy() { return happy; } @@ -109,9 +109,9 @@ public Pet price(BigDecimal price) { * Get price * @return price */ - @JsonProperty("price") @Valid @ApiModelProperty(value = "") + @JsonProperty("price") public BigDecimal getPrice() { return price; } @@ -129,9 +129,9 @@ public Pet lastFeed(OffsetDateTime lastFeed) { * Get lastFeed * @return lastFeed */ - @JsonProperty("lastFeed") @Valid @ApiModelProperty(value = "") + @JsonProperty("lastFeed") public OffsetDateTime getLastFeed() { return lastFeed; } @@ -149,9 +149,9 @@ public Pet dateOfBirth(LocalDate dateOfBirth) { * Get dateOfBirth * @return dateOfBirth */ - @JsonProperty("dateOfBirth") @Valid @ApiModelProperty(value = "") + @JsonProperty("dateOfBirth") public LocalDate getDateOfBirth() { return dateOfBirth; } diff --git a/samples/client/petstore/spring-cloud-feign-without-url/.openapi-generator/VERSION b/samples/client/petstore/spring-cloud-feign-without-url/.openapi-generator/VERSION index d6b4ec4aa783..ed829dbcddec 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/.openapi-generator/VERSION +++ b/samples/client/petstore/spring-cloud-feign-without-url/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0-SNAPSHOT \ No newline at end of file +6.2.1-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/PetApi.java index 933565438467..e23a7399e384 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/StoreApi.java index 26f7bb20bd0f..168f1ac6abc2 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/UserApi.java index 81b5380d35a9..3a5a60204293 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Category.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Category.java index 382418682ada..4a167e1c112e 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Category.java +++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Category.java @@ -36,9 +36,9 @@ public Category id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -56,9 +56,9 @@ public Category name(String name) { * Get name * @return name */ - @JsonProperty("name") @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/ModelApiResponse.java index 2c232dc89527..a6a565214984 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -40,9 +40,9 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ - @JsonProperty("code") @ApiModelProperty(value = "") + @JsonProperty("code") public Integer getCode() { return code; } @@ -60,9 +60,9 @@ public ModelApiResponse type(String type) { * Get type * @return type */ - @JsonProperty("type") @ApiModelProperty(value = "") + @JsonProperty("type") public String getType() { return type; } @@ -80,9 +80,9 @@ public ModelApiResponse message(String message) { * Get message * @return message */ - @JsonProperty("message") @ApiModelProperty(value = "") + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Order.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Order.java index 71a0b505c7f4..45802212a9da 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Order.java +++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Order.java @@ -85,9 +85,9 @@ public Order id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -105,9 +105,9 @@ public Order petId(Long petId) { * Get petId * @return petId */ - @JsonProperty("petId") @ApiModelProperty(value = "") + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -125,9 +125,9 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ - @JsonProperty("quantity") @ApiModelProperty(value = "") + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -145,9 +145,9 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ - @JsonProperty("shipDate") @Valid @ApiModelProperty(value = "") + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -165,9 +165,9 @@ public Order status(StatusEnum status) { * Order Status * @return status */ - @JsonProperty("status") @ApiModelProperty(value = "Order Status") + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -185,9 +185,9 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ - @JsonProperty("complete") @ApiModelProperty(value = "") + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Pet.java index 3041d644634e..4b920ce15a20 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Pet.java +++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Pet.java @@ -88,9 +88,9 @@ public Pet id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -108,9 +108,9 @@ public Pet category(Category category) { * Get category * @return category */ - @JsonProperty("category") @Valid @ApiModelProperty(value = "") + @JsonProperty("category") public Category getCategory() { return category; } @@ -128,9 +128,9 @@ public Pet name(String name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") + @JsonProperty("name") public String getName() { return name; } @@ -153,9 +153,9 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ - @JsonProperty("photoUrls") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; } @@ -181,9 +181,9 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @JsonProperty("tags") @Valid @ApiModelProperty(value = "") + @JsonProperty("tags") public List getTags() { return tags; } @@ -201,9 +201,9 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ - @JsonProperty("status") @ApiModelProperty(value = "pet status in the store") + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Tag.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Tag.java index 397f28ba4b4f..b6d3df295734 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Tag.java +++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Tag.java @@ -36,9 +36,9 @@ public Tag id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -56,9 +56,9 @@ public Tag name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/User.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/User.java index 42b2a02dc443..a5233b08ae5c 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/User.java +++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/User.java @@ -48,9 +48,9 @@ public User id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -68,9 +68,9 @@ public User username(String username) { * Get username * @return username */ - @JsonProperty("username") @ApiModelProperty(value = "") + @JsonProperty("username") public String getUsername() { return username; } @@ -88,9 +88,9 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ - @JsonProperty("firstName") @ApiModelProperty(value = "") + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -108,9 +108,9 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ - @JsonProperty("lastName") @ApiModelProperty(value = "") + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -128,9 +128,9 @@ public User email(String email) { * Get email * @return email */ - @JsonProperty("email") @ApiModelProperty(value = "") + @JsonProperty("email") public String getEmail() { return email; } @@ -148,9 +148,9 @@ public User password(String password) { * Get password * @return password */ - @JsonProperty("password") @ApiModelProperty(value = "") + @JsonProperty("password") public String getPassword() { return password; } @@ -168,9 +168,9 @@ public User phone(String phone) { * Get phone * @return phone */ - @JsonProperty("phone") @ApiModelProperty(value = "") + @JsonProperty("phone") public String getPhone() { return phone; } @@ -188,9 +188,9 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ - @JsonProperty("userStatus") @ApiModelProperty(value = "User Status") + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/client/petstore/spring-cloud-spring-pageable/.openapi-generator/VERSION b/samples/client/petstore/spring-cloud-spring-pageable/.openapi-generator/VERSION index d6b4ec4aa783..ed829dbcddec 100644 --- a/samples/client/petstore/spring-cloud-spring-pageable/.openapi-generator/VERSION +++ b/samples/client/petstore/spring-cloud-spring-pageable/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0-SNAPSHOT \ No newline at end of file +6.2.1-SNAPSHOT \ No newline at end of file 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 c6cd35b9961d..8af4efcf77bc 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java index b24e4da04e0b..f5c279e035f4 100644 --- a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java index 8b910fd40493..0ed046824c74 100644 --- a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Category.java b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Category.java index 54981cbb60a9..4ca64dd933f3 100644 --- a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Category.java +++ b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Category.java @@ -36,9 +36,9 @@ public Category id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -56,9 +56,9 @@ public Category name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java index 2c232dc89527..a6a565214984 100644 --- a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -40,9 +40,9 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ - @JsonProperty("code") @ApiModelProperty(value = "") + @JsonProperty("code") public Integer getCode() { return code; } @@ -60,9 +60,9 @@ public ModelApiResponse type(String type) { * Get type * @return type */ - @JsonProperty("type") @ApiModelProperty(value = "") + @JsonProperty("type") public String getType() { return type; } @@ -80,9 +80,9 @@ public ModelApiResponse message(String message) { * Get message * @return message */ - @JsonProperty("message") @ApiModelProperty(value = "") + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Order.java b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Order.java index 71a0b505c7f4..45802212a9da 100644 --- a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Order.java +++ b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Order.java @@ -85,9 +85,9 @@ public Order id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -105,9 +105,9 @@ public Order petId(Long petId) { * Get petId * @return petId */ - @JsonProperty("petId") @ApiModelProperty(value = "") + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -125,9 +125,9 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ - @JsonProperty("quantity") @ApiModelProperty(value = "") + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -145,9 +145,9 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ - @JsonProperty("shipDate") @Valid @ApiModelProperty(value = "") + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -165,9 +165,9 @@ public Order status(StatusEnum status) { * Order Status * @return status */ - @JsonProperty("status") @ApiModelProperty(value = "Order Status") + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -185,9 +185,9 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ - @JsonProperty("complete") @ApiModelProperty(value = "") + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java index 3041d644634e..4b920ce15a20 100644 --- a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java +++ b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java @@ -88,9 +88,9 @@ public Pet id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -108,9 +108,9 @@ public Pet category(Category category) { * Get category * @return category */ - @JsonProperty("category") @Valid @ApiModelProperty(value = "") + @JsonProperty("category") public Category getCategory() { return category; } @@ -128,9 +128,9 @@ public Pet name(String name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") + @JsonProperty("name") public String getName() { return name; } @@ -153,9 +153,9 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ - @JsonProperty("photoUrls") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; } @@ -181,9 +181,9 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @JsonProperty("tags") @Valid @ApiModelProperty(value = "") + @JsonProperty("tags") public List getTags() { return tags; } @@ -201,9 +201,9 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ - @JsonProperty("status") @ApiModelProperty(value = "pet status in the store") + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Tag.java b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Tag.java index 397f28ba4b4f..b6d3df295734 100644 --- a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Tag.java +++ b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Tag.java @@ -36,9 +36,9 @@ public Tag id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -56,9 +56,9 @@ public Tag name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/User.java b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/User.java index 42b2a02dc443..a5233b08ae5c 100644 --- a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/User.java +++ b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/User.java @@ -48,9 +48,9 @@ public User id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -68,9 +68,9 @@ public User username(String username) { * Get username * @return username */ - @JsonProperty("username") @ApiModelProperty(value = "") + @JsonProperty("username") public String getUsername() { return username; } @@ -88,9 +88,9 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ - @JsonProperty("firstName") @ApiModelProperty(value = "") + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -108,9 +108,9 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ - @JsonProperty("lastName") @ApiModelProperty(value = "") + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -128,9 +128,9 @@ public User email(String email) { * Get email * @return email */ - @JsonProperty("email") @ApiModelProperty(value = "") + @JsonProperty("email") public String getEmail() { return email; } @@ -148,9 +148,9 @@ public User password(String password) { * Get password * @return password */ - @JsonProperty("password") @ApiModelProperty(value = "") + @JsonProperty("password") public String getPassword() { return password; } @@ -168,9 +168,9 @@ public User phone(String phone) { * Get phone * @return phone */ - @JsonProperty("phone") @ApiModelProperty(value = "") + @JsonProperty("phone") public String getPhone() { return phone; } @@ -188,9 +188,9 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ - @JsonProperty("userStatus") @ApiModelProperty(value = "User Status") + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/client/petstore/spring-cloud/.openapi-generator/VERSION b/samples/client/petstore/spring-cloud/.openapi-generator/VERSION index d6b4ec4aa783..ed829dbcddec 100644 --- a/samples/client/petstore/spring-cloud/.openapi-generator/VERSION +++ b/samples/client/petstore/spring-cloud/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0-SNAPSHOT \ No newline at end of file +6.2.1-SNAPSHOT \ No newline at end of file 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 933565438467..e23a7399e384 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java index 26f7bb20bd0f..168f1ac6abc2 100644 --- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java index 81b5380d35a9..3a5a60204293 100644 --- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java index 382418682ada..4a167e1c112e 100644 --- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java +++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java @@ -36,9 +36,9 @@ public Category id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -56,9 +56,9 @@ public Category name(String name) { * Get name * @return name */ - @JsonProperty("name") @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java index 2c232dc89527..a6a565214984 100644 --- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -40,9 +40,9 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ - @JsonProperty("code") @ApiModelProperty(value = "") + @JsonProperty("code") public Integer getCode() { return code; } @@ -60,9 +60,9 @@ public ModelApiResponse type(String type) { * Get type * @return type */ - @JsonProperty("type") @ApiModelProperty(value = "") + @JsonProperty("type") public String getType() { return type; } @@ -80,9 +80,9 @@ public ModelApiResponse message(String message) { * Get message * @return message */ - @JsonProperty("message") @ApiModelProperty(value = "") + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java index 71a0b505c7f4..45802212a9da 100644 --- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java +++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java @@ -85,9 +85,9 @@ public Order id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -105,9 +105,9 @@ public Order petId(Long petId) { * Get petId * @return petId */ - @JsonProperty("petId") @ApiModelProperty(value = "") + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -125,9 +125,9 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ - @JsonProperty("quantity") @ApiModelProperty(value = "") + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -145,9 +145,9 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ - @JsonProperty("shipDate") @Valid @ApiModelProperty(value = "") + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -165,9 +165,9 @@ public Order status(StatusEnum status) { * Order Status * @return status */ - @JsonProperty("status") @ApiModelProperty(value = "Order Status") + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -185,9 +185,9 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ - @JsonProperty("complete") @ApiModelProperty(value = "") + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java index 3041d644634e..4b920ce15a20 100644 --- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java +++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java @@ -88,9 +88,9 @@ public Pet id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -108,9 +108,9 @@ public Pet category(Category category) { * Get category * @return category */ - @JsonProperty("category") @Valid @ApiModelProperty(value = "") + @JsonProperty("category") public Category getCategory() { return category; } @@ -128,9 +128,9 @@ public Pet name(String name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") + @JsonProperty("name") public String getName() { return name; } @@ -153,9 +153,9 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ - @JsonProperty("photoUrls") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; } @@ -181,9 +181,9 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @JsonProperty("tags") @Valid @ApiModelProperty(value = "") + @JsonProperty("tags") public List getTags() { return tags; } @@ -201,9 +201,9 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ - @JsonProperty("status") @ApiModelProperty(value = "pet status in the store") + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java index 397f28ba4b4f..b6d3df295734 100644 --- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java +++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java @@ -36,9 +36,9 @@ public Tag id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -56,9 +56,9 @@ public Tag name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java index 42b2a02dc443..a5233b08ae5c 100644 --- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java +++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java @@ -48,9 +48,9 @@ public User id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -68,9 +68,9 @@ public User username(String username) { * Get username * @return username */ - @JsonProperty("username") @ApiModelProperty(value = "") + @JsonProperty("username") public String getUsername() { return username; } @@ -88,9 +88,9 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ - @JsonProperty("firstName") @ApiModelProperty(value = "") + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -108,9 +108,9 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ - @JsonProperty("lastName") @ApiModelProperty(value = "") + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -128,9 +128,9 @@ public User email(String email) { * Get email * @return email */ - @JsonProperty("email") @ApiModelProperty(value = "") + @JsonProperty("email") public String getEmail() { return email; } @@ -148,9 +148,9 @@ public User password(String password) { * Get password * @return password */ - @JsonProperty("password") @ApiModelProperty(value = "") + @JsonProperty("password") public String getPassword() { return password; } @@ -168,9 +168,9 @@ public User phone(String phone) { * Get phone * @return phone */ - @JsonProperty("phone") @ApiModelProperty(value = "") + @JsonProperty("phone") public String getPhone() { return phone; } @@ -188,9 +188,9 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ - @JsonProperty("userStatus") @ApiModelProperty(value = "User Status") + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/openapi3/client/petstore/spring-cloud-3/.openapi-generator/VERSION b/samples/openapi3/client/petstore/spring-cloud-3/.openapi-generator/VERSION index d6b4ec4aa783..ed829dbcddec 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/spring-cloud-3/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0-SNAPSHOT \ No newline at end of file +6.2.1-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/PetApi.java index 0b132252a8c6..68bff6de7246 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/StoreApi.java index 5e41c5337328..9b6d98c54ba4 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/UserApi.java index 5aa08f0954b6..9383e4f4ffdb 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Category.java index 8facee0b4d00..9bf7008d0ca5 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Category.java @@ -35,9 +35,9 @@ public Category id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -55,9 +55,9 @@ public Category name(String name) { * Get name * @return name */ - @JsonProperty("name") @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/ModelApiResponse.java index dc22eb8bad56..02b041f6c4f4 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -39,9 +39,9 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ - @JsonProperty("code") @Schema(name = "code", required = false) + @JsonProperty("code") public Integer getCode() { return code; } @@ -59,9 +59,9 @@ public ModelApiResponse type(String type) { * Get type * @return type */ - @JsonProperty("type") @Schema(name = "type", required = false) + @JsonProperty("type") public String getType() { return type; } @@ -79,9 +79,9 @@ public ModelApiResponse message(String message) { * Get message * @return message */ - @JsonProperty("message") @Schema(name = "message", required = false) + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Order.java index 830de6970600..8aa3e2ba4fbb 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Order.java @@ -84,9 +84,9 @@ public Order id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -104,9 +104,9 @@ public Order petId(Long petId) { * Get petId * @return petId */ - @JsonProperty("petId") @Schema(name = "petId", required = false) + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -124,9 +124,9 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ - @JsonProperty("quantity") @Schema(name = "quantity", required = false) + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -144,9 +144,9 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ - @JsonProperty("shipDate") @Valid @Schema(name = "shipDate", required = false) + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -164,9 +164,9 @@ public Order status(StatusEnum status) { * Order Status * @return status */ - @JsonProperty("status") @Schema(name = "status", description = "Order Status", required = false) + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -184,9 +184,9 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ - @JsonProperty("complete") @Schema(name = "complete", required = false) + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Pet.java index f63620ba65e4..ed46445ad84b 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Pet.java @@ -87,9 +87,9 @@ public Pet id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -107,9 +107,9 @@ public Pet category(Category category) { * Get category * @return category */ - @JsonProperty("category") @Valid @Schema(name = "category", required = false) + @JsonProperty("category") public Category getCategory() { return category; } @@ -127,9 +127,9 @@ public Pet name(String name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @Schema(name = "name", example = "doggie", required = true) + @JsonProperty("name") public String getName() { return name; } @@ -152,9 +152,9 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ - @JsonProperty("photoUrls") @NotNull @Schema(name = "photoUrls", required = true) + @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; } @@ -180,9 +180,9 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @JsonProperty("tags") @Valid @Schema(name = "tags", required = false) + @JsonProperty("tags") public List getTags() { return tags; } @@ -200,9 +200,9 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ - @JsonProperty("status") @Schema(name = "status", description = "pet status in the store", required = false) + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Tag.java index f7c39632be46..90779dcb9b5f 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Tag.java @@ -35,9 +35,9 @@ public Tag id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -55,9 +55,9 @@ public Tag name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/User.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/User.java index c9d25cf39f6e..13b23b8b8fa1 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/User.java @@ -47,9 +47,9 @@ public User id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -67,9 +67,9 @@ public User username(String username) { * Get username * @return username */ - @JsonProperty("username") @Schema(name = "username", required = false) + @JsonProperty("username") public String getUsername() { return username; } @@ -87,9 +87,9 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ - @JsonProperty("firstName") @Schema(name = "firstName", required = false) + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -107,9 +107,9 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ - @JsonProperty("lastName") @Schema(name = "lastName", required = false) + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -127,9 +127,9 @@ public User email(String email) { * Get email * @return email */ - @JsonProperty("email") @Schema(name = "email", required = false) + @JsonProperty("email") public String getEmail() { return email; } @@ -147,9 +147,9 @@ public User password(String password) { * Get password * @return password */ - @JsonProperty("password") @Schema(name = "password", required = false) + @JsonProperty("password") public String getPassword() { return password; } @@ -167,9 +167,9 @@ public User phone(String phone) { * Get phone * @return phone */ - @JsonProperty("phone") @Schema(name = "phone", required = false) + @JsonProperty("phone") public String getPhone() { return phone; } @@ -187,9 +187,9 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ - @JsonProperty("userStatus") @Schema(name = "userStatus", description = "User Status", required = false) + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/openapi3/client/petstore/spring-cloud-async/.openapi-generator/VERSION b/samples/openapi3/client/petstore/spring-cloud-async/.openapi-generator/VERSION index d6b4ec4aa783..ed829dbcddec 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/spring-cloud-async/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0-SNAPSHOT \ No newline at end of file +6.2.1-SNAPSHOT \ No newline at end of file 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 2e2c28c2557a..ebc57d183901 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java index ce3ad7a5eb62..b272e5c2d5f4 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java index 7ae58d7ef0b8..b63d077b4c49 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Category.java index 63e2bb12a67c..7a8b202187b9 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Category.java @@ -35,9 +35,9 @@ public Category id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -55,9 +55,9 @@ public Category name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/ModelApiResponse.java index 5d93139025d0..030dba3f7776 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -39,9 +39,9 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ - @JsonProperty("code") @Schema(name = "code", required = false) + @JsonProperty("code") public Integer getCode() { return code; } @@ -59,9 +59,9 @@ public ModelApiResponse type(String type) { * Get type * @return type */ - @JsonProperty("type") @Schema(name = "type", required = false) + @JsonProperty("type") public String getType() { return type; } @@ -79,9 +79,9 @@ public ModelApiResponse message(String message) { * Get message * @return message */ - @JsonProperty("message") @Schema(name = "message", required = false) + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Order.java index 57e02c6a0658..dadc85ceab09 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Order.java @@ -84,9 +84,9 @@ public Order id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -104,9 +104,9 @@ public Order petId(Long petId) { * Get petId * @return petId */ - @JsonProperty("petId") @Schema(name = "petId", required = false) + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -124,9 +124,9 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ - @JsonProperty("quantity") @Schema(name = "quantity", required = false) + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -144,9 +144,9 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ - @JsonProperty("shipDate") @Valid @Schema(name = "shipDate", required = false) + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -164,9 +164,9 @@ public Order status(StatusEnum status) { * Order Status * @return status */ - @JsonProperty("status") @Schema(name = "status", description = "Order Status", required = false) + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -184,9 +184,9 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ - @JsonProperty("complete") @Schema(name = "complete", required = false) + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java index 935a9242ca57..1637c81b3c69 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java @@ -87,9 +87,9 @@ public Pet id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -107,9 +107,9 @@ public Pet category(Category category) { * Get category * @return category */ - @JsonProperty("category") @Valid @Schema(name = "category", required = false) + @JsonProperty("category") public Category getCategory() { return category; } @@ -127,9 +127,9 @@ public Pet name(String name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @Schema(name = "name", example = "doggie", required = true) + @JsonProperty("name") public String getName() { return name; } @@ -152,9 +152,9 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ - @JsonProperty("photoUrls") @NotNull @Schema(name = "photoUrls", required = true) + @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; } @@ -180,9 +180,9 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @JsonProperty("tags") @Valid @Schema(name = "tags", required = false) + @JsonProperty("tags") public List getTags() { return tags; } @@ -200,9 +200,9 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ - @JsonProperty("status") @Schema(name = "status", description = "pet status in the store", required = false) + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Tag.java index 657e04be1aae..2a7aa08f500e 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Tag.java @@ -35,9 +35,9 @@ public Tag id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -55,9 +55,9 @@ public Tag name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/User.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/User.java index c51537754aff..b05e507b3efd 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/User.java @@ -47,9 +47,9 @@ public User id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -67,9 +67,9 @@ public User username(String username) { * Get username * @return username */ - @JsonProperty("username") @Schema(name = "username", required = false) + @JsonProperty("username") public String getUsername() { return username; } @@ -87,9 +87,9 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ - @JsonProperty("firstName") @Schema(name = "firstName", required = false) + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -107,9 +107,9 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ - @JsonProperty("lastName") @Schema(name = "lastName", required = false) + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -127,9 +127,9 @@ public User email(String email) { * Get email * @return email */ - @JsonProperty("email") @Schema(name = "email", required = false) + @JsonProperty("email") public String getEmail() { return email; } @@ -147,9 +147,9 @@ public User password(String password) { * Get password * @return password */ - @JsonProperty("password") @Schema(name = "password", required = false) + @JsonProperty("password") public String getPassword() { return password; } @@ -167,9 +167,9 @@ public User phone(String phone) { * Get phone * @return phone */ - @JsonProperty("phone") @Schema(name = "phone", required = false) + @JsonProperty("phone") public String getPhone() { return phone; } @@ -187,9 +187,9 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ - @JsonProperty("userStatus") @Schema(name = "userStatus", description = "User Status", required = false) + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/openapi3/client/petstore/spring-cloud-date-time/.openapi-generator/VERSION b/samples/openapi3/client/petstore/spring-cloud-date-time/.openapi-generator/VERSION index d6b4ec4aa783..ed829dbcddec 100644 --- a/samples/openapi3/client/petstore/spring-cloud-date-time/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/spring-cloud-date-time/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0-SNAPSHOT \ No newline at end of file +6.2.1-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java b/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java index ee84e42d4c22..35f0e9495e4e 100644 --- a/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/model/Pet.java index f9807396641d..ea4b18447fdb 100644 --- a/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/model/Pet.java @@ -48,9 +48,9 @@ public Pet atType(String atType) { * Get atType * @return atType */ - @JsonProperty("@type") @NotNull @Schema(name = "@type", required = true) + @JsonProperty("@type") public String getAtType() { return atType; } @@ -68,9 +68,9 @@ public Pet age(Integer age) { * Get age * @return age */ - @JsonProperty("age") @Schema(name = "age", required = false) + @JsonProperty("age") public Integer getAge() { return age; } @@ -88,9 +88,9 @@ public Pet happy(Boolean happy) { * Get happy * @return happy */ - @JsonProperty("happy") @Schema(name = "happy", required = false) + @JsonProperty("happy") public Boolean getHappy() { return happy; } @@ -108,9 +108,9 @@ public Pet price(BigDecimal price) { * Get price * @return price */ - @JsonProperty("price") @Valid @Schema(name = "price", required = false) + @JsonProperty("price") public BigDecimal getPrice() { return price; } @@ -128,9 +128,9 @@ public Pet lastFeed(OffsetDateTime lastFeed) { * Get lastFeed * @return lastFeed */ - @JsonProperty("lastFeed") @Valid @Schema(name = "lastFeed", required = false) + @JsonProperty("lastFeed") public OffsetDateTime getLastFeed() { return lastFeed; } @@ -148,9 +148,9 @@ public Pet dateOfBirth(LocalDate dateOfBirth) { * Get dateOfBirth * @return dateOfBirth */ - @JsonProperty("dateOfBirth") @Valid @Schema(name = "dateOfBirth", required = false) + @JsonProperty("dateOfBirth") public LocalDate getDateOfBirth() { return dateOfBirth; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/.openapi-generator/VERSION b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/.openapi-generator/VERSION index d6b4ec4aa783..ed829dbcddec 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0-SNAPSHOT \ No newline at end of file +6.2.1-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/AnotherFakeApi.java index 47e3335edeee..45d4eada9380 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ 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 3cee3811ffb6..4f7bb9ca1931 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java index d41f06b6c2ad..343f753a464e 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ 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 d63709b82b08..134004e591a4 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/StoreApi.java index 4aa4a703929d..bb80398ecb27 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/UserApi.java index 27e4a0660530..504ea50dfdc2 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index e45a52c7a8af..62bd9f2bdf5f 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -34,9 +34,9 @@ public AdditionalPropertiesAnyType name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index ff8e902ab955..774a995fa648 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -35,9 +35,9 @@ public AdditionalPropertiesArray name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index c21068182c49..e46980d51924 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -34,9 +34,9 @@ public AdditionalPropertiesBoolean name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index c43432f178b1..2987ecb804c9 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -72,9 +72,9 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt * Get mapString * @return mapString */ - @JsonProperty("map_string") @Schema(name = "map_string", required = false) + @JsonProperty("map_string") public Map getMapString() { return mapString; } @@ -100,9 +100,9 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * Get mapNumber * @return mapNumber */ - @JsonProperty("map_number") @Valid @Schema(name = "map_number", required = false) + @JsonProperty("map_number") public Map getMapNumber() { return mapNumber; } @@ -128,9 +128,9 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege * Get mapInteger * @return mapInteger */ - @JsonProperty("map_integer") @Schema(name = "map_integer", required = false) + @JsonProperty("map_integer") public Map getMapInteger() { return mapInteger; } @@ -156,9 +156,9 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea * Get mapBoolean * @return mapBoolean */ - @JsonProperty("map_boolean") @Schema(name = "map_boolean", required = false) + @JsonProperty("map_boolean") public Map getMapBoolean() { return mapBoolean; } @@ -184,9 +184,9 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { return mapArrayInteger; } @@ -212,9 +212,9 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * Get mapArrayAnytype * @return mapArrayAnytype */ - @JsonProperty("map_array_anytype") @Valid @Schema(name = "map_array_anytype", required = false) + @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { return mapArrayAnytype; } @@ -240,9 +240,9 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { return mapMapString; } @@ -268,9 +268,9 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { return mapMapAnytype; } @@ -288,9 +288,9 @@ public AdditionalPropertiesClass anytype1(Object anytype1) { * Get anytype1 * @return anytype1 */ - @JsonProperty("anytype_1") @Schema(name = "anytype_1", required = false) + @JsonProperty("anytype_1") public Object getAnytype1() { return anytype1; } @@ -308,9 +308,9 @@ public AdditionalPropertiesClass anytype2(Object anytype2) { * Get anytype2 * @return anytype2 */ - @JsonProperty("anytype_2") @Schema(name = "anytype_2", required = false) + @JsonProperty("anytype_2") public Object getAnytype2() { return anytype2; } @@ -328,9 +328,9 @@ public AdditionalPropertiesClass anytype3(Object anytype3) { * Get anytype3 * @return anytype3 */ - @JsonProperty("anytype_3") @Schema(name = "anytype_3", required = false) + @JsonProperty("anytype_3") public Object getAnytype3() { return anytype3; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index d4fe82193e30..5f8b17f159fd 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -34,9 +34,9 @@ public AdditionalPropertiesInteger name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 11f9dda21f3f..a02c1a6284ec 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -35,9 +35,9 @@ public AdditionalPropertiesNumber name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index ce4f9f1ff862..b3c54932d1a6 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -34,9 +34,9 @@ public AdditionalPropertiesObject name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 2669a2e08d51..50ebbaf82d5a 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -34,9 +34,9 @@ public AdditionalPropertiesString name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } 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 50eb6fe3c62b..f045573f0903 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 @@ -51,9 +51,9 @@ public Animal className(String className) { * Get className * @return className */ - @JsonProperty("className") @NotNull @Schema(name = "className", required = true) + @JsonProperty("className") public String getClassName() { return className; } @@ -71,9 +71,9 @@ public Animal color(String color) { * Get color * @return color */ - @JsonProperty("color") @Schema(name = "color", required = false) + @JsonProperty("color") public String getColor() { return color; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 99f5ef3aa439..ed60f2697f52 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -44,9 +44,9 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * Get arrayArrayNumber * @return arrayArrayNumber */ - @JsonProperty("ArrayArrayNumber") @Valid @Schema(name = "ArrayArrayNumber", required = false) + @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 563d0dc0f933..8e2d978eb5b9 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -44,9 +44,9 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ - @JsonProperty("ArrayNumber") @Valid @Schema(name = "ArrayNumber", required = false) + @JsonProperty("ArrayNumber") public List getArrayNumber() { return arrayNumber; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayTest.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayTest.java index 839cf3ac40ab..576f202a0210 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayTest.java @@ -50,9 +50,9 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) { * Get arrayOfString * @return arrayOfString */ - @JsonProperty("array_of_string") @Schema(name = "array_of_string", required = false) + @JsonProperty("array_of_string") public List getArrayOfString() { return arrayOfString; } @@ -78,9 +78,9 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ - @JsonProperty("array_array_of_integer") @Valid @Schema(name = "array_array_of_integer", required = false) + @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; } @@ -106,9 +106,9 @@ public ArrayTest addArrayArrayOfModelItem(List arrayArrayOfModelI * Get arrayArrayOfModel * @return arrayArrayOfModel */ - @JsonProperty("array_array_of_model") @Valid @Schema(name = "array_array_of_model", required = false) + @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { return arrayArrayOfModel; } 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 e0b22753e9e8..2dd10a30ea9a 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 @@ -77,9 +77,9 @@ public BigCat kind(KindEnum kind) { * Get kind * @return kind */ - @JsonProperty("kind") @Schema(name = "kind", required = false) + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/BigCatAllOf.java index 3b0788b0b304..a29d08eadf7f 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/BigCatAllOf.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/BigCatAllOf.java @@ -74,9 +74,9 @@ public BigCatAllOf kind(KindEnum kind) { * Get kind * @return kind */ - @JsonProperty("kind") @Schema(name = "kind", required = false) + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Capitalization.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Capitalization.java index 7270c14a949f..e6c6b39b3e8d 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Capitalization.java @@ -42,9 +42,9 @@ public Capitalization smallCamel(String smallCamel) { * Get smallCamel * @return smallCamel */ - @JsonProperty("smallCamel") @Schema(name = "smallCamel", required = false) + @JsonProperty("smallCamel") public String getSmallCamel() { return smallCamel; } @@ -62,9 +62,9 @@ public Capitalization capitalCamel(String capitalCamel) { * Get capitalCamel * @return capitalCamel */ - @JsonProperty("CapitalCamel") @Schema(name = "CapitalCamel", required = false) + @JsonProperty("CapitalCamel") public String getCapitalCamel() { return capitalCamel; } @@ -82,9 +82,9 @@ public Capitalization smallSnake(String smallSnake) { * Get smallSnake * @return smallSnake */ - @JsonProperty("small_Snake") @Schema(name = "small_Snake", required = false) + @JsonProperty("small_Snake") public String getSmallSnake() { return smallSnake; } @@ -102,9 +102,9 @@ public Capitalization capitalSnake(String capitalSnake) { * Get capitalSnake * @return capitalSnake */ - @JsonProperty("Capital_Snake") @Schema(name = "Capital_Snake", required = false) + @JsonProperty("Capital_Snake") public String getCapitalSnake() { return capitalSnake; } @@ -122,9 +122,9 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) { * Get scAETHFlowPoints * @return scAETHFlowPoints */ - @JsonProperty("SCA_ETH_Flow_Points") @Schema(name = "SCA_ETH_Flow_Points", required = false) + @JsonProperty("SCA_ETH_Flow_Points") public String getScAETHFlowPoints() { return scAETHFlowPoints; } @@ -142,9 +142,9 @@ public Capitalization ATT_NAME(String ATT_NAME) { * Name of the pet * @return ATT_NAME */ - @JsonProperty("ATT_NAME") @Schema(name = "ATT_NAME", description = "Name of the pet ", required = false) + @JsonProperty("ATT_NAME") public String getATTNAME() { return ATT_NAME; } 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 d1bb205b11b3..6a5ec912b5b5 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 @@ -46,9 +46,9 @@ public Cat declawed(Boolean declawed) { * Get declawed * @return declawed */ - @JsonProperty("declawed") @Schema(name = "declawed", required = false) + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/CatAllOf.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/CatAllOf.java index b7a7ed5def6a..0647507cd05e 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/CatAllOf.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/CatAllOf.java @@ -34,9 +34,9 @@ public CatAllOf declawed(Boolean declawed) { * Get declawed * @return declawed */ - @JsonProperty("declawed") @Schema(name = "declawed", required = false) + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } 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 9b1acc5a5c07..4d6450b7b2af 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 @@ -34,9 +34,9 @@ public Category id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -54,9 +54,9 @@ public Category name(String name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @Schema(name = "name", required = true) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ClassModel.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ClassModel.java index 20f5e2de16dd..4c5aac3991ab 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ClassModel.java @@ -33,9 +33,9 @@ public ClassModel propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ - @JsonProperty("_class") @Schema(name = "_class", required = false) + @JsonProperty("_class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Client.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Client.java index 11ed7ead459c..98e9244f3922 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Client.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Client.java @@ -32,9 +32,9 @@ public Client client(String client) { * Get client * @return client */ - @JsonProperty("client") @Schema(name = "client", required = false) + @JsonProperty("client") public String getClient() { return client; } 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 b0f901978716..63ff356bf3f5 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 @@ -37,9 +37,9 @@ public Dog breed(String breed) { * Get breed * @return breed */ - @JsonProperty("breed") @Schema(name = "breed", required = false) + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/DogAllOf.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/DogAllOf.java index 097dc159ee65..be10fcc8175e 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/DogAllOf.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/DogAllOf.java @@ -34,9 +34,9 @@ public DogAllOf breed(String breed) { * Get breed * @return breed */ - @JsonProperty("breed") @Schema(name = "breed", required = false) + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumArrays.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumArrays.java index cb84a65b9e1c..fb2769e537ca 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumArrays.java @@ -108,9 +108,9 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) { * Get justSymbol * @return justSymbol */ - @JsonProperty("just_symbol") @Schema(name = "just_symbol", required = false) + @JsonProperty("just_symbol") public JustSymbolEnum getJustSymbol() { return justSymbol; } @@ -136,9 +136,9 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) { * Get arrayEnum * @return arrayEnum */ - @JsonProperty("array_enum") @Schema(name = "array_enum", required = false) + @JsonProperty("array_enum") public List getArrayEnum() { return arrayEnum; } 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 2243d0fb1b8b..8e6d9e9fb8d1 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 @@ -188,9 +188,9 @@ public EnumTest enumString(EnumStringEnum enumString) { * Get enumString * @return enumString */ - @JsonProperty("enum_string") @Schema(name = "enum_string", required = false) + @JsonProperty("enum_string") public EnumStringEnum getEnumString() { return enumString; } @@ -208,9 +208,9 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) { * Get enumStringRequired * @return enumStringRequired */ - @JsonProperty("enum_string_required") @NotNull @Schema(name = "enum_string_required", required = true) + @JsonProperty("enum_string_required") public EnumStringRequiredEnum getEnumStringRequired() { return enumStringRequired; } @@ -228,9 +228,9 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) { * Get enumInteger * @return enumInteger */ - @JsonProperty("enum_integer") @Schema(name = "enum_integer", required = false) + @JsonProperty("enum_integer") public EnumIntegerEnum getEnumInteger() { return enumInteger; } @@ -248,9 +248,9 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) { * Get enumNumber * @return enumNumber */ - @JsonProperty("enum_number") @Schema(name = "enum_number", required = false) + @JsonProperty("enum_number") public EnumNumberEnum getEnumNumber() { return enumNumber; } @@ -268,9 +268,9 @@ public EnumTest outerEnum(OuterEnum outerEnum) { * Get outerEnum * @return outerEnum */ - @JsonProperty("outerEnum") @Valid @Schema(name = "outerEnum", required = false) + @JsonProperty("outerEnum") public OuterEnum getOuterEnum() { return outerEnum; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/File.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/File.java index 7d0f08137a62..dbdc0c147803 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/File.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/File.java @@ -33,9 +33,9 @@ public File sourceURI(String sourceURI) { * Test capitalization * @return sourceURI */ - @JsonProperty("sourceURI") @Schema(name = "sourceURI", description = "Test capitalization", required = false) + @JsonProperty("sourceURI") public String getSourceURI() { return sourceURI; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 50df4bf463a8..e4378be9ee0f 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -38,9 +38,9 @@ public FileSchemaTestClass file(File file) { * Get file * @return file */ - @JsonProperty("file") @Valid @Schema(name = "file", required = false) + @JsonProperty("file") public File getFile() { return file; } @@ -66,9 +66,9 @@ public FileSchemaTestClass addFilesItem(File filesItem) { * Get files * @return files */ - @JsonProperty("files") @Valid @Schema(name = "files", required = false) + @JsonProperty("files") public List getFiles() { return files; } 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 c9ae6ace8274..1bf83a5a5091 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 @@ -70,9 +70,9 @@ public FormatTest integer(Integer integer) { * maximum: 100 * @return integer */ - @JsonProperty("integer") @Min(10) @Max(100) @Schema(name = "integer", required = false) + @JsonProperty("integer") public Integer getInteger() { return integer; } @@ -92,9 +92,9 @@ public FormatTest int32(Integer int32) { * maximum: 200 * @return int32 */ - @JsonProperty("int32") @Min(20) @Max(200) @Schema(name = "int32", required = false) + @JsonProperty("int32") public Integer getInt32() { return int32; } @@ -112,9 +112,9 @@ public FormatTest int64(Long int64) { * Get int64 * @return int64 */ - @JsonProperty("int64") @Schema(name = "int64", required = false) + @JsonProperty("int64") public Long getInt64() { return int64; } @@ -134,9 +134,9 @@ public FormatTest number(BigDecimal number) { * maximum: 543.2 * @return number */ - @JsonProperty("number") @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") @Schema(name = "number", required = true) + @JsonProperty("number") public BigDecimal getNumber() { return number; } @@ -156,9 +156,9 @@ public FormatTest _float(Float _float) { * maximum: 987.6 * @return _float */ - @JsonProperty("float") @DecimalMin("54.3") @DecimalMax("987.6") @Schema(name = "float", required = false) + @JsonProperty("float") public Float getFloat() { return _float; } @@ -178,9 +178,9 @@ public FormatTest _double(Double _double) { * maximum: 123.4 * @return _double */ - @JsonProperty("double") @DecimalMin("67.8") @DecimalMax("123.4") @Schema(name = "double", required = false) + @JsonProperty("double") public Double getDouble() { return _double; } @@ -198,9 +198,9 @@ public FormatTest string(String string) { * Get string * @return string */ - @JsonProperty("string") @Pattern(regexp = "/[a-z]/i") @Schema(name = "string", required = false) + @JsonProperty("string") public String getString() { return string; } @@ -218,9 +218,9 @@ public FormatTest _byte(byte[] _byte) { * Get _byte * @return _byte */ - @JsonProperty("byte") @NotNull @Schema(name = "byte", required = true) + @JsonProperty("byte") public byte[] getByte() { return _byte; } @@ -238,9 +238,9 @@ public FormatTest binary(org.springframework.core.io.Resource binary) { * Get binary * @return binary */ - @JsonProperty("binary") @Valid @Schema(name = "binary", required = false) + @JsonProperty("binary") public org.springframework.core.io.Resource getBinary() { return binary; } @@ -258,9 +258,9 @@ public FormatTest date(LocalDate date) { * Get date * @return date */ - @JsonProperty("date") @NotNull @Valid @Schema(name = "date", required = true) + @JsonProperty("date") public LocalDate getDate() { return date; } @@ -278,9 +278,9 @@ public FormatTest dateTime(OffsetDateTime dateTime) { * Get dateTime * @return dateTime */ - @JsonProperty("dateTime") @Valid @Schema(name = "dateTime", required = false) + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -298,9 +298,9 @@ public FormatTest uuid(UUID uuid) { * Get uuid * @return uuid */ - @JsonProperty("uuid") @Valid @Schema(name = "uuid", example = "72f98069-206d-4f12-9f12-3d1e525a8e84", required = false) + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -318,9 +318,9 @@ public FormatTest password(String password) { * Get password * @return password */ - @JsonProperty("password") @NotNull @Size(min = 10, max = 64) @Schema(name = "password", required = true) + @JsonProperty("password") public String getPassword() { return password; } @@ -338,9 +338,9 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) { * Get bigDecimal * @return bigDecimal */ - @JsonProperty("BigDecimal") @Valid @Schema(name = "BigDecimal", required = false) + @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { return bigDecimal; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index aa8c3ee2514a..0a04cd2d070c 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -36,9 +36,9 @@ public HasOnlyReadOnly bar(String bar) { * Get bar * @return bar */ - @JsonProperty("bar") @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, required = false) + @JsonProperty("bar") public String getBar() { return bar; } @@ -56,9 +56,9 @@ public HasOnlyReadOnly foo(String foo) { * Get foo * @return foo */ - @JsonProperty("foo") @Schema(name = "foo", accessMode = Schema.AccessMode.READ_ONLY, required = false) + @JsonProperty("foo") public String getFoo() { return foo; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MapTest.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MapTest.java index 594021c36d2d..4cfeaeb6c63d 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MapTest.java @@ -88,9 +88,9 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapMapOfString * @return mapMapOfString */ - @JsonProperty("map_map_of_string") @Valid @Schema(name = "map_map_of_string", required = false) + @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { return mapMapOfString; } @@ -116,9 +116,9 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) * Get mapOfEnumString * @return mapOfEnumString */ - @JsonProperty("map_of_enum_string") @Schema(name = "map_of_enum_string", required = false) + @JsonProperty("map_of_enum_string") public Map getMapOfEnumString() { return mapOfEnumString; } @@ -144,9 +144,9 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) { * Get directMap * @return directMap */ - @JsonProperty("direct_map") @Schema(name = "direct_map", required = false) + @JsonProperty("direct_map") public Map getDirectMap() { return directMap; } @@ -172,9 +172,9 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) { * Get indirectMap * @return indirectMap */ - @JsonProperty("indirect_map") @Schema(name = "indirect_map", required = false) + @JsonProperty("indirect_map") public Map getIndirectMap() { return indirectMap; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index af4644ee1fd8..12e8bd36800c 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -44,9 +44,9 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { * Get uuid * @return uuid */ - @JsonProperty("uuid") @Valid @Schema(name = "uuid", required = false) + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -64,9 +64,9 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT * Get dateTime * @return dateTime */ - @JsonProperty("dateTime") @Valid @Schema(name = "dateTime", required = false) + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -92,9 +92,9 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * Get map * @return map */ - @JsonProperty("map") @Valid @Schema(name = "map", required = false) + @JsonProperty("map") public Map getMap() { return map; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Model200Response.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Model200Response.java index 329840fd1cd5..08bb506f2bd3 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Model200Response.java @@ -37,9 +37,9 @@ public Model200Response name(Integer name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public Integer getName() { return name; } @@ -57,9 +57,9 @@ public Model200Response propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ - @JsonProperty("class") @Schema(name = "class", required = false) + @JsonProperty("class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelApiResponse.java index 14ea90b13917..4851d6074c2f 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -38,9 +38,9 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ - @JsonProperty("code") @Schema(name = "code", required = false) + @JsonProperty("code") public Integer getCode() { return code; } @@ -58,9 +58,9 @@ public ModelApiResponse type(String type) { * Get type * @return type */ - @JsonProperty("type") @Schema(name = "type", required = false) + @JsonProperty("type") public String getType() { return type; } @@ -78,9 +78,9 @@ public ModelApiResponse message(String message) { * Get message * @return message */ - @JsonProperty("message") @Schema(name = "message", required = false) + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelList.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelList.java index 1e0bcffc220c..cf953ee17e25 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelList.java @@ -34,9 +34,9 @@ public ModelList _123list(String _123list) { * Get _123list * @return _123list */ - @JsonProperty("123-list") @Schema(name = "123-list", required = false) + @JsonProperty("123-list") public String get123list() { return _123list; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelReturn.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelReturn.java index 90b17a6d6850..d863cf8d63fe 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelReturn.java @@ -35,9 +35,9 @@ public ModelReturn _return(Integer _return) { * Get _return * @return _return */ - @JsonProperty("return") @Schema(name = "return", required = false) + @JsonProperty("return") public Integer getReturn() { return _return; } 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 bcbb5aab0f79..ad984399e918 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 @@ -39,9 +39,9 @@ public Name name(Integer name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @Schema(name = "name", required = true) + @JsonProperty("name") public Integer getName() { return name; } @@ -59,9 +59,9 @@ public Name snakeCase(Integer snakeCase) { * Get snakeCase * @return snakeCase */ - @JsonProperty("snake_case") @Schema(name = "snake_case", accessMode = Schema.AccessMode.READ_ONLY, required = false) + @JsonProperty("snake_case") public Integer getSnakeCase() { return snakeCase; } @@ -79,9 +79,9 @@ public Name property(String property) { * Get property * @return property */ - @JsonProperty("property") @Schema(name = "property", required = false) + @JsonProperty("property") public String getProperty() { return property; } @@ -99,9 +99,9 @@ public Name _123number(Integer _123number) { * Get _123number * @return _123number */ - @JsonProperty("123Number") @Schema(name = "123Number", accessMode = Schema.AccessMode.READ_ONLY, required = false) + @JsonProperty("123Number") public Integer get123number() { return _123number; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/NumberOnly.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/NumberOnly.java index a597943a3ef7..23b2cdff8675 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/NumberOnly.java @@ -33,9 +33,9 @@ public NumberOnly justNumber(BigDecimal justNumber) { * Get justNumber * @return justNumber */ - @JsonProperty("JustNumber") @Valid @Schema(name = "JustNumber", required = false) + @JsonProperty("JustNumber") public BigDecimal getJustNumber() { return justNumber; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Order.java index 10e257004cf9..0167b80e837c 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Order.java @@ -83,9 +83,9 @@ public Order id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -103,9 +103,9 @@ public Order petId(Long petId) { * Get petId * @return petId */ - @JsonProperty("petId") @Schema(name = "petId", required = false) + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -123,9 +123,9 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ - @JsonProperty("quantity") @Schema(name = "quantity", required = false) + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -143,9 +143,9 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ - @JsonProperty("shipDate") @Valid @Schema(name = "shipDate", required = false) + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -163,9 +163,9 @@ public Order status(StatusEnum status) { * Order Status * @return status */ - @JsonProperty("status") @Schema(name = "status", description = "Order Status", required = false) + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -183,9 +183,9 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ - @JsonProperty("complete") @Schema(name = "complete", required = false) + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/OuterComposite.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/OuterComposite.java index da3403158231..4f01a0edad71 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/OuterComposite.java @@ -37,9 +37,9 @@ public OuterComposite myNumber(BigDecimal myNumber) { * Get myNumber * @return myNumber */ - @JsonProperty("my_number") @Valid @Schema(name = "my_number", required = false) + @JsonProperty("my_number") public BigDecimal getMyNumber() { return myNumber; } @@ -57,9 +57,9 @@ public OuterComposite myString(String myString) { * Get myString * @return myString */ - @JsonProperty("my_string") @Schema(name = "my_string", required = false) + @JsonProperty("my_string") public String getMyString() { return myString; } @@ -77,9 +77,9 @@ public OuterComposite myBoolean(Boolean myBoolean) { * Get myBoolean * @return myBoolean */ - @JsonProperty("my_boolean") @Schema(name = "my_boolean", required = false) + @JsonProperty("my_boolean") public Boolean getMyBoolean() { return myBoolean; } 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 edfea99a4441..27219d2daa74 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 @@ -89,9 +89,9 @@ public Pet id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -109,9 +109,9 @@ public Pet category(Category category) { * Get category * @return category */ - @JsonProperty("category") @Valid @Schema(name = "category", required = false) + @JsonProperty("category") public Category getCategory() { return category; } @@ -129,9 +129,9 @@ public Pet name(String name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @Schema(name = "name", example = "doggie", required = true) + @JsonProperty("name") public String getName() { return name; } @@ -154,9 +154,9 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ - @JsonProperty("photoUrls") @NotNull @Schema(name = "photoUrls", required = true) + @JsonProperty("photoUrls") public Set getPhotoUrls() { return photoUrls; } @@ -183,9 +183,9 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @JsonProperty("tags") @Valid @Schema(name = "tags", required = false) + @JsonProperty("tags") public List getTags() { return tags; } @@ -203,9 +203,9 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ - @JsonProperty("status") @Schema(name = "status", description = "pet status in the store", required = false) + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ReadOnlyFirst.java index 5bb864fdfdf9..78d279153054 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -34,9 +34,9 @@ public ReadOnlyFirst bar(String bar) { * Get bar * @return bar */ - @JsonProperty("bar") @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, required = false) + @JsonProperty("bar") public String getBar() { return bar; } @@ -54,9 +54,9 @@ public ReadOnlyFirst baz(String baz) { * Get baz * @return baz */ - @JsonProperty("baz") @Schema(name = "baz", required = false) + @JsonProperty("baz") public String getBaz() { return baz; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/SpecialModelName.java index d30f01ffd4ce..85284bda0ff2 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/SpecialModelName.java @@ -34,9 +34,9 @@ public class SpecialModelName { * Get $specialPropertyName * @return $specialPropertyName */ - @JsonProperty("$special[property.name]") @Schema(name = "$special[property.name]", required = false) + @JsonProperty("$special[property.name]") public Long get$SpecialPropertyName() { return $specialPropertyName; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Tag.java index 7e0f150664d9..fd2a0db14b5d 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Tag.java @@ -34,9 +34,9 @@ public Tag id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -54,9 +54,9 @@ public Tag name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } 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 151d7623b25f..230033993752 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 @@ -44,9 +44,9 @@ public TypeHolderDefault stringItem(String stringItem) { * Get stringItem * @return stringItem */ - @JsonProperty("string_item") @NotNull @Schema(name = "string_item", required = true) + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -64,9 +64,9 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ - @JsonProperty("number_item") @NotNull @Valid @Schema(name = "number_item", required = true) + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -84,9 +84,9 @@ public TypeHolderDefault integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ - @JsonProperty("integer_item") @NotNull @Schema(name = "integer_item", required = true) + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -104,9 +104,9 @@ public TypeHolderDefault boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ - @JsonProperty("bool_item") @NotNull @Schema(name = "bool_item", required = true) + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -129,9 +129,9 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ - @JsonProperty("array_item") @NotNull @Schema(name = "array_item", required = true) + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } 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 7239836800df..964c94fd5627 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 @@ -46,9 +46,9 @@ public TypeHolderExample stringItem(String stringItem) { * Get stringItem * @return stringItem */ - @JsonProperty("string_item") @NotNull @Schema(name = "string_item", example = "what", required = true) + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -66,9 +66,9 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ - @JsonProperty("number_item") @NotNull @Valid @Schema(name = "number_item", example = "1.234", required = true) + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -86,9 +86,9 @@ public TypeHolderExample floatItem(Float floatItem) { * Get floatItem * @return floatItem */ - @JsonProperty("float_item") @NotNull @Schema(name = "float_item", example = "1.234", required = true) + @JsonProperty("float_item") public Float getFloatItem() { return floatItem; } @@ -106,9 +106,9 @@ public TypeHolderExample integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ - @JsonProperty("integer_item") @NotNull @Schema(name = "integer_item", example = "-2", required = true) + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -126,9 +126,9 @@ public TypeHolderExample boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ - @JsonProperty("bool_item") @NotNull @Schema(name = "bool_item", example = "true", required = true) + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -151,9 +151,9 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ - @JsonProperty("array_item") @NotNull @Schema(name = "array_item", example = "[0, 1, 2, 3]", required = true) + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/User.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/User.java index eb52ac9bab84..68e52752bfbe 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/User.java @@ -46,9 +46,9 @@ public User id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -66,9 +66,9 @@ public User username(String username) { * Get username * @return username */ - @JsonProperty("username") @Schema(name = "username", required = false) + @JsonProperty("username") public String getUsername() { return username; } @@ -86,9 +86,9 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ - @JsonProperty("firstName") @Schema(name = "firstName", required = false) + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -106,9 +106,9 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ - @JsonProperty("lastName") @Schema(name = "lastName", required = false) + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -126,9 +126,9 @@ public User email(String email) { * Get email * @return email */ - @JsonProperty("email") @Schema(name = "email", required = false) + @JsonProperty("email") public String getEmail() { return email; } @@ -146,9 +146,9 @@ public User password(String password) { * Get password * @return password */ - @JsonProperty("password") @Schema(name = "password", required = false) + @JsonProperty("password") public String getPassword() { return password; } @@ -166,9 +166,9 @@ public User phone(String phone) { * Get phone * @return phone */ - @JsonProperty("phone") @Schema(name = "phone", required = false) + @JsonProperty("phone") public String getPhone() { return phone; } @@ -186,9 +186,9 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ - @JsonProperty("userStatus") @Schema(name = "userStatus", description = "User Status", required = false) + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/XmlItem.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/XmlItem.java index 4b287492cc75..19b62a5139ae 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/XmlItem.java @@ -100,9 +100,9 @@ public XmlItem attributeString(String attributeString) { * Get attributeString * @return attributeString */ - @JsonProperty("attribute_string") @Schema(name = "attribute_string", example = "string", required = false) + @JsonProperty("attribute_string") public String getAttributeString() { return attributeString; } @@ -120,9 +120,9 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) { * Get attributeNumber * @return attributeNumber */ - @JsonProperty("attribute_number") @Valid @Schema(name = "attribute_number", example = "1.234", required = false) + @JsonProperty("attribute_number") public BigDecimal getAttributeNumber() { return attributeNumber; } @@ -140,9 +140,9 @@ public XmlItem attributeInteger(Integer attributeInteger) { * Get attributeInteger * @return attributeInteger */ - @JsonProperty("attribute_integer") @Schema(name = "attribute_integer", example = "-2", required = false) + @JsonProperty("attribute_integer") public Integer getAttributeInteger() { return attributeInteger; } @@ -160,9 +160,9 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) { * Get attributeBoolean * @return attributeBoolean */ - @JsonProperty("attribute_boolean") @Schema(name = "attribute_boolean", example = "true", required = false) + @JsonProperty("attribute_boolean") public Boolean getAttributeBoolean() { return attributeBoolean; } @@ -188,9 +188,9 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) { * Get wrappedArray * @return wrappedArray */ - @JsonProperty("wrapped_array") @Schema(name = "wrapped_array", required = false) + @JsonProperty("wrapped_array") public List getWrappedArray() { return wrappedArray; } @@ -208,9 +208,9 @@ public XmlItem nameString(String nameString) { * Get nameString * @return nameString */ - @JsonProperty("name_string") @Schema(name = "name_string", example = "string", required = false) + @JsonProperty("name_string") public String getNameString() { return nameString; } @@ -228,9 +228,9 @@ public XmlItem nameNumber(BigDecimal nameNumber) { * Get nameNumber * @return nameNumber */ - @JsonProperty("name_number") @Valid @Schema(name = "name_number", example = "1.234", required = false) + @JsonProperty("name_number") public BigDecimal getNameNumber() { return nameNumber; } @@ -248,9 +248,9 @@ public XmlItem nameInteger(Integer nameInteger) { * Get nameInteger * @return nameInteger */ - @JsonProperty("name_integer") @Schema(name = "name_integer", example = "-2", required = false) + @JsonProperty("name_integer") public Integer getNameInteger() { return nameInteger; } @@ -268,9 +268,9 @@ public XmlItem nameBoolean(Boolean nameBoolean) { * Get nameBoolean * @return nameBoolean */ - @JsonProperty("name_boolean") @Schema(name = "name_boolean", example = "true", required = false) + @JsonProperty("name_boolean") public Boolean getNameBoolean() { return nameBoolean; } @@ -296,9 +296,9 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) { * Get nameArray * @return nameArray */ - @JsonProperty("name_array") @Schema(name = "name_array", required = false) + @JsonProperty("name_array") public List getNameArray() { return nameArray; } @@ -324,9 +324,9 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) { * Get nameWrappedArray * @return nameWrappedArray */ - @JsonProperty("name_wrapped_array") @Schema(name = "name_wrapped_array", required = false) + @JsonProperty("name_wrapped_array") public List getNameWrappedArray() { return nameWrappedArray; } @@ -344,9 +344,9 @@ public XmlItem prefixString(String prefixString) { * Get prefixString * @return prefixString */ - @JsonProperty("prefix_string") @Schema(name = "prefix_string", example = "string", required = false) + @JsonProperty("prefix_string") public String getPrefixString() { return prefixString; } @@ -364,9 +364,9 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) { * Get prefixNumber * @return prefixNumber */ - @JsonProperty("prefix_number") @Valid @Schema(name = "prefix_number", example = "1.234", required = false) + @JsonProperty("prefix_number") public BigDecimal getPrefixNumber() { return prefixNumber; } @@ -384,9 +384,9 @@ public XmlItem prefixInteger(Integer prefixInteger) { * Get prefixInteger * @return prefixInteger */ - @JsonProperty("prefix_integer") @Schema(name = "prefix_integer", example = "-2", required = false) + @JsonProperty("prefix_integer") public Integer getPrefixInteger() { return prefixInteger; } @@ -404,9 +404,9 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) { * Get prefixBoolean * @return prefixBoolean */ - @JsonProperty("prefix_boolean") @Schema(name = "prefix_boolean", example = "true", required = false) + @JsonProperty("prefix_boolean") public Boolean getPrefixBoolean() { return prefixBoolean; } @@ -432,9 +432,9 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) { * Get prefixArray * @return prefixArray */ - @JsonProperty("prefix_array") @Schema(name = "prefix_array", required = false) + @JsonProperty("prefix_array") public List getPrefixArray() { return prefixArray; } @@ -460,9 +460,9 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) { * Get prefixWrappedArray * @return prefixWrappedArray */ - @JsonProperty("prefix_wrapped_array") @Schema(name = "prefix_wrapped_array", required = false) + @JsonProperty("prefix_wrapped_array") public List getPrefixWrappedArray() { return prefixWrappedArray; } @@ -480,9 +480,9 @@ public XmlItem namespaceString(String namespaceString) { * Get namespaceString * @return namespaceString */ - @JsonProperty("namespace_string") @Schema(name = "namespace_string", example = "string", required = false) + @JsonProperty("namespace_string") public String getNamespaceString() { return namespaceString; } @@ -500,9 +500,9 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) { * Get namespaceNumber * @return namespaceNumber */ - @JsonProperty("namespace_number") @Valid @Schema(name = "namespace_number", example = "1.234", required = false) + @JsonProperty("namespace_number") public BigDecimal getNamespaceNumber() { return namespaceNumber; } @@ -520,9 +520,9 @@ public XmlItem namespaceInteger(Integer namespaceInteger) { * Get namespaceInteger * @return namespaceInteger */ - @JsonProperty("namespace_integer") @Schema(name = "namespace_integer", example = "-2", required = false) + @JsonProperty("namespace_integer") public Integer getNamespaceInteger() { return namespaceInteger; } @@ -540,9 +540,9 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) { * Get namespaceBoolean * @return namespaceBoolean */ - @JsonProperty("namespace_boolean") @Schema(name = "namespace_boolean", example = "true", required = false) + @JsonProperty("namespace_boolean") public Boolean getNamespaceBoolean() { return namespaceBoolean; } @@ -568,9 +568,9 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) { * Get namespaceArray * @return namespaceArray */ - @JsonProperty("namespace_array") @Schema(name = "namespace_array", required = false) + @JsonProperty("namespace_array") public List getNamespaceArray() { return namespaceArray; } @@ -596,9 +596,9 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) { * Get namespaceWrappedArray * @return namespaceWrappedArray */ - @JsonProperty("namespace_wrapped_array") @Schema(name = "namespace_wrapped_array", required = false) + @JsonProperty("namespace_wrapped_array") public List getNamespaceWrappedArray() { return namespaceWrappedArray; } @@ -616,9 +616,9 @@ public XmlItem prefixNsString(String prefixNsString) { * Get prefixNsString * @return prefixNsString */ - @JsonProperty("prefix_ns_string") @Schema(name = "prefix_ns_string", example = "string", required = false) + @JsonProperty("prefix_ns_string") public String getPrefixNsString() { return prefixNsString; } @@ -636,9 +636,9 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) { * Get prefixNsNumber * @return prefixNsNumber */ - @JsonProperty("prefix_ns_number") @Valid @Schema(name = "prefix_ns_number", example = "1.234", required = false) + @JsonProperty("prefix_ns_number") public BigDecimal getPrefixNsNumber() { return prefixNsNumber; } @@ -656,9 +656,9 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) { * Get prefixNsInteger * @return prefixNsInteger */ - @JsonProperty("prefix_ns_integer") @Schema(name = "prefix_ns_integer", example = "-2", required = false) + @JsonProperty("prefix_ns_integer") public Integer getPrefixNsInteger() { return prefixNsInteger; } @@ -676,9 +676,9 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) { * Get prefixNsBoolean * @return prefixNsBoolean */ - @JsonProperty("prefix_ns_boolean") @Schema(name = "prefix_ns_boolean", example = "true", required = false) + @JsonProperty("prefix_ns_boolean") public Boolean getPrefixNsBoolean() { return prefixNsBoolean; } @@ -704,9 +704,9 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) { * Get prefixNsArray * @return prefixNsArray */ - @JsonProperty("prefix_ns_array") @Schema(name = "prefix_ns_array", required = false) + @JsonProperty("prefix_ns_array") public List getPrefixNsArray() { return prefixNsArray; } @@ -732,9 +732,9 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) { * Get prefixNsWrappedArray * @return prefixNsWrappedArray */ - @JsonProperty("prefix_ns_wrapped_array") @Schema(name = "prefix_ns_wrapped_array", required = false) + @JsonProperty("prefix_ns_wrapped_array") public List getPrefixNsWrappedArray() { return prefixNsWrappedArray; } diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/.openapi-generator/VERSION b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/.openapi-generator/VERSION index d6b4ec4aa783..ed829dbcddec 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0-SNAPSHOT \ No newline at end of file +6.2.1-SNAPSHOT \ No newline at end of file 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 ea5537110469..302e425ce016 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java index 816e870e6b9d..454a99e71af0 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java index 6f51045b260e..bc108c48ee85 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Category.java index 63e2bb12a67c..7a8b202187b9 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Category.java @@ -35,9 +35,9 @@ public Category id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -55,9 +55,9 @@ public Category name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java index 5d93139025d0..030dba3f7776 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -39,9 +39,9 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ - @JsonProperty("code") @Schema(name = "code", required = false) + @JsonProperty("code") public Integer getCode() { return code; } @@ -59,9 +59,9 @@ public ModelApiResponse type(String type) { * Get type * @return type */ - @JsonProperty("type") @Schema(name = "type", required = false) + @JsonProperty("type") public String getType() { return type; } @@ -79,9 +79,9 @@ public ModelApiResponse message(String message) { * Get message * @return message */ - @JsonProperty("message") @Schema(name = "message", required = false) + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Order.java index 57e02c6a0658..dadc85ceab09 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Order.java @@ -84,9 +84,9 @@ public Order id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -104,9 +104,9 @@ public Order petId(Long petId) { * Get petId * @return petId */ - @JsonProperty("petId") @Schema(name = "petId", required = false) + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -124,9 +124,9 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ - @JsonProperty("quantity") @Schema(name = "quantity", required = false) + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -144,9 +144,9 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ - @JsonProperty("shipDate") @Valid @Schema(name = "shipDate", required = false) + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -164,9 +164,9 @@ public Order status(StatusEnum status) { * Order Status * @return status */ - @JsonProperty("status") @Schema(name = "status", description = "Order Status", required = false) + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -184,9 +184,9 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ - @JsonProperty("complete") @Schema(name = "complete", required = false) + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java index 935a9242ca57..1637c81b3c69 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java @@ -87,9 +87,9 @@ public Pet id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -107,9 +107,9 @@ public Pet category(Category category) { * Get category * @return category */ - @JsonProperty("category") @Valid @Schema(name = "category", required = false) + @JsonProperty("category") public Category getCategory() { return category; } @@ -127,9 +127,9 @@ public Pet name(String name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @Schema(name = "name", example = "doggie", required = true) + @JsonProperty("name") public String getName() { return name; } @@ -152,9 +152,9 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ - @JsonProperty("photoUrls") @NotNull @Schema(name = "photoUrls", required = true) + @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; } @@ -180,9 +180,9 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @JsonProperty("tags") @Valid @Schema(name = "tags", required = false) + @JsonProperty("tags") public List getTags() { return tags; } @@ -200,9 +200,9 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ - @JsonProperty("status") @Schema(name = "status", description = "pet status in the store", required = false) + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Tag.java index 657e04be1aae..2a7aa08f500e 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Tag.java @@ -35,9 +35,9 @@ public Tag id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -55,9 +55,9 @@ public Tag name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/User.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/User.java index c51537754aff..b05e507b3efd 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/User.java @@ -47,9 +47,9 @@ public User id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -67,9 +67,9 @@ public User username(String username) { * Get username * @return username */ - @JsonProperty("username") @Schema(name = "username", required = false) + @JsonProperty("username") public String getUsername() { return username; } @@ -87,9 +87,9 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ - @JsonProperty("firstName") @Schema(name = "firstName", required = false) + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -107,9 +107,9 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ - @JsonProperty("lastName") @Schema(name = "lastName", required = false) + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -127,9 +127,9 @@ public User email(String email) { * Get email * @return email */ - @JsonProperty("email") @Schema(name = "email", required = false) + @JsonProperty("email") public String getEmail() { return email; } @@ -147,9 +147,9 @@ public User password(String password) { * Get password * @return password */ - @JsonProperty("password") @Schema(name = "password", required = false) + @JsonProperty("password") public String getPassword() { return password; } @@ -167,9 +167,9 @@ public User phone(String phone) { * Get phone * @return phone */ - @JsonProperty("phone") @Schema(name = "phone", required = false) + @JsonProperty("phone") public String getPhone() { return phone; } @@ -187,9 +187,9 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ - @JsonProperty("userStatus") @Schema(name = "userStatus", description = "User Status", required = false) + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/openapi3/client/petstore/spring-cloud/.openapi-generator/VERSION b/samples/openapi3/client/petstore/spring-cloud/.openapi-generator/VERSION index d6b4ec4aa783..ed829dbcddec 100644 --- a/samples/openapi3/client/petstore/spring-cloud/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/spring-cloud/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0-SNAPSHOT \ No newline at end of file +6.2.1-SNAPSHOT \ No newline at end of file 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 649a08904c13..93218653c910 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java index c7ad76d69914..711517d2697b 100644 --- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java index 2c0455262138..b03cb69bdc15 100644 --- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java index 59ab132dc0b5..240aeebc1490 100644 --- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java @@ -35,9 +35,9 @@ public Category id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -55,9 +55,9 @@ public Category name(String name) { * Get name * @return name */ - @JsonProperty("name") @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java index 5d93139025d0..030dba3f7776 100644 --- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -39,9 +39,9 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ - @JsonProperty("code") @Schema(name = "code", required = false) + @JsonProperty("code") public Integer getCode() { return code; } @@ -59,9 +59,9 @@ public ModelApiResponse type(String type) { * Get type * @return type */ - @JsonProperty("type") @Schema(name = "type", required = false) + @JsonProperty("type") public String getType() { return type; } @@ -79,9 +79,9 @@ public ModelApiResponse message(String message) { * Get message * @return message */ - @JsonProperty("message") @Schema(name = "message", required = false) + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java index 57e02c6a0658..dadc85ceab09 100644 --- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java @@ -84,9 +84,9 @@ public Order id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -104,9 +104,9 @@ public Order petId(Long petId) { * Get petId * @return petId */ - @JsonProperty("petId") @Schema(name = "petId", required = false) + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -124,9 +124,9 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ - @JsonProperty("quantity") @Schema(name = "quantity", required = false) + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -144,9 +144,9 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ - @JsonProperty("shipDate") @Valid @Schema(name = "shipDate", required = false) + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -164,9 +164,9 @@ public Order status(StatusEnum status) { * Order Status * @return status */ - @JsonProperty("status") @Schema(name = "status", description = "Order Status", required = false) + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -184,9 +184,9 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ - @JsonProperty("complete") @Schema(name = "complete", required = false) + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java index 935a9242ca57..1637c81b3c69 100644 --- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java @@ -87,9 +87,9 @@ public Pet id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -107,9 +107,9 @@ public Pet category(Category category) { * Get category * @return category */ - @JsonProperty("category") @Valid @Schema(name = "category", required = false) + @JsonProperty("category") public Category getCategory() { return category; } @@ -127,9 +127,9 @@ public Pet name(String name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @Schema(name = "name", example = "doggie", required = true) + @JsonProperty("name") public String getName() { return name; } @@ -152,9 +152,9 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ - @JsonProperty("photoUrls") @NotNull @Schema(name = "photoUrls", required = true) + @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; } @@ -180,9 +180,9 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @JsonProperty("tags") @Valid @Schema(name = "tags", required = false) + @JsonProperty("tags") public List getTags() { return tags; } @@ -200,9 +200,9 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ - @JsonProperty("status") @Schema(name = "status", description = "pet status in the store", required = false) + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java index 657e04be1aae..2a7aa08f500e 100644 --- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java @@ -35,9 +35,9 @@ public Tag id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -55,9 +55,9 @@ public Tag name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java index c51537754aff..b05e507b3efd 100644 --- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java @@ -47,9 +47,9 @@ public User id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -67,9 +67,9 @@ public User username(String username) { * Get username * @return username */ - @JsonProperty("username") @Schema(name = "username", required = false) + @JsonProperty("username") public String getUsername() { return username; } @@ -87,9 +87,9 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ - @JsonProperty("firstName") @Schema(name = "firstName", required = false) + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -107,9 +107,9 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ - @JsonProperty("lastName") @Schema(name = "lastName", required = false) + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -127,9 +127,9 @@ public User email(String email) { * Get email * @return email */ - @JsonProperty("email") @Schema(name = "email", required = false) + @JsonProperty("email") public String getEmail() { return email; } @@ -147,9 +147,9 @@ public User password(String password) { * Get password * @return password */ - @JsonProperty("password") @Schema(name = "password", required = false) + @JsonProperty("password") public String getPassword() { return password; } @@ -167,9 +167,9 @@ public User phone(String phone) { * Get phone * @return phone */ - @JsonProperty("phone") @Schema(name = "phone", required = false) + @JsonProperty("phone") public String getPhone() { return phone; } @@ -187,9 +187,9 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ - @JsonProperty("userStatus") @Schema(name = "userStatus", description = "User Status", required = false) + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/.openapi-generator/VERSION b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/.openapi-generator/VERSION index d6b4ec4aa783..ed829dbcddec 100644 --- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0-SNAPSHOT \ No newline at end of file +6.2.1-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/PetApi.java index c74ca0c0a501..3f0e2e2fa5a5 100644 --- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/StoreApi.java index b58dbd9bafce..415522427d13 100644 --- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/UserApi.java index aecc9b4b1ab4..0112b65d413e 100644 --- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Category.java index 63e2bb12a67c..7a8b202187b9 100644 --- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Category.java @@ -35,9 +35,9 @@ public Category id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -55,9 +55,9 @@ public Category name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/ModelApiResponse.java index 5d93139025d0..030dba3f7776 100644 --- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -39,9 +39,9 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ - @JsonProperty("code") @Schema(name = "code", required = false) + @JsonProperty("code") public Integer getCode() { return code; } @@ -59,9 +59,9 @@ public ModelApiResponse type(String type) { * Get type * @return type */ - @JsonProperty("type") @Schema(name = "type", required = false) + @JsonProperty("type") public String getType() { return type; } @@ -79,9 +79,9 @@ public ModelApiResponse message(String message) { * Get message * @return message */ - @JsonProperty("message") @Schema(name = "message", required = false) + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Order.java index 57e02c6a0658..dadc85ceab09 100644 --- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Order.java @@ -84,9 +84,9 @@ public Order id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -104,9 +104,9 @@ public Order petId(Long petId) { * Get petId * @return petId */ - @JsonProperty("petId") @Schema(name = "petId", required = false) + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -124,9 +124,9 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ - @JsonProperty("quantity") @Schema(name = "quantity", required = false) + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -144,9 +144,9 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ - @JsonProperty("shipDate") @Valid @Schema(name = "shipDate", required = false) + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -164,9 +164,9 @@ public Order status(StatusEnum status) { * Order Status * @return status */ - @JsonProperty("status") @Schema(name = "status", description = "Order Status", required = false) + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -184,9 +184,9 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ - @JsonProperty("complete") @Schema(name = "complete", required = false) + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Pet.java index 935a9242ca57..1637c81b3c69 100644 --- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Pet.java @@ -87,9 +87,9 @@ public Pet id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -107,9 +107,9 @@ public Pet category(Category category) { * Get category * @return category */ - @JsonProperty("category") @Valid @Schema(name = "category", required = false) + @JsonProperty("category") public Category getCategory() { return category; } @@ -127,9 +127,9 @@ public Pet name(String name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @Schema(name = "name", example = "doggie", required = true) + @JsonProperty("name") public String getName() { return name; } @@ -152,9 +152,9 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ - @JsonProperty("photoUrls") @NotNull @Schema(name = "photoUrls", required = true) + @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; } @@ -180,9 +180,9 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @JsonProperty("tags") @Valid @Schema(name = "tags", required = false) + @JsonProperty("tags") public List getTags() { return tags; } @@ -200,9 +200,9 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ - @JsonProperty("status") @Schema(name = "status", description = "pet status in the store", required = false) + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Tag.java index 657e04be1aae..2a7aa08f500e 100644 --- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Tag.java @@ -35,9 +35,9 @@ public Tag id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -55,9 +55,9 @@ public Tag name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/User.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/User.java index c51537754aff..b05e507b3efd 100644 --- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/User.java @@ -47,9 +47,9 @@ public User id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -67,9 +67,9 @@ public User username(String username) { * Get username * @return username */ - @JsonProperty("username") @Schema(name = "username", required = false) + @JsonProperty("username") public String getUsername() { return username; } @@ -87,9 +87,9 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ - @JsonProperty("firstName") @Schema(name = "firstName", required = false) + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -107,9 +107,9 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ - @JsonProperty("lastName") @Schema(name = "lastName", required = false) + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -127,9 +127,9 @@ public User email(String email) { * Get email * @return email */ - @JsonProperty("email") @Schema(name = "email", required = false) + @JsonProperty("email") public String getEmail() { return email; } @@ -147,9 +147,9 @@ public User password(String password) { * Get password * @return password */ - @JsonProperty("password") @Schema(name = "password", required = false) + @JsonProperty("password") public String getPassword() { return password; } @@ -167,9 +167,9 @@ public User phone(String phone) { * Get phone * @return phone */ - @JsonProperty("phone") @Schema(name = "phone", required = false) + @JsonProperty("phone") public String getPhone() { return phone; } @@ -187,9 +187,9 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ - @JsonProperty("userStatus") @Schema(name = "userStatus", description = "User Status", required = false) + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/openapi3/client/petstore/spring-stubs/.openapi-generator/VERSION b/samples/openapi3/client/petstore/spring-stubs/.openapi-generator/VERSION index d6b4ec4aa783..ed829dbcddec 100644 --- a/samples/openapi3/client/petstore/spring-stubs/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/spring-stubs/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0-SNAPSHOT \ No newline at end of file +6.2.1-SNAPSHOT \ No newline at end of file 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 67c4a8d4dcd9..e5dfe4c2183b 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java index 765941e6ab2a..f46e16df6a63 100644 --- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java index 274d3b37f345..0d2f39b99a9c 100644 --- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Category.java index 63e2bb12a67c..7a8b202187b9 100644 --- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Category.java @@ -35,9 +35,9 @@ public Category id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -55,9 +55,9 @@ public Category name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/ModelApiResponse.java index 5d93139025d0..030dba3f7776 100644 --- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -39,9 +39,9 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ - @JsonProperty("code") @Schema(name = "code", required = false) + @JsonProperty("code") public Integer getCode() { return code; } @@ -59,9 +59,9 @@ public ModelApiResponse type(String type) { * Get type * @return type */ - @JsonProperty("type") @Schema(name = "type", required = false) + @JsonProperty("type") public String getType() { return type; } @@ -79,9 +79,9 @@ public ModelApiResponse message(String message) { * Get message * @return message */ - @JsonProperty("message") @Schema(name = "message", required = false) + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Order.java index 57e02c6a0658..dadc85ceab09 100644 --- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Order.java @@ -84,9 +84,9 @@ public Order id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -104,9 +104,9 @@ public Order petId(Long petId) { * Get petId * @return petId */ - @JsonProperty("petId") @Schema(name = "petId", required = false) + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -124,9 +124,9 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ - @JsonProperty("quantity") @Schema(name = "quantity", required = false) + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -144,9 +144,9 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ - @JsonProperty("shipDate") @Valid @Schema(name = "shipDate", required = false) + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -164,9 +164,9 @@ public Order status(StatusEnum status) { * Order Status * @return status */ - @JsonProperty("status") @Schema(name = "status", description = "Order Status", required = false) + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -184,9 +184,9 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ - @JsonProperty("complete") @Schema(name = "complete", required = false) + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java index 935a9242ca57..1637c81b3c69 100644 --- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java @@ -87,9 +87,9 @@ public Pet id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -107,9 +107,9 @@ public Pet category(Category category) { * Get category * @return category */ - @JsonProperty("category") @Valid @Schema(name = "category", required = false) + @JsonProperty("category") public Category getCategory() { return category; } @@ -127,9 +127,9 @@ public Pet name(String name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @Schema(name = "name", example = "doggie", required = true) + @JsonProperty("name") public String getName() { return name; } @@ -152,9 +152,9 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ - @JsonProperty("photoUrls") @NotNull @Schema(name = "photoUrls", required = true) + @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; } @@ -180,9 +180,9 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @JsonProperty("tags") @Valid @Schema(name = "tags", required = false) + @JsonProperty("tags") public List getTags() { return tags; } @@ -200,9 +200,9 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ - @JsonProperty("status") @Schema(name = "status", description = "pet status in the store", required = false) + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Tag.java index 657e04be1aae..2a7aa08f500e 100644 --- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Tag.java @@ -35,9 +35,9 @@ public Tag id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -55,9 +55,9 @@ public Tag name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/User.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/User.java index c51537754aff..b05e507b3efd 100644 --- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/User.java @@ -47,9 +47,9 @@ public User id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -67,9 +67,9 @@ public User username(String username) { * Get username * @return username */ - @JsonProperty("username") @Schema(name = "username", required = false) + @JsonProperty("username") public String getUsername() { return username; } @@ -87,9 +87,9 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ - @JsonProperty("firstName") @Schema(name = "firstName", required = false) + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -107,9 +107,9 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ - @JsonProperty("lastName") @Schema(name = "lastName", required = false) + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -127,9 +127,9 @@ public User email(String email) { * Get email * @return email */ - @JsonProperty("email") @Schema(name = "email", required = false) + @JsonProperty("email") public String getEmail() { return email; } @@ -147,9 +147,9 @@ public User password(String password) { * Get password * @return password */ - @JsonProperty("password") @Schema(name = "password", required = false) + @JsonProperty("password") public String getPassword() { return password; } @@ -167,9 +167,9 @@ public User phone(String phone) { * Get phone * @return phone */ - @JsonProperty("phone") @Schema(name = "phone", required = false) + @JsonProperty("phone") public String getPhone() { return phone; } @@ -187,9 +187,9 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ - @JsonProperty("userStatus") @Schema(name = "userStatus", description = "User Status", required = false) + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/.openapi-generator/VERSION b/samples/openapi3/server/petstore/spring-boot-oneof/.openapi-generator/VERSION index d6b4ec4aa783..ed829dbcddec 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/.openapi-generator/VERSION +++ b/samples/openapi3/server/petstore/spring-boot-oneof/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0-SNAPSHOT \ No newline at end of file +6.2.1-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/BarApi.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/BarApi.java index db8023afc889..91f7ce028e93 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/BarApi.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/BarApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/BarApiController.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/BarApiController.java index 7d23950718d3..4ff7051020f5 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/BarApiController.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/BarApiController.java @@ -29,7 +29,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.byRefOrValue.base-path:}") public class BarApiController implements BarApi { private final NativeWebRequest request; diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/FooApi.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/FooApi.java index 3a8c99e15abd..2102c7c12abf 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/FooApi.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/FooApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/FooApiController.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/FooApiController.java index ea240bf97a97..c5a099e7aedb 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/FooApiController.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/FooApiController.java @@ -29,7 +29,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.byRefOrValue.base-path:}") public class FooApiController implements FooApi { private final NativeWebRequest request; diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Addressable.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Addressable.java index eeff6ac5737d..656abe8a8582 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Addressable.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Addressable.java @@ -35,9 +35,9 @@ public Addressable href(String href) { * Hyperlink reference * @return href */ - @JsonProperty("href") @Schema(name = "href", description = "Hyperlink reference", required = false) + @JsonProperty("href") public String getHref() { return href; } @@ -55,9 +55,9 @@ public Addressable id(String id) { * unique identifier * @return id */ - @JsonProperty("id") @Schema(name = "id", description = "unique identifier", required = false) + @JsonProperty("id") public String getId() { return id; } diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Bar.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Bar.java index aecb640f8a9c..a7874d521d17 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Bar.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Bar.java @@ -44,9 +44,9 @@ public Bar id(String id) { * Get id * @return id */ - @JsonProperty("id") @NotNull @Schema(name = "id", required = true) + @JsonProperty("id") public String getId() { return id; } @@ -64,9 +64,9 @@ public Bar barPropA(String barPropA) { * Get barPropA * @return barPropA */ - @JsonProperty("barPropA") @Schema(name = "barPropA", required = false) + @JsonProperty("barPropA") public String getBarPropA() { return barPropA; } @@ -84,9 +84,9 @@ public Bar fooPropB(String fooPropB) { * Get fooPropB * @return fooPropB */ - @JsonProperty("fooPropB") @Schema(name = "fooPropB", required = false) + @JsonProperty("fooPropB") public String getFooPropB() { return fooPropB; } @@ -104,9 +104,9 @@ public Bar foo(FooRefOrValue foo) { * Get foo * @return foo */ - @JsonProperty("foo") @Valid @Schema(name = "foo", required = false) + @JsonProperty("foo") public FooRefOrValue getFoo() { return foo; } diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarCreate.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarCreate.java index 779ffc4c01cf..7ae9117476cb 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarCreate.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarCreate.java @@ -44,9 +44,9 @@ public BarCreate barPropA(String barPropA) { * Get barPropA * @return barPropA */ - @JsonProperty("barPropA") @Schema(name = "barPropA", required = false) + @JsonProperty("barPropA") public String getBarPropA() { return barPropA; } @@ -64,9 +64,9 @@ public BarCreate fooPropB(String fooPropB) { * Get fooPropB * @return fooPropB */ - @JsonProperty("fooPropB") @Schema(name = "fooPropB", required = false) + @JsonProperty("fooPropB") public String getFooPropB() { return fooPropB; } @@ -84,9 +84,9 @@ public BarCreate foo(FooRefOrValue foo) { * Get foo * @return foo */ - @JsonProperty("foo") @Valid @Schema(name = "foo", required = false) + @JsonProperty("foo") public FooRefOrValue getFoo() { return foo; } diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Entity.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Entity.java index 43903165f2e5..64d8e5a435b1 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Entity.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Entity.java @@ -63,9 +63,9 @@ public Entity href(String href) { * Hyperlink reference * @return href */ - @JsonProperty("href") @Schema(name = "href", description = "Hyperlink reference", required = false) + @JsonProperty("href") public String getHref() { return href; } @@ -83,9 +83,9 @@ public Entity id(String id) { * unique identifier * @return id */ - @JsonProperty("id") @Schema(name = "id", description = "unique identifier", required = false) + @JsonProperty("id") public String getId() { return id; } @@ -103,9 +103,9 @@ public Entity atSchemaLocation(String atSchemaLocation) { * A URI to a JSON-Schema file that defines additional attributes and relationships * @return atSchemaLocation */ - @JsonProperty("@schemaLocation") @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", required = false) + @JsonProperty("@schemaLocation") public String getAtSchemaLocation() { return atSchemaLocation; } @@ -123,9 +123,9 @@ public Entity atBaseType(String atBaseType) { * When sub-classing, this defines the super-class * @return atBaseType */ - @JsonProperty("@baseType") @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", required = false) + @JsonProperty("@baseType") public String getAtBaseType() { return atBaseType; } @@ -143,9 +143,9 @@ public Entity atType(String atType) { * When sub-classing, this defines the sub-class Extensible name * @return atType */ - @JsonProperty("@type") @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", required = true) + @JsonProperty("@type") public String getAtType() { return atType; } diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/EntityRef.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/EntityRef.java index 02b4f9eeadfc..5e11351a5cf0 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/EntityRef.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/EntityRef.java @@ -60,9 +60,9 @@ public EntityRef name(String name) { * Name of the related entity. * @return name */ - @JsonProperty("name") @Schema(name = "name", description = "Name of the related entity.", required = false) + @JsonProperty("name") public String getName() { return name; } @@ -80,9 +80,9 @@ public EntityRef atReferredType(String atReferredType) { * The actual type of the target instance when needed for disambiguation. * @return atReferredType */ - @JsonProperty("@referredType") @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", required = false) + @JsonProperty("@referredType") public String getAtReferredType() { return atReferredType; } @@ -100,9 +100,9 @@ public EntityRef href(String href) { * Hyperlink reference * @return href */ - @JsonProperty("href") @Schema(name = "href", description = "Hyperlink reference", required = false) + @JsonProperty("href") public String getHref() { return href; } @@ -120,9 +120,9 @@ public EntityRef id(String id) { * unique identifier * @return id */ - @JsonProperty("id") @Schema(name = "id", description = "unique identifier", required = false) + @JsonProperty("id") public String getId() { return id; } @@ -140,9 +140,9 @@ public EntityRef atSchemaLocation(String atSchemaLocation) { * A URI to a JSON-Schema file that defines additional attributes and relationships * @return atSchemaLocation */ - @JsonProperty("@schemaLocation") @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", required = false) + @JsonProperty("@schemaLocation") public String getAtSchemaLocation() { return atSchemaLocation; } @@ -160,9 +160,9 @@ public EntityRef atBaseType(String atBaseType) { * When sub-classing, this defines the super-class * @return atBaseType */ - @JsonProperty("@baseType") @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", required = false) + @JsonProperty("@baseType") public String getAtBaseType() { return atBaseType; } @@ -180,9 +180,9 @@ public EntityRef atType(String atType) { * When sub-classing, this defines the sub-class Extensible name * @return atType */ - @JsonProperty("@type") @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", required = true) + @JsonProperty("@type") public String getAtType() { return atType; } diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Extensible.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Extensible.java index 864f45502c88..ca87fca9a639 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Extensible.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Extensible.java @@ -36,9 +36,9 @@ public Extensible atSchemaLocation(String atSchemaLocation) { * A URI to a JSON-Schema file that defines additional attributes and relationships * @return atSchemaLocation */ - @JsonProperty("@schemaLocation") @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", required = false) + @JsonProperty("@schemaLocation") public String getAtSchemaLocation() { return atSchemaLocation; } @@ -56,9 +56,9 @@ public Extensible atBaseType(String atBaseType) { * When sub-classing, this defines the super-class * @return atBaseType */ - @JsonProperty("@baseType") @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", required = false) + @JsonProperty("@baseType") public String getAtBaseType() { return atBaseType; } @@ -76,9 +76,9 @@ public Extensible atType(String atType) { * When sub-classing, this defines the sub-class Extensible name * @return atType */ - @JsonProperty("@type") @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", required = true) + @JsonProperty("@type") public String getAtType() { return atType; } diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Foo.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Foo.java index 72ece922fb7a..aa0f62c5c44f 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Foo.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Foo.java @@ -39,9 +39,9 @@ public Foo fooPropA(String fooPropA) { * Get fooPropA * @return fooPropA */ - @JsonProperty("fooPropA") @Schema(name = "fooPropA", required = false) + @JsonProperty("fooPropA") public String getFooPropA() { return fooPropA; } @@ -59,9 +59,9 @@ public Foo fooPropB(String fooPropB) { * Get fooPropB * @return fooPropB */ - @JsonProperty("fooPropB") @Schema(name = "fooPropB", required = false) + @JsonProperty("fooPropB") public String getFooPropB() { return fooPropB; } diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/FooRef.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/FooRef.java index c4d9525ea4a7..8ab1a78c2c33 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/FooRef.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/FooRef.java @@ -37,9 +37,9 @@ public FooRef foorefPropA(String foorefPropA) { * Get foorefPropA * @return foorefPropA */ - @JsonProperty("foorefPropA") @Schema(name = "foorefPropA", required = false) + @JsonProperty("foorefPropA") public String getFoorefPropA() { return foorefPropA; } diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pasta.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pasta.java index 25a72bbf0d70..bbe980355736 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pasta.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pasta.java @@ -37,9 +37,9 @@ public Pasta vendor(String vendor) { * Get vendor * @return vendor */ - @JsonProperty("vendor") @Schema(name = "vendor", required = false) + @JsonProperty("vendor") public String getVendor() { return vendor; } diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pizza.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pizza.java index 018f882065c3..da8170d66045 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pizza.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pizza.java @@ -47,9 +47,9 @@ public Pizza pizzaSize(BigDecimal pizzaSize) { * Get pizzaSize * @return pizzaSize */ - @JsonProperty("pizzaSize") @Valid @Schema(name = "pizzaSize", required = false) + @JsonProperty("pizzaSize") public BigDecimal getPizzaSize() { return pizzaSize; } diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/PizzaSpeziale.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/PizzaSpeziale.java index 29b287cdd0ed..3c242e399c0b 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/PizzaSpeziale.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/PizzaSpeziale.java @@ -38,9 +38,9 @@ public PizzaSpeziale toppings(String toppings) { * Get toppings * @return toppings */ - @JsonProperty("toppings") @Schema(name = "toppings", required = false) + @JsonProperty("toppings") public String getToppings() { return toppings; } diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/.openapi-generator/VERSION b/samples/openapi3/server/petstore/spring-boot-springdoc/.openapi-generator/VERSION index d6b4ec4aa783..ed829dbcddec 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/.openapi-generator/VERSION +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0-SNAPSHOT \ No newline at end of file +6.2.1-SNAPSHOT \ No newline at end of file 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 469a5e322efe..7896258136fe 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/PetApiController.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/PetApiController.java index b8fa3720a211..7713fe93c419 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/PetApiController.java +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/PetApiController.java @@ -29,7 +29,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class PetApiController implements PetApi { private final NativeWebRequest request; diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/StoreApi.java index 6d2330a325ad..abcdd7143a47 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/StoreApiController.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/StoreApiController.java index 1292dc0b721d..f8c784ff3838 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/StoreApiController.java +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/StoreApiController.java @@ -29,7 +29,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class StoreApiController implements StoreApi { private final NativeWebRequest request; diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/UserApi.java index a82dfc1734e6..c3dbc04ca2b9 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/UserApiController.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/UserApiController.java index ca00184d2a56..894bf6db762e 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/UserApiController.java +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/UserApiController.java @@ -30,7 +30,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class UserApiController implements UserApi { private final NativeWebRequest request; diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Category.java index 59ab132dc0b5..240aeebc1490 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Category.java @@ -35,9 +35,9 @@ public Category id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -55,9 +55,9 @@ public Category name(String name) { * Get name * @return name */ - @JsonProperty("name") @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/ModelApiResponse.java index 5d93139025d0..030dba3f7776 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -39,9 +39,9 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ - @JsonProperty("code") @Schema(name = "code", required = false) + @JsonProperty("code") public Integer getCode() { return code; } @@ -59,9 +59,9 @@ public ModelApiResponse type(String type) { * Get type * @return type */ - @JsonProperty("type") @Schema(name = "type", required = false) + @JsonProperty("type") public String getType() { return type; } @@ -79,9 +79,9 @@ public ModelApiResponse message(String message) { * Get message * @return message */ - @JsonProperty("message") @Schema(name = "message", required = false) + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Order.java index 57e02c6a0658..dadc85ceab09 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Order.java @@ -84,9 +84,9 @@ public Order id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -104,9 +104,9 @@ public Order petId(Long petId) { * Get petId * @return petId */ - @JsonProperty("petId") @Schema(name = "petId", required = false) + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -124,9 +124,9 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ - @JsonProperty("quantity") @Schema(name = "quantity", required = false) + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -144,9 +144,9 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ - @JsonProperty("shipDate") @Valid @Schema(name = "shipDate", required = false) + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -164,9 +164,9 @@ public Order status(StatusEnum status) { * Order Status * @return status */ - @JsonProperty("status") @Schema(name = "status", description = "Order Status", required = false) + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -184,9 +184,9 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ - @JsonProperty("complete") @Schema(name = "complete", required = false) + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Pet.java index 935a9242ca57..1637c81b3c69 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Pet.java @@ -87,9 +87,9 @@ public Pet id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -107,9 +107,9 @@ public Pet category(Category category) { * Get category * @return category */ - @JsonProperty("category") @Valid @Schema(name = "category", required = false) + @JsonProperty("category") public Category getCategory() { return category; } @@ -127,9 +127,9 @@ public Pet name(String name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @Schema(name = "name", example = "doggie", required = true) + @JsonProperty("name") public String getName() { return name; } @@ -152,9 +152,9 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ - @JsonProperty("photoUrls") @NotNull @Schema(name = "photoUrls", required = true) + @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; } @@ -180,9 +180,9 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @JsonProperty("tags") @Valid @Schema(name = "tags", required = false) + @JsonProperty("tags") public List getTags() { return tags; } @@ -200,9 +200,9 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ - @JsonProperty("status") @Schema(name = "status", description = "pet status in the store", required = false) + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Tag.java index 657e04be1aae..2a7aa08f500e 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Tag.java @@ -35,9 +35,9 @@ public Tag id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -55,9 +55,9 @@ public Tag name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/User.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/User.java index c51537754aff..b05e507b3efd 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/User.java @@ -47,9 +47,9 @@ public User id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -67,9 +67,9 @@ public User username(String username) { * Get username * @return username */ - @JsonProperty("username") @Schema(name = "username", required = false) + @JsonProperty("username") public String getUsername() { return username; } @@ -87,9 +87,9 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ - @JsonProperty("firstName") @Schema(name = "firstName", required = false) + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -107,9 +107,9 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ - @JsonProperty("lastName") @Schema(name = "lastName", required = false) + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -127,9 +127,9 @@ public User email(String email) { * Get email * @return email */ - @JsonProperty("email") @Schema(name = "email", required = false) + @JsonProperty("email") public String getEmail() { return email; } @@ -147,9 +147,9 @@ public User password(String password) { * Get password * @return password */ - @JsonProperty("password") @Schema(name = "password", required = false) + @JsonProperty("password") public String getPassword() { return password; } @@ -167,9 +167,9 @@ public User phone(String phone) { * Get phone * @return phone */ - @JsonProperty("phone") @Schema(name = "phone", required = false) + @JsonProperty("phone") public String getPhone() { return phone; } @@ -187,9 +187,9 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ - @JsonProperty("userStatus") @Schema(name = "userStatus", description = "User Status", required = false) + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/openapi3/server/petstore/springboot-3/.openapi-generator/VERSION b/samples/openapi3/server/petstore/springboot-3/.openapi-generator/VERSION index d6b4ec4aa783..ed829dbcddec 100644 --- a/samples/openapi3/server/petstore/springboot-3/.openapi-generator/VERSION +++ b/samples/openapi3/server/petstore/springboot-3/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0-SNAPSHOT \ No newline at end of file +6.2.1-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/PetApi.java index f1f70a9f8bf0..6e1f58b51260 100644 --- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/PetApiController.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/PetApiController.java index 119729502644..d12543b50f45 100644 --- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/PetApiController.java +++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/PetApiController.java @@ -29,7 +29,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class PetApiController implements PetApi { private final NativeWebRequest request; diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/StoreApi.java index d0eed779fd05..0cbf568b0fe1 100644 --- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/StoreApiController.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/StoreApiController.java index eaca23c3f81f..da7fe83d4489 100644 --- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/StoreApiController.java +++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/StoreApiController.java @@ -29,7 +29,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class StoreApiController implements StoreApi { private final NativeWebRequest request; diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/UserApi.java index d44b39e1354e..c03cdc2c42d0 100644 --- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/UserApiController.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/UserApiController.java index 412a400d7d02..a2e3c11d32fb 100644 --- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/UserApiController.java +++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/UserApiController.java @@ -30,7 +30,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class UserApiController implements UserApi { private final NativeWebRequest request; diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Category.java index 8facee0b4d00..9bf7008d0ca5 100644 --- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Category.java @@ -35,9 +35,9 @@ public Category id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -55,9 +55,9 @@ public Category name(String name) { * Get name * @return name */ - @JsonProperty("name") @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/ModelApiResponse.java index dc22eb8bad56..02b041f6c4f4 100644 --- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -39,9 +39,9 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ - @JsonProperty("code") @Schema(name = "code", required = false) + @JsonProperty("code") public Integer getCode() { return code; } @@ -59,9 +59,9 @@ public ModelApiResponse type(String type) { * Get type * @return type */ - @JsonProperty("type") @Schema(name = "type", required = false) + @JsonProperty("type") public String getType() { return type; } @@ -79,9 +79,9 @@ public ModelApiResponse message(String message) { * Get message * @return message */ - @JsonProperty("message") @Schema(name = "message", required = false) + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Order.java index 830de6970600..8aa3e2ba4fbb 100644 --- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Order.java @@ -84,9 +84,9 @@ public Order id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -104,9 +104,9 @@ public Order petId(Long petId) { * Get petId * @return petId */ - @JsonProperty("petId") @Schema(name = "petId", required = false) + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -124,9 +124,9 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ - @JsonProperty("quantity") @Schema(name = "quantity", required = false) + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -144,9 +144,9 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ - @JsonProperty("shipDate") @Valid @Schema(name = "shipDate", required = false) + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -164,9 +164,9 @@ public Order status(StatusEnum status) { * Order Status * @return status */ - @JsonProperty("status") @Schema(name = "status", description = "Order Status", required = false) + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -184,9 +184,9 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ - @JsonProperty("complete") @Schema(name = "complete", required = false) + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Pet.java index f63620ba65e4..ed46445ad84b 100644 --- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Pet.java @@ -87,9 +87,9 @@ public Pet id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -107,9 +107,9 @@ public Pet category(Category category) { * Get category * @return category */ - @JsonProperty("category") @Valid @Schema(name = "category", required = false) + @JsonProperty("category") public Category getCategory() { return category; } @@ -127,9 +127,9 @@ public Pet name(String name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @Schema(name = "name", example = "doggie", required = true) + @JsonProperty("name") public String getName() { return name; } @@ -152,9 +152,9 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ - @JsonProperty("photoUrls") @NotNull @Schema(name = "photoUrls", required = true) + @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; } @@ -180,9 +180,9 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @JsonProperty("tags") @Valid @Schema(name = "tags", required = false) + @JsonProperty("tags") public List getTags() { return tags; } @@ -200,9 +200,9 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ - @JsonProperty("status") @Schema(name = "status", description = "pet status in the store", required = false) + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Tag.java index f7c39632be46..90779dcb9b5f 100644 --- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Tag.java @@ -35,9 +35,9 @@ public Tag id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -55,9 +55,9 @@ public Tag name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/User.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/User.java index c9d25cf39f6e..13b23b8b8fa1 100644 --- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/User.java @@ -47,9 +47,9 @@ public User id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -67,9 +67,9 @@ public User username(String username) { * Get username * @return username */ - @JsonProperty("username") @Schema(name = "username", required = false) + @JsonProperty("username") public String getUsername() { return username; } @@ -87,9 +87,9 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ - @JsonProperty("firstName") @Schema(name = "firstName", required = false) + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -107,9 +107,9 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ - @JsonProperty("lastName") @Schema(name = "lastName", required = false) + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -127,9 +127,9 @@ public User email(String email) { * Get email * @return email */ - @JsonProperty("email") @Schema(name = "email", required = false) + @JsonProperty("email") public String getEmail() { return email; } @@ -147,9 +147,9 @@ public User password(String password) { * Get password * @return password */ - @JsonProperty("password") @Schema(name = "password", required = false) + @JsonProperty("password") public String getPassword() { return password; } @@ -167,9 +167,9 @@ public User phone(String phone) { * Get phone * @return phone */ - @JsonProperty("phone") @Schema(name = "phone", required = false) + @JsonProperty("phone") public String getPhone() { return phone; } @@ -187,9 +187,9 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ - @JsonProperty("userStatus") @Schema(name = "userStatus", description = "User Status", required = false) + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/FILES b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/FILES index 5d716a83385b..cf9ab80cce1d 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/FILES +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/FILES @@ -15,7 +15,6 @@ src/main/java/org/openapitools/api/StoreApi.java src/main/java/org/openapitools/api/StoreApiController.java src/main/java/org/openapitools/api/UserApi.java src/main/java/org/openapitools/api/UserApiController.java -src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/configuration/SpringDocConfiguration.java src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/VERSION b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/VERSION index d6b4ec4aa783..ed829dbcddec 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/VERSION +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0-SNAPSHOT \ No newline at end of file +6.2.1-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java index fba11ac08bb4..1e7e4c5a8f57 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApiController.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApiController.java index c2db7ca5a815..65c9de6908c2 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApiController.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApiController.java @@ -28,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class AnotherFakeApiController implements AnotherFakeApi { private final NativeWebRequest request; 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 8dcbbff9a021..5b7440a38ee1 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ 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 5ae5d5fed985..b30f53bb595c 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 @@ -38,7 +38,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeApiController implements FakeApi { private final NativeWebRequest request; diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 8d87477c2b16..c0a2a3ac70d2 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java index 65b695629d43..05196793d4c2 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java @@ -28,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeClassnameTestApiController implements FakeClassnameTestApi { private final NativeWebRequest request; 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 3542fcccb550..701459bc5c7f 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ 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 ea6c56e02c11..0b88e5980bf1 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 @@ -30,7 +30,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class PetApiController implements PetApi { private final NativeWebRequest request; diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java index 836aa2500f7f..4e91ff36d5c3 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApiController.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApiController.java index 1292dc0b721d..f8c784ff3838 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApiController.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApiController.java @@ -29,7 +29,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class StoreApiController implements StoreApi { private final NativeWebRequest request; diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java index 09484728d829..b0db1eddef46 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApiController.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApiController.java index ca00184d2a56..894bf6db762e 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApiController.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApiController.java @@ -30,7 +30,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class UserApiController implements UserApi { private final NativeWebRequest request; diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index d98f790f8e7a..df297f78614f 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -33,9 +33,9 @@ public AdditionalPropertiesAnyType name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 8a4933a449cd..b7e4f6d44846 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -34,9 +34,9 @@ public AdditionalPropertiesArray name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index b08b1c82a8f4..a295789e4f75 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -33,9 +33,9 @@ public AdditionalPropertiesBoolean name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index cb5977def8f8..a96d45b0f2a8 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -71,9 +71,9 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt * Get mapString * @return mapString */ - @JsonProperty("map_string") @Schema(name = "map_string", required = false) + @JsonProperty("map_string") public Map getMapString() { return mapString; } @@ -99,9 +99,9 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * Get mapNumber * @return mapNumber */ - @JsonProperty("map_number") @Valid @Schema(name = "map_number", required = false) + @JsonProperty("map_number") public Map getMapNumber() { return mapNumber; } @@ -127,9 +127,9 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege * Get mapInteger * @return mapInteger */ - @JsonProperty("map_integer") @Schema(name = "map_integer", required = false) + @JsonProperty("map_integer") public Map getMapInteger() { return mapInteger; } @@ -155,9 +155,9 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea * Get mapBoolean * @return mapBoolean */ - @JsonProperty("map_boolean") @Schema(name = "map_boolean", required = false) + @JsonProperty("map_boolean") public Map getMapBoolean() { return mapBoolean; } @@ -183,9 +183,9 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { return mapArrayInteger; } @@ -211,9 +211,9 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * Get mapArrayAnytype * @return mapArrayAnytype */ - @JsonProperty("map_array_anytype") @Valid @Schema(name = "map_array_anytype", required = false) + @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { return mapArrayAnytype; } @@ -239,9 +239,9 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { return mapMapString; } @@ -267,9 +267,9 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { return mapMapAnytype; } @@ -287,9 +287,9 @@ public AdditionalPropertiesClass anytype1(Object anytype1) { * Get anytype1 * @return anytype1 */ - @JsonProperty("anytype_1") @Schema(name = "anytype_1", required = false) + @JsonProperty("anytype_1") public Object getAnytype1() { return anytype1; } @@ -307,9 +307,9 @@ public AdditionalPropertiesClass anytype2(Object anytype2) { * Get anytype2 * @return anytype2 */ - @JsonProperty("anytype_2") @Schema(name = "anytype_2", required = false) + @JsonProperty("anytype_2") public Object getAnytype2() { return anytype2; } @@ -327,9 +327,9 @@ public AdditionalPropertiesClass anytype3(Object anytype3) { * Get anytype3 * @return anytype3 */ - @JsonProperty("anytype_3") @Schema(name = "anytype_3", required = false) + @JsonProperty("anytype_3") public Object getAnytype3() { return anytype3; } diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index c5a50399760c..3f64996c11fd 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -33,9 +33,9 @@ public AdditionalPropertiesInteger name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 8255dc689d86..8eb6ab991c6d 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -34,9 +34,9 @@ public AdditionalPropertiesNumber name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index e52b6eb1f8c1..751afc41be23 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -33,9 +33,9 @@ public AdditionalPropertiesObject name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index b78858e58848..dd23a19f8120 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -33,9 +33,9 @@ public AdditionalPropertiesString name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Animal.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Animal.java index 307dce327887..cbe6e5a7eedf 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Animal.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Animal.java @@ -50,9 +50,9 @@ public Animal className(String className) { * Get className * @return className */ - @JsonProperty("className") @NotNull @Schema(name = "className", required = true) + @JsonProperty("className") public String getClassName() { return className; } @@ -70,9 +70,9 @@ public Animal color(String color) { * Get color * @return color */ - @JsonProperty("color") @Schema(name = "color", required = false) + @JsonProperty("color") public String getColor() { return color; } diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 81caee1ed53e..1fcd6c2b371d 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -43,9 +43,9 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * Get arrayArrayNumber * @return arrayArrayNumber */ - @JsonProperty("ArrayArrayNumber") @Valid @Schema(name = "ArrayArrayNumber", required = false) + @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index b5dc5ebccaa7..2236c46a4d0e 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -43,9 +43,9 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ - @JsonProperty("ArrayNumber") @Valid @Schema(name = "ArrayNumber", required = false) + @JsonProperty("ArrayNumber") public List getArrayNumber() { return arrayNumber; } diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java index cfabb4860c9f..d95fb74cabc4 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java @@ -49,9 +49,9 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) { * Get arrayOfString * @return arrayOfString */ - @JsonProperty("array_of_string") @Schema(name = "array_of_string", required = false) + @JsonProperty("array_of_string") public List getArrayOfString() { return arrayOfString; } @@ -77,9 +77,9 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ - @JsonProperty("array_array_of_integer") @Valid @Schema(name = "array_array_of_integer", required = false) + @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; } @@ -105,9 +105,9 @@ public ArrayTest addArrayArrayOfModelItem(List arrayArrayOfModelI * Get arrayArrayOfModel * @return arrayArrayOfModel */ - @JsonProperty("array_array_of_model") @Valid @Schema(name = "array_array_of_model", required = false) + @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCat.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCat.java index 2d318f9cd96c..f3e8c5348016 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCat.java @@ -76,9 +76,9 @@ public BigCat kind(KindEnum kind) { * Get kind * @return kind */ - @JsonProperty("kind") @Schema(name = "kind", required = false) + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCatAllOf.java index eb48663fe94b..36520c7c1f90 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCatAllOf.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCatAllOf.java @@ -73,9 +73,9 @@ public BigCatAllOf kind(KindEnum kind) { * Get kind * @return kind */ - @JsonProperty("kind") @Schema(name = "kind", required = false) + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Capitalization.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Capitalization.java index 6f9473e40a2b..95967d808e82 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Capitalization.java @@ -41,9 +41,9 @@ public Capitalization smallCamel(String smallCamel) { * Get smallCamel * @return smallCamel */ - @JsonProperty("smallCamel") @Schema(name = "smallCamel", required = false) + @JsonProperty("smallCamel") public String getSmallCamel() { return smallCamel; } @@ -61,9 +61,9 @@ public Capitalization capitalCamel(String capitalCamel) { * Get capitalCamel * @return capitalCamel */ - @JsonProperty("CapitalCamel") @Schema(name = "CapitalCamel", required = false) + @JsonProperty("CapitalCamel") public String getCapitalCamel() { return capitalCamel; } @@ -81,9 +81,9 @@ public Capitalization smallSnake(String smallSnake) { * Get smallSnake * @return smallSnake */ - @JsonProperty("small_Snake") @Schema(name = "small_Snake", required = false) + @JsonProperty("small_Snake") public String getSmallSnake() { return smallSnake; } @@ -101,9 +101,9 @@ public Capitalization capitalSnake(String capitalSnake) { * Get capitalSnake * @return capitalSnake */ - @JsonProperty("Capital_Snake") @Schema(name = "Capital_Snake", required = false) + @JsonProperty("Capital_Snake") public String getCapitalSnake() { return capitalSnake; } @@ -121,9 +121,9 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) { * Get scAETHFlowPoints * @return scAETHFlowPoints */ - @JsonProperty("SCA_ETH_Flow_Points") @Schema(name = "SCA_ETH_Flow_Points", required = false) + @JsonProperty("SCA_ETH_Flow_Points") public String getScAETHFlowPoints() { return scAETHFlowPoints; } @@ -141,9 +141,9 @@ public Capitalization ATT_NAME(String ATT_NAME) { * Name of the pet * @return ATT_NAME */ - @JsonProperty("ATT_NAME") @Schema(name = "ATT_NAME", description = "Name of the pet ", required = false) + @JsonProperty("ATT_NAME") public String getATTNAME() { return ATT_NAME; } diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Cat.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Cat.java index ec352c818385..62732adbc0cf 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Cat.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Cat.java @@ -45,9 +45,9 @@ public Cat declawed(Boolean declawed) { * Get declawed * @return declawed */ - @JsonProperty("declawed") @Schema(name = "declawed", required = false) + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/CatAllOf.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/CatAllOf.java index d3b61ffddf8b..46e5b2699515 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/CatAllOf.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/CatAllOf.java @@ -33,9 +33,9 @@ public CatAllOf declawed(Boolean declawed) { * Get declawed * @return declawed */ - @JsonProperty("declawed") @Schema(name = "declawed", required = false) + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Category.java index b416593e36c2..5ed4fa7fc4b9 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Category.java @@ -33,9 +33,9 @@ public Category id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -53,9 +53,9 @@ public Category name(String name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @Schema(name = "name", required = true) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ClassModel.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ClassModel.java index 52214509be55..d912173a8efb 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ClassModel.java @@ -32,9 +32,9 @@ public ClassModel propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ - @JsonProperty("_class") @Schema(name = "_class", required = false) + @JsonProperty("_class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Client.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Client.java index 1524ed0a63e1..ff820503a310 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Client.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Client.java @@ -31,9 +31,9 @@ public Client client(String client) { * Get client * @return client */ - @JsonProperty("client") @Schema(name = "client", required = false) + @JsonProperty("client") public String getClient() { return client; } diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Dog.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Dog.java index c135023bfab0..c94b21ae8943 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Dog.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Dog.java @@ -36,9 +36,9 @@ public Dog breed(String breed) { * Get breed * @return breed */ - @JsonProperty("breed") @Schema(name = "breed", required = false) + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/DogAllOf.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/DogAllOf.java index 7a6de8b9f3e1..5c57e95ab627 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/DogAllOf.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/DogAllOf.java @@ -33,9 +33,9 @@ public DogAllOf breed(String breed) { * Get breed * @return breed */ - @JsonProperty("breed") @Schema(name = "breed", required = false) + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java index 2b00e454a455..b5562b48823e 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java @@ -107,9 +107,9 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) { * Get justSymbol * @return justSymbol */ - @JsonProperty("just_symbol") @Schema(name = "just_symbol", required = false) + @JsonProperty("just_symbol") public JustSymbolEnum getJustSymbol() { return justSymbol; } @@ -135,9 +135,9 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) { * Get arrayEnum * @return arrayEnum */ - @JsonProperty("array_enum") @Schema(name = "array_enum", required = false) + @JsonProperty("array_enum") public List getArrayEnum() { return arrayEnum; } diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumTest.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumTest.java index 62fdd4bb55af..ab2ce69232d8 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumTest.java @@ -187,9 +187,9 @@ public EnumTest enumString(EnumStringEnum enumString) { * Get enumString * @return enumString */ - @JsonProperty("enum_string") @Schema(name = "enum_string", required = false) + @JsonProperty("enum_string") public EnumStringEnum getEnumString() { return enumString; } @@ -207,9 +207,9 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) { * Get enumStringRequired * @return enumStringRequired */ - @JsonProperty("enum_string_required") @NotNull @Schema(name = "enum_string_required", required = true) + @JsonProperty("enum_string_required") public EnumStringRequiredEnum getEnumStringRequired() { return enumStringRequired; } @@ -227,9 +227,9 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) { * Get enumInteger * @return enumInteger */ - @JsonProperty("enum_integer") @Schema(name = "enum_integer", required = false) + @JsonProperty("enum_integer") public EnumIntegerEnum getEnumInteger() { return enumInteger; } @@ -247,9 +247,9 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) { * Get enumNumber * @return enumNumber */ - @JsonProperty("enum_number") @Schema(name = "enum_number", required = false) + @JsonProperty("enum_number") public EnumNumberEnum getEnumNumber() { return enumNumber; } @@ -267,9 +267,9 @@ public EnumTest outerEnum(OuterEnum outerEnum) { * Get outerEnum * @return outerEnum */ - @JsonProperty("outerEnum") @Valid @Schema(name = "outerEnum", required = false) + @JsonProperty("outerEnum") public OuterEnum getOuterEnum() { return outerEnum; } diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/File.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/File.java index 507dcfc9b84b..1e07c161316b 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/File.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/File.java @@ -32,9 +32,9 @@ public File sourceURI(String sourceURI) { * Test capitalization * @return sourceURI */ - @JsonProperty("sourceURI") @Schema(name = "sourceURI", description = "Test capitalization", required = false) + @JsonProperty("sourceURI") public String getSourceURI() { return sourceURI; } diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 62e902102b46..c1ba96bc589f 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -37,9 +37,9 @@ public FileSchemaTestClass file(File file) { * Get file * @return file */ - @JsonProperty("file") @Valid @Schema(name = "file", required = false) + @JsonProperty("file") public File getFile() { return file; } @@ -65,9 +65,9 @@ public FileSchemaTestClass addFilesItem(File filesItem) { * Get files * @return files */ - @JsonProperty("files") @Valid @Schema(name = "files", required = false) + @JsonProperty("files") public List getFiles() { return files; } 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 07b7912e924d..06d66408596f 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 @@ -69,9 +69,9 @@ public FormatTest integer(Integer integer) { * maximum: 100 * @return integer */ - @JsonProperty("integer") @Min(10) @Max(100) @Schema(name = "integer", required = false) + @JsonProperty("integer") public Integer getInteger() { return integer; } @@ -91,9 +91,9 @@ public FormatTest int32(Integer int32) { * maximum: 200 * @return int32 */ - @JsonProperty("int32") @Min(20) @Max(200) @Schema(name = "int32", required = false) + @JsonProperty("int32") public Integer getInt32() { return int32; } @@ -111,9 +111,9 @@ public FormatTest int64(Long int64) { * Get int64 * @return int64 */ - @JsonProperty("int64") @Schema(name = "int64", required = false) + @JsonProperty("int64") public Long getInt64() { return int64; } @@ -133,9 +133,9 @@ public FormatTest number(BigDecimal number) { * maximum: 543.2 * @return number */ - @JsonProperty("number") @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") @Schema(name = "number", required = true) + @JsonProperty("number") public BigDecimal getNumber() { return number; } @@ -155,9 +155,9 @@ public FormatTest _float(Float _float) { * maximum: 987.6 * @return _float */ - @JsonProperty("float") @DecimalMin("54.3") @DecimalMax("987.6") @Schema(name = "float", required = false) + @JsonProperty("float") public Float getFloat() { return _float; } @@ -177,9 +177,9 @@ public FormatTest _double(Double _double) { * maximum: 123.4 * @return _double */ - @JsonProperty("double") @DecimalMin("67.8") @DecimalMax("123.4") @Schema(name = "double", required = false) + @JsonProperty("double") public Double getDouble() { return _double; } @@ -197,9 +197,9 @@ public FormatTest string(String string) { * Get string * @return string */ - @JsonProperty("string") @Pattern(regexp = "/[a-z]/i") @Schema(name = "string", required = false) + @JsonProperty("string") public String getString() { return string; } @@ -217,9 +217,9 @@ public FormatTest _byte(byte[] _byte) { * Get _byte * @return _byte */ - @JsonProperty("byte") @NotNull @Schema(name = "byte", required = true) + @JsonProperty("byte") public byte[] getByte() { return _byte; } @@ -237,9 +237,9 @@ public FormatTest binary(org.springframework.core.io.Resource binary) { * Get binary * @return binary */ - @JsonProperty("binary") @Valid @Schema(name = "binary", required = false) + @JsonProperty("binary") public org.springframework.core.io.Resource getBinary() { return binary; } @@ -257,9 +257,9 @@ public FormatTest date(LocalDate date) { * Get date * @return date */ - @JsonProperty("date") @NotNull @Valid @Schema(name = "date", required = true) + @JsonProperty("date") public LocalDate getDate() { return date; } @@ -277,9 +277,9 @@ public FormatTest dateTime(OffsetDateTime dateTime) { * Get dateTime * @return dateTime */ - @JsonProperty("dateTime") @Valid @Schema(name = "dateTime", required = false) + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -297,9 +297,9 @@ public FormatTest uuid(UUID uuid) { * Get uuid * @return uuid */ - @JsonProperty("uuid") @Valid @Schema(name = "uuid", example = "72f98069-206d-4f12-9f12-3d1e525a8e84", required = false) + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -317,9 +317,9 @@ public FormatTest password(String password) { * Get password * @return password */ - @JsonProperty("password") @NotNull @Size(min = 10, max = 64) @Schema(name = "password", required = true) + @JsonProperty("password") public String getPassword() { return password; } @@ -337,9 +337,9 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) { * Get bigDecimal * @return bigDecimal */ - @JsonProperty("BigDecimal") @Valid @Schema(name = "BigDecimal", required = false) + @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { return bigDecimal; } diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index 29c0967eb0eb..3b8cd61eb3bd 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -35,9 +35,9 @@ public HasOnlyReadOnly bar(String bar) { * Get bar * @return bar */ - @JsonProperty("bar") @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, required = false) + @JsonProperty("bar") public String getBar() { return bar; } @@ -55,9 +55,9 @@ public HasOnlyReadOnly foo(String foo) { * Get foo * @return foo */ - @JsonProperty("foo") @Schema(name = "foo", accessMode = Schema.AccessMode.READ_ONLY, required = false) + @JsonProperty("foo") public String getFoo() { return foo; } diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MapTest.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MapTest.java index f3680e8cebb4..acfa996aba55 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MapTest.java @@ -87,9 +87,9 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapMapOfString * @return mapMapOfString */ - @JsonProperty("map_map_of_string") @Valid @Schema(name = "map_map_of_string", required = false) + @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { return mapMapOfString; } @@ -115,9 +115,9 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) * Get mapOfEnumString * @return mapOfEnumString */ - @JsonProperty("map_of_enum_string") @Schema(name = "map_of_enum_string", required = false) + @JsonProperty("map_of_enum_string") public Map getMapOfEnumString() { return mapOfEnumString; } @@ -143,9 +143,9 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) { * Get directMap * @return directMap */ - @JsonProperty("direct_map") @Schema(name = "direct_map", required = false) + @JsonProperty("direct_map") public Map getDirectMap() { return directMap; } @@ -171,9 +171,9 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) { * Get indirectMap * @return indirectMap */ - @JsonProperty("indirect_map") @Schema(name = "indirect_map", required = false) + @JsonProperty("indirect_map") public Map getIndirectMap() { return indirectMap; } diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 36d6aca6aaba..2d3eda8c12bc 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -43,9 +43,9 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { * Get uuid * @return uuid */ - @JsonProperty("uuid") @Valid @Schema(name = "uuid", required = false) + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -63,9 +63,9 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT * Get dateTime * @return dateTime */ - @JsonProperty("dateTime") @Valid @Schema(name = "dateTime", required = false) + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -91,9 +91,9 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * Get map * @return map */ - @JsonProperty("map") @Valid @Schema(name = "map", required = false) + @JsonProperty("map") public Map getMap() { return map; } diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Model200Response.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Model200Response.java index 36cfbfa76fb5..03a76e791af6 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Model200Response.java @@ -36,9 +36,9 @@ public Model200Response name(Integer name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public Integer getName() { return name; } @@ -56,9 +56,9 @@ public Model200Response propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ - @JsonProperty("class") @Schema(name = "class", required = false) + @JsonProperty("class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelApiResponse.java index 0d863472f3ad..a1592dc0db0b 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -37,9 +37,9 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ - @JsonProperty("code") @Schema(name = "code", required = false) + @JsonProperty("code") public Integer getCode() { return code; } @@ -57,9 +57,9 @@ public ModelApiResponse type(String type) { * Get type * @return type */ - @JsonProperty("type") @Schema(name = "type", required = false) + @JsonProperty("type") public String getType() { return type; } @@ -77,9 +77,9 @@ public ModelApiResponse message(String message) { * Get message * @return message */ - @JsonProperty("message") @Schema(name = "message", required = false) + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelList.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelList.java index 17034472a60f..9a2cdce672f0 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelList.java @@ -33,9 +33,9 @@ public ModelList _123list(String _123list) { * Get _123list * @return _123list */ - @JsonProperty("123-list") @Schema(name = "123-list", required = false) + @JsonProperty("123-list") public String get123list() { return _123list; } diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelReturn.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelReturn.java index d42fb0322d6c..0c0b8b823a7a 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelReturn.java @@ -34,9 +34,9 @@ public ModelReturn _return(Integer _return) { * Get _return * @return _return */ - @JsonProperty("return") @Schema(name = "return", required = false) + @JsonProperty("return") public Integer getReturn() { return _return; } diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Name.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Name.java index 4d36775c9ab3..bb9348cba8ef 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Name.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Name.java @@ -38,9 +38,9 @@ public Name name(Integer name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @Schema(name = "name", required = true) + @JsonProperty("name") public Integer getName() { return name; } @@ -58,9 +58,9 @@ public Name snakeCase(Integer snakeCase) { * Get snakeCase * @return snakeCase */ - @JsonProperty("snake_case") @Schema(name = "snake_case", accessMode = Schema.AccessMode.READ_ONLY, required = false) + @JsonProperty("snake_case") public Integer getSnakeCase() { return snakeCase; } @@ -78,9 +78,9 @@ public Name property(String property) { * Get property * @return property */ - @JsonProperty("property") @Schema(name = "property", required = false) + @JsonProperty("property") public String getProperty() { return property; } @@ -98,9 +98,9 @@ public Name _123number(Integer _123number) { * Get _123number * @return _123number */ - @JsonProperty("123Number") @Schema(name = "123Number", accessMode = Schema.AccessMode.READ_ONLY, required = false) + @JsonProperty("123Number") public Integer get123number() { return _123number; } diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/NumberOnly.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/NumberOnly.java index c9987ac34849..0efdca304638 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/NumberOnly.java @@ -32,9 +32,9 @@ public NumberOnly justNumber(BigDecimal justNumber) { * Get justNumber * @return justNumber */ - @JsonProperty("JustNumber") @Valid @Schema(name = "JustNumber", required = false) + @JsonProperty("JustNumber") public BigDecimal getJustNumber() { return justNumber; } diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Order.java index 7f8c7d7dbd68..95ed2326f017 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Order.java @@ -82,9 +82,9 @@ public Order id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -102,9 +102,9 @@ public Order petId(Long petId) { * Get petId * @return petId */ - @JsonProperty("petId") @Schema(name = "petId", required = false) + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -122,9 +122,9 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ - @JsonProperty("quantity") @Schema(name = "quantity", required = false) + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -142,9 +142,9 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ - @JsonProperty("shipDate") @Valid @Schema(name = "shipDate", required = false) + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -162,9 +162,9 @@ public Order status(StatusEnum status) { * Order Status * @return status */ - @JsonProperty("status") @Schema(name = "status", description = "Order Status", required = false) + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -182,9 +182,9 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ - @JsonProperty("complete") @Schema(name = "complete", required = false) + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/OuterComposite.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/OuterComposite.java index 69e20faba44c..99a1c2d74de4 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/OuterComposite.java @@ -36,9 +36,9 @@ public OuterComposite myNumber(BigDecimal myNumber) { * Get myNumber * @return myNumber */ - @JsonProperty("my_number") @Valid @Schema(name = "my_number", required = false) + @JsonProperty("my_number") public BigDecimal getMyNumber() { return myNumber; } @@ -56,9 +56,9 @@ public OuterComposite myString(String myString) { * Get myString * @return myString */ - @JsonProperty("my_string") @Schema(name = "my_string", required = false) + @JsonProperty("my_string") public String getMyString() { return myString; } @@ -76,9 +76,9 @@ public OuterComposite myBoolean(Boolean myBoolean) { * Get myBoolean * @return myBoolean */ - @JsonProperty("my_boolean") @Schema(name = "my_boolean", required = false) + @JsonProperty("my_boolean") public Boolean getMyBoolean() { return myBoolean; } diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java index d5cd247f52c4..424b43f87bfa 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java @@ -88,9 +88,9 @@ public Pet id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -108,9 +108,9 @@ public Pet category(Category category) { * Get category * @return category */ - @JsonProperty("category") @Valid @Schema(name = "category", required = false) + @JsonProperty("category") public Category getCategory() { return category; } @@ -128,9 +128,9 @@ public Pet name(String name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @Schema(name = "name", example = "doggie", required = true) + @JsonProperty("name") public String getName() { return name; } @@ -156,9 +156,9 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ - @JsonProperty("photoUrls") @NotNull @Schema(name = "photoUrls", required = true) + @JsonProperty("photoUrls") public Set getPhotoUrls() { return photoUrls; } @@ -185,9 +185,9 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @JsonProperty("tags") @Valid @Schema(name = "tags", required = false) + @JsonProperty("tags") public List getTags() { return tags; } @@ -205,9 +205,9 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ - @JsonProperty("status") @Schema(name = "status", description = "pet status in the store", required = false) + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ReadOnlyFirst.java index 2c3728d1a0dc..f49d3415372f 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -33,9 +33,9 @@ public ReadOnlyFirst bar(String bar) { * Get bar * @return bar */ - @JsonProperty("bar") @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, required = false) + @JsonProperty("bar") public String getBar() { return bar; } @@ -53,9 +53,9 @@ public ReadOnlyFirst baz(String baz) { * Get baz * @return baz */ - @JsonProperty("baz") @Schema(name = "baz", required = false) + @JsonProperty("baz") public String getBaz() { return baz; } diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/SpecialModelName.java index d5e02b2f517d..7797c47de54b 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/SpecialModelName.java @@ -33,9 +33,9 @@ public class SpecialModelName { * Get $specialPropertyName * @return $specialPropertyName */ - @JsonProperty("$special[property.name]") @Schema(name = "$special[property.name]", required = false) + @JsonProperty("$special[property.name]") public Long get$SpecialPropertyName() { return $specialPropertyName; } diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Tag.java index c832495c2c60..2b25f707954a 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Tag.java @@ -33,9 +33,9 @@ public Tag id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -53,9 +53,9 @@ public Tag name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java index 05bec742f24c..de771866b754 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -43,9 +43,9 @@ public TypeHolderDefault stringItem(String stringItem) { * Get stringItem * @return stringItem */ - @JsonProperty("string_item") @NotNull @Schema(name = "string_item", required = true) + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -63,9 +63,9 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ - @JsonProperty("number_item") @NotNull @Valid @Schema(name = "number_item", required = true) + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -83,9 +83,9 @@ public TypeHolderDefault integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ - @JsonProperty("integer_item") @NotNull @Schema(name = "integer_item", required = true) + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -103,9 +103,9 @@ public TypeHolderDefault boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ - @JsonProperty("bool_item") @NotNull @Schema(name = "bool_item", required = true) + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -131,9 +131,9 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ - @JsonProperty("array_item") @NotNull @Schema(name = "array_item", required = true) + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java index 1e3ddab16959..633f25792184 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -45,9 +45,9 @@ public TypeHolderExample stringItem(String stringItem) { * Get stringItem * @return stringItem */ - @JsonProperty("string_item") @NotNull @Schema(name = "string_item", example = "what", required = true) + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -65,9 +65,9 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ - @JsonProperty("number_item") @NotNull @Valid @Schema(name = "number_item", example = "1.234", required = true) + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -85,9 +85,9 @@ public TypeHolderExample floatItem(Float floatItem) { * Get floatItem * @return floatItem */ - @JsonProperty("float_item") @NotNull @Schema(name = "float_item", example = "1.234", required = true) + @JsonProperty("float_item") public Float getFloatItem() { return floatItem; } @@ -105,9 +105,9 @@ public TypeHolderExample integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ - @JsonProperty("integer_item") @NotNull @Schema(name = "integer_item", example = "-2", required = true) + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -125,9 +125,9 @@ public TypeHolderExample boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ - @JsonProperty("bool_item") @NotNull @Schema(name = "bool_item", example = "true", required = true) + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -153,9 +153,9 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ - @JsonProperty("array_item") @NotNull @Schema(name = "array_item", example = "[0, 1, 2, 3]", required = true) + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/User.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/User.java index 351085109af2..10f5a3521c64 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/User.java @@ -45,9 +45,9 @@ public User id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -65,9 +65,9 @@ public User username(String username) { * Get username * @return username */ - @JsonProperty("username") @Schema(name = "username", required = false) + @JsonProperty("username") public String getUsername() { return username; } @@ -85,9 +85,9 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ - @JsonProperty("firstName") @Schema(name = "firstName", required = false) + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -105,9 +105,9 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ - @JsonProperty("lastName") @Schema(name = "lastName", required = false) + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -125,9 +125,9 @@ public User email(String email) { * Get email * @return email */ - @JsonProperty("email") @Schema(name = "email", required = false) + @JsonProperty("email") public String getEmail() { return email; } @@ -145,9 +145,9 @@ public User password(String password) { * Get password * @return password */ - @JsonProperty("password") @Schema(name = "password", required = false) + @JsonProperty("password") public String getPassword() { return password; } @@ -165,9 +165,9 @@ public User phone(String phone) { * Get phone * @return phone */ - @JsonProperty("phone") @Schema(name = "phone", required = false) + @JsonProperty("phone") public String getPhone() { return phone; } @@ -185,9 +185,9 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ - @JsonProperty("userStatus") @Schema(name = "userStatus", description = "User Status", required = false) + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java index 91357ebdefb5..25e36d07520e 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java @@ -99,9 +99,9 @@ public XmlItem attributeString(String attributeString) { * Get attributeString * @return attributeString */ - @JsonProperty("attribute_string") @Schema(name = "attribute_string", example = "string", required = false) + @JsonProperty("attribute_string") public String getAttributeString() { return attributeString; } @@ -119,9 +119,9 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) { * Get attributeNumber * @return attributeNumber */ - @JsonProperty("attribute_number") @Valid @Schema(name = "attribute_number", example = "1.234", required = false) + @JsonProperty("attribute_number") public BigDecimal getAttributeNumber() { return attributeNumber; } @@ -139,9 +139,9 @@ public XmlItem attributeInteger(Integer attributeInteger) { * Get attributeInteger * @return attributeInteger */ - @JsonProperty("attribute_integer") @Schema(name = "attribute_integer", example = "-2", required = false) + @JsonProperty("attribute_integer") public Integer getAttributeInteger() { return attributeInteger; } @@ -159,9 +159,9 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) { * Get attributeBoolean * @return attributeBoolean */ - @JsonProperty("attribute_boolean") @Schema(name = "attribute_boolean", example = "true", required = false) + @JsonProperty("attribute_boolean") public Boolean getAttributeBoolean() { return attributeBoolean; } @@ -187,9 +187,9 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) { * Get wrappedArray * @return wrappedArray */ - @JsonProperty("wrapped_array") @Schema(name = "wrapped_array", required = false) + @JsonProperty("wrapped_array") public List getWrappedArray() { return wrappedArray; } @@ -207,9 +207,9 @@ public XmlItem nameString(String nameString) { * Get nameString * @return nameString */ - @JsonProperty("name_string") @Schema(name = "name_string", example = "string", required = false) + @JsonProperty("name_string") public String getNameString() { return nameString; } @@ -227,9 +227,9 @@ public XmlItem nameNumber(BigDecimal nameNumber) { * Get nameNumber * @return nameNumber */ - @JsonProperty("name_number") @Valid @Schema(name = "name_number", example = "1.234", required = false) + @JsonProperty("name_number") public BigDecimal getNameNumber() { return nameNumber; } @@ -247,9 +247,9 @@ public XmlItem nameInteger(Integer nameInteger) { * Get nameInteger * @return nameInteger */ - @JsonProperty("name_integer") @Schema(name = "name_integer", example = "-2", required = false) + @JsonProperty("name_integer") public Integer getNameInteger() { return nameInteger; } @@ -267,9 +267,9 @@ public XmlItem nameBoolean(Boolean nameBoolean) { * Get nameBoolean * @return nameBoolean */ - @JsonProperty("name_boolean") @Schema(name = "name_boolean", example = "true", required = false) + @JsonProperty("name_boolean") public Boolean getNameBoolean() { return nameBoolean; } @@ -295,9 +295,9 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) { * Get nameArray * @return nameArray */ - @JsonProperty("name_array") @Schema(name = "name_array", required = false) + @JsonProperty("name_array") public List getNameArray() { return nameArray; } @@ -323,9 +323,9 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) { * Get nameWrappedArray * @return nameWrappedArray */ - @JsonProperty("name_wrapped_array") @Schema(name = "name_wrapped_array", required = false) + @JsonProperty("name_wrapped_array") public List getNameWrappedArray() { return nameWrappedArray; } @@ -343,9 +343,9 @@ public XmlItem prefixString(String prefixString) { * Get prefixString * @return prefixString */ - @JsonProperty("prefix_string") @Schema(name = "prefix_string", example = "string", required = false) + @JsonProperty("prefix_string") public String getPrefixString() { return prefixString; } @@ -363,9 +363,9 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) { * Get prefixNumber * @return prefixNumber */ - @JsonProperty("prefix_number") @Valid @Schema(name = "prefix_number", example = "1.234", required = false) + @JsonProperty("prefix_number") public BigDecimal getPrefixNumber() { return prefixNumber; } @@ -383,9 +383,9 @@ public XmlItem prefixInteger(Integer prefixInteger) { * Get prefixInteger * @return prefixInteger */ - @JsonProperty("prefix_integer") @Schema(name = "prefix_integer", example = "-2", required = false) + @JsonProperty("prefix_integer") public Integer getPrefixInteger() { return prefixInteger; } @@ -403,9 +403,9 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) { * Get prefixBoolean * @return prefixBoolean */ - @JsonProperty("prefix_boolean") @Schema(name = "prefix_boolean", example = "true", required = false) + @JsonProperty("prefix_boolean") public Boolean getPrefixBoolean() { return prefixBoolean; } @@ -431,9 +431,9 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) { * Get prefixArray * @return prefixArray */ - @JsonProperty("prefix_array") @Schema(name = "prefix_array", required = false) + @JsonProperty("prefix_array") public List getPrefixArray() { return prefixArray; } @@ -459,9 +459,9 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) { * Get prefixWrappedArray * @return prefixWrappedArray */ - @JsonProperty("prefix_wrapped_array") @Schema(name = "prefix_wrapped_array", required = false) + @JsonProperty("prefix_wrapped_array") public List getPrefixWrappedArray() { return prefixWrappedArray; } @@ -479,9 +479,9 @@ public XmlItem namespaceString(String namespaceString) { * Get namespaceString * @return namespaceString */ - @JsonProperty("namespace_string") @Schema(name = "namespace_string", example = "string", required = false) + @JsonProperty("namespace_string") public String getNamespaceString() { return namespaceString; } @@ -499,9 +499,9 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) { * Get namespaceNumber * @return namespaceNumber */ - @JsonProperty("namespace_number") @Valid @Schema(name = "namespace_number", example = "1.234", required = false) + @JsonProperty("namespace_number") public BigDecimal getNamespaceNumber() { return namespaceNumber; } @@ -519,9 +519,9 @@ public XmlItem namespaceInteger(Integer namespaceInteger) { * Get namespaceInteger * @return namespaceInteger */ - @JsonProperty("namespace_integer") @Schema(name = "namespace_integer", example = "-2", required = false) + @JsonProperty("namespace_integer") public Integer getNamespaceInteger() { return namespaceInteger; } @@ -539,9 +539,9 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) { * Get namespaceBoolean * @return namespaceBoolean */ - @JsonProperty("namespace_boolean") @Schema(name = "namespace_boolean", example = "true", required = false) + @JsonProperty("namespace_boolean") public Boolean getNamespaceBoolean() { return namespaceBoolean; } @@ -567,9 +567,9 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) { * Get namespaceArray * @return namespaceArray */ - @JsonProperty("namespace_array") @Schema(name = "namespace_array", required = false) + @JsonProperty("namespace_array") public List getNamespaceArray() { return namespaceArray; } @@ -595,9 +595,9 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) { * Get namespaceWrappedArray * @return namespaceWrappedArray */ - @JsonProperty("namespace_wrapped_array") @Schema(name = "namespace_wrapped_array", required = false) + @JsonProperty("namespace_wrapped_array") public List getNamespaceWrappedArray() { return namespaceWrappedArray; } @@ -615,9 +615,9 @@ public XmlItem prefixNsString(String prefixNsString) { * Get prefixNsString * @return prefixNsString */ - @JsonProperty("prefix_ns_string") @Schema(name = "prefix_ns_string", example = "string", required = false) + @JsonProperty("prefix_ns_string") public String getPrefixNsString() { return prefixNsString; } @@ -635,9 +635,9 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) { * Get prefixNsNumber * @return prefixNsNumber */ - @JsonProperty("prefix_ns_number") @Valid @Schema(name = "prefix_ns_number", example = "1.234", required = false) + @JsonProperty("prefix_ns_number") public BigDecimal getPrefixNsNumber() { return prefixNsNumber; } @@ -655,9 +655,9 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) { * Get prefixNsInteger * @return prefixNsInteger */ - @JsonProperty("prefix_ns_integer") @Schema(name = "prefix_ns_integer", example = "-2", required = false) + @JsonProperty("prefix_ns_integer") public Integer getPrefixNsInteger() { return prefixNsInteger; } @@ -675,9 +675,9 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) { * Get prefixNsBoolean * @return prefixNsBoolean */ - @JsonProperty("prefix_ns_boolean") @Schema(name = "prefix_ns_boolean", example = "true", required = false) + @JsonProperty("prefix_ns_boolean") public Boolean getPrefixNsBoolean() { return prefixNsBoolean; } @@ -703,9 +703,9 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) { * Get prefixNsArray * @return prefixNsArray */ - @JsonProperty("prefix_ns_array") @Schema(name = "prefix_ns_array", required = false) + @JsonProperty("prefix_ns_array") public List getPrefixNsArray() { return prefixNsArray; } @@ -731,9 +731,9 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) { * Get prefixNsWrappedArray * @return prefixNsWrappedArray */ - @JsonProperty("prefix_ns_wrapped_array") @Schema(name = "prefix_ns_wrapped_array", required = false) + @JsonProperty("prefix_ns_wrapped_array") public List getPrefixNsWrappedArray() { return prefixNsWrappedArray; } diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/resources/openapi.yaml b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/resources/openapi.yaml index 2999e6f2f8d6..5fdcfc33eada 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/resources/openapi.yaml +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/resources/openapi.yaml @@ -2111,7 +2111,6 @@ components: status: description: Updated status of the pet type: string - type: object uploadFile_request: properties: additionalMetadata: @@ -2121,7 +2120,6 @@ components: description: file to upload format: binary type: string - type: object testEnumParameters_request: properties: enum_form_string_array: @@ -2141,7 +2139,6 @@ components: - -efg - (xyz) type: string - type: object testEndpointParameters_request: properties: integer: @@ -2214,7 +2211,6 @@ components: - double - number - pattern_without_delimiter - type: object testJsonFormData_request: properties: param: @@ -2226,7 +2222,6 @@ components: required: - param - param2 - type: object uploadFileWithRequiredFile_request: properties: additionalMetadata: @@ -2238,7 +2233,6 @@ components: type: string required: - requiredFile - type: object Dog_allOf: properties: breed: diff --git a/samples/openapi3/server/petstore/springboot-delegate/.openapi-generator/FILES b/samples/openapi3/server/petstore/springboot-delegate/.openapi-generator/FILES index 3299b46a7b26..813eb7c338f8 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/.openapi-generator/FILES +++ b/samples/openapi3/server/petstore/springboot-delegate/.openapi-generator/FILES @@ -21,7 +21,6 @@ src/main/java/org/openapitools/api/StoreApiDelegate.java src/main/java/org/openapitools/api/UserApi.java src/main/java/org/openapitools/api/UserApiController.java src/main/java/org/openapitools/api/UserApiDelegate.java -src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/configuration/SpringDocConfiguration.java src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java diff --git a/samples/openapi3/server/petstore/springboot-delegate/.openapi-generator/VERSION b/samples/openapi3/server/petstore/springboot-delegate/.openapi-generator/VERSION index d6b4ec4aa783..ed829dbcddec 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/.openapi-generator/VERSION +++ b/samples/openapi3/server/petstore/springboot-delegate/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0-SNAPSHOT \ No newline at end of file +6.2.1-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java index 122955b07beb..aea3984d43c2 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApiController.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApiController.java index e27e2fc20ea9..7c3f20492479 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApiController.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApiController.java @@ -27,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class AnotherFakeApiController implements AnotherFakeApi { private final AnotherFakeApiDelegate delegate; 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 21888ab0e8dd..512ab446af4b 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java index 726b17779f18..8e624ba5fb59 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java @@ -37,7 +37,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeApiController implements FakeApi { private final FakeApiDelegate delegate; diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index a42bc82021dd..47d0ffd85854 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java index 21e28fe8b213..48a276daf130 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java @@ -27,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeClassnameTestApiController implements FakeClassnameTestApi { private final FakeClassnameTestApiDelegate delegate; 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 8ef3dca5c9cb..c23460096286 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiController.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiController.java index 5ef3de965ff8..e27c4c3b49d6 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiController.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiController.java @@ -29,7 +29,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class PetApiController implements PetApi { private final PetApiDelegate delegate; diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java index a54fc47aec06..cfa2597fd549 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiController.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiController.java index e9e29a41b4f9..8c3b33a99af6 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiController.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiController.java @@ -28,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class StoreApiController implements StoreApi { private final StoreApiDelegate delegate; diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java index 46f911754270..fffbbee8793b 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApiController.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApiController.java index 1b48d4a9444b..58511a07291c 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApiController.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApiController.java @@ -29,7 +29,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class UserApiController implements UserApi { private final UserApiDelegate delegate; diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index e45a52c7a8af..62bd9f2bdf5f 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -34,9 +34,9 @@ public AdditionalPropertiesAnyType name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index ff8e902ab955..774a995fa648 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -35,9 +35,9 @@ public AdditionalPropertiesArray name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index c21068182c49..e46980d51924 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -34,9 +34,9 @@ public AdditionalPropertiesBoolean name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index c43432f178b1..2987ecb804c9 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -72,9 +72,9 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt * Get mapString * @return mapString */ - @JsonProperty("map_string") @Schema(name = "map_string", required = false) + @JsonProperty("map_string") public Map getMapString() { return mapString; } @@ -100,9 +100,9 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * Get mapNumber * @return mapNumber */ - @JsonProperty("map_number") @Valid @Schema(name = "map_number", required = false) + @JsonProperty("map_number") public Map getMapNumber() { return mapNumber; } @@ -128,9 +128,9 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege * Get mapInteger * @return mapInteger */ - @JsonProperty("map_integer") @Schema(name = "map_integer", required = false) + @JsonProperty("map_integer") public Map getMapInteger() { return mapInteger; } @@ -156,9 +156,9 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea * Get mapBoolean * @return mapBoolean */ - @JsonProperty("map_boolean") @Schema(name = "map_boolean", required = false) + @JsonProperty("map_boolean") public Map getMapBoolean() { return mapBoolean; } @@ -184,9 +184,9 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { return mapArrayInteger; } @@ -212,9 +212,9 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * Get mapArrayAnytype * @return mapArrayAnytype */ - @JsonProperty("map_array_anytype") @Valid @Schema(name = "map_array_anytype", required = false) + @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { return mapArrayAnytype; } @@ -240,9 +240,9 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { return mapMapString; } @@ -268,9 +268,9 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { return mapMapAnytype; } @@ -288,9 +288,9 @@ public AdditionalPropertiesClass anytype1(Object anytype1) { * Get anytype1 * @return anytype1 */ - @JsonProperty("anytype_1") @Schema(name = "anytype_1", required = false) + @JsonProperty("anytype_1") public Object getAnytype1() { return anytype1; } @@ -308,9 +308,9 @@ public AdditionalPropertiesClass anytype2(Object anytype2) { * Get anytype2 * @return anytype2 */ - @JsonProperty("anytype_2") @Schema(name = "anytype_2", required = false) + @JsonProperty("anytype_2") public Object getAnytype2() { return anytype2; } @@ -328,9 +328,9 @@ public AdditionalPropertiesClass anytype3(Object anytype3) { * Get anytype3 * @return anytype3 */ - @JsonProperty("anytype_3") @Schema(name = "anytype_3", required = false) + @JsonProperty("anytype_3") public Object getAnytype3() { return anytype3; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index d4fe82193e30..5f8b17f159fd 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -34,9 +34,9 @@ public AdditionalPropertiesInteger name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 11f9dda21f3f..a02c1a6284ec 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -35,9 +35,9 @@ public AdditionalPropertiesNumber name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index ce4f9f1ff862..b3c54932d1a6 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -34,9 +34,9 @@ public AdditionalPropertiesObject name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 2669a2e08d51..50ebbaf82d5a 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -34,9 +34,9 @@ public AdditionalPropertiesString name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java index 50eb6fe3c62b..f045573f0903 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java @@ -51,9 +51,9 @@ public Animal className(String className) { * Get className * @return className */ - @JsonProperty("className") @NotNull @Schema(name = "className", required = true) + @JsonProperty("className") public String getClassName() { return className; } @@ -71,9 +71,9 @@ public Animal color(String color) { * Get color * @return color */ - @JsonProperty("color") @Schema(name = "color", required = false) + @JsonProperty("color") public String getColor() { return color; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 99f5ef3aa439..ed60f2697f52 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -44,9 +44,9 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * Get arrayArrayNumber * @return arrayArrayNumber */ - @JsonProperty("ArrayArrayNumber") @Valid @Schema(name = "ArrayArrayNumber", required = false) + @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 563d0dc0f933..8e2d978eb5b9 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -44,9 +44,9 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ - @JsonProperty("ArrayNumber") @Valid @Schema(name = "ArrayNumber", required = false) + @JsonProperty("ArrayNumber") public List getArrayNumber() { return arrayNumber; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java index 839cf3ac40ab..576f202a0210 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java @@ -50,9 +50,9 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) { * Get arrayOfString * @return arrayOfString */ - @JsonProperty("array_of_string") @Schema(name = "array_of_string", required = false) + @JsonProperty("array_of_string") public List getArrayOfString() { return arrayOfString; } @@ -78,9 +78,9 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ - @JsonProperty("array_array_of_integer") @Valid @Schema(name = "array_array_of_integer", required = false) + @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; } @@ -106,9 +106,9 @@ public ArrayTest addArrayArrayOfModelItem(List arrayArrayOfModelI * Get arrayArrayOfModel * @return arrayArrayOfModel */ - @JsonProperty("array_array_of_model") @Valid @Schema(name = "array_array_of_model", required = false) + @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java index e0b22753e9e8..2dd10a30ea9a 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java @@ -77,9 +77,9 @@ public BigCat kind(KindEnum kind) { * Get kind * @return kind */ - @JsonProperty("kind") @Schema(name = "kind", required = false) + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCatAllOf.java index 3b0788b0b304..a29d08eadf7f 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCatAllOf.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCatAllOf.java @@ -74,9 +74,9 @@ public BigCatAllOf kind(KindEnum kind) { * Get kind * @return kind */ - @JsonProperty("kind") @Schema(name = "kind", required = false) + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Capitalization.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Capitalization.java index 7270c14a949f..e6c6b39b3e8d 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Capitalization.java @@ -42,9 +42,9 @@ public Capitalization smallCamel(String smallCamel) { * Get smallCamel * @return smallCamel */ - @JsonProperty("smallCamel") @Schema(name = "smallCamel", required = false) + @JsonProperty("smallCamel") public String getSmallCamel() { return smallCamel; } @@ -62,9 +62,9 @@ public Capitalization capitalCamel(String capitalCamel) { * Get capitalCamel * @return capitalCamel */ - @JsonProperty("CapitalCamel") @Schema(name = "CapitalCamel", required = false) + @JsonProperty("CapitalCamel") public String getCapitalCamel() { return capitalCamel; } @@ -82,9 +82,9 @@ public Capitalization smallSnake(String smallSnake) { * Get smallSnake * @return smallSnake */ - @JsonProperty("small_Snake") @Schema(name = "small_Snake", required = false) + @JsonProperty("small_Snake") public String getSmallSnake() { return smallSnake; } @@ -102,9 +102,9 @@ public Capitalization capitalSnake(String capitalSnake) { * Get capitalSnake * @return capitalSnake */ - @JsonProperty("Capital_Snake") @Schema(name = "Capital_Snake", required = false) + @JsonProperty("Capital_Snake") public String getCapitalSnake() { return capitalSnake; } @@ -122,9 +122,9 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) { * Get scAETHFlowPoints * @return scAETHFlowPoints */ - @JsonProperty("SCA_ETH_Flow_Points") @Schema(name = "SCA_ETH_Flow_Points", required = false) + @JsonProperty("SCA_ETH_Flow_Points") public String getScAETHFlowPoints() { return scAETHFlowPoints; } @@ -142,9 +142,9 @@ public Capitalization ATT_NAME(String ATT_NAME) { * Name of the pet * @return ATT_NAME */ - @JsonProperty("ATT_NAME") @Schema(name = "ATT_NAME", description = "Name of the pet ", required = false) + @JsonProperty("ATT_NAME") public String getATTNAME() { return ATT_NAME; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java index d1bb205b11b3..6a5ec912b5b5 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java @@ -46,9 +46,9 @@ public Cat declawed(Boolean declawed) { * Get declawed * @return declawed */ - @JsonProperty("declawed") @Schema(name = "declawed", required = false) + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/CatAllOf.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/CatAllOf.java index b7a7ed5def6a..0647507cd05e 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/CatAllOf.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/CatAllOf.java @@ -34,9 +34,9 @@ public CatAllOf declawed(Boolean declawed) { * Get declawed * @return declawed */ - @JsonProperty("declawed") @Schema(name = "declawed", required = false) + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java index 9b1acc5a5c07..4d6450b7b2af 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java @@ -34,9 +34,9 @@ public Category id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -54,9 +54,9 @@ public Category name(String name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @Schema(name = "name", required = true) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ClassModel.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ClassModel.java index 20f5e2de16dd..4c5aac3991ab 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ClassModel.java @@ -33,9 +33,9 @@ public ClassModel propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ - @JsonProperty("_class") @Schema(name = "_class", required = false) + @JsonProperty("_class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Client.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Client.java index 11ed7ead459c..98e9244f3922 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Client.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Client.java @@ -32,9 +32,9 @@ public Client client(String client) { * Get client * @return client */ - @JsonProperty("client") @Schema(name = "client", required = false) + @JsonProperty("client") public String getClient() { return client; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Dog.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Dog.java index b0f901978716..63ff356bf3f5 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Dog.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Dog.java @@ -37,9 +37,9 @@ public Dog breed(String breed) { * Get breed * @return breed */ - @JsonProperty("breed") @Schema(name = "breed", required = false) + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/DogAllOf.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/DogAllOf.java index 097dc159ee65..be10fcc8175e 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/DogAllOf.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/DogAllOf.java @@ -34,9 +34,9 @@ public DogAllOf breed(String breed) { * Get breed * @return breed */ - @JsonProperty("breed") @Schema(name = "breed", required = false) + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java index cb84a65b9e1c..fb2769e537ca 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java @@ -108,9 +108,9 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) { * Get justSymbol * @return justSymbol */ - @JsonProperty("just_symbol") @Schema(name = "just_symbol", required = false) + @JsonProperty("just_symbol") public JustSymbolEnum getJustSymbol() { return justSymbol; } @@ -136,9 +136,9 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) { * Get arrayEnum * @return arrayEnum */ - @JsonProperty("array_enum") @Schema(name = "array_enum", required = false) + @JsonProperty("array_enum") public List getArrayEnum() { return arrayEnum; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java index 2243d0fb1b8b..8e6d9e9fb8d1 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java @@ -188,9 +188,9 @@ public EnumTest enumString(EnumStringEnum enumString) { * Get enumString * @return enumString */ - @JsonProperty("enum_string") @Schema(name = "enum_string", required = false) + @JsonProperty("enum_string") public EnumStringEnum getEnumString() { return enumString; } @@ -208,9 +208,9 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) { * Get enumStringRequired * @return enumStringRequired */ - @JsonProperty("enum_string_required") @NotNull @Schema(name = "enum_string_required", required = true) + @JsonProperty("enum_string_required") public EnumStringRequiredEnum getEnumStringRequired() { return enumStringRequired; } @@ -228,9 +228,9 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) { * Get enumInteger * @return enumInteger */ - @JsonProperty("enum_integer") @Schema(name = "enum_integer", required = false) + @JsonProperty("enum_integer") public EnumIntegerEnum getEnumInteger() { return enumInteger; } @@ -248,9 +248,9 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) { * Get enumNumber * @return enumNumber */ - @JsonProperty("enum_number") @Schema(name = "enum_number", required = false) + @JsonProperty("enum_number") public EnumNumberEnum getEnumNumber() { return enumNumber; } @@ -268,9 +268,9 @@ public EnumTest outerEnum(OuterEnum outerEnum) { * Get outerEnum * @return outerEnum */ - @JsonProperty("outerEnum") @Valid @Schema(name = "outerEnum", required = false) + @JsonProperty("outerEnum") public OuterEnum getOuterEnum() { return outerEnum; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/File.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/File.java index 7d0f08137a62..dbdc0c147803 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/File.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/File.java @@ -33,9 +33,9 @@ public File sourceURI(String sourceURI) { * Test capitalization * @return sourceURI */ - @JsonProperty("sourceURI") @Schema(name = "sourceURI", description = "Test capitalization", required = false) + @JsonProperty("sourceURI") public String getSourceURI() { return sourceURI; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 50df4bf463a8..e4378be9ee0f 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -38,9 +38,9 @@ public FileSchemaTestClass file(File file) { * Get file * @return file */ - @JsonProperty("file") @Valid @Schema(name = "file", required = false) + @JsonProperty("file") public File getFile() { return file; } @@ -66,9 +66,9 @@ public FileSchemaTestClass addFilesItem(File filesItem) { * Get files * @return files */ - @JsonProperty("files") @Valid @Schema(name = "files", required = false) + @JsonProperty("files") public List getFiles() { return files; } 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 c9ae6ace8274..1bf83a5a5091 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 @@ -70,9 +70,9 @@ public FormatTest integer(Integer integer) { * maximum: 100 * @return integer */ - @JsonProperty("integer") @Min(10) @Max(100) @Schema(name = "integer", required = false) + @JsonProperty("integer") public Integer getInteger() { return integer; } @@ -92,9 +92,9 @@ public FormatTest int32(Integer int32) { * maximum: 200 * @return int32 */ - @JsonProperty("int32") @Min(20) @Max(200) @Schema(name = "int32", required = false) + @JsonProperty("int32") public Integer getInt32() { return int32; } @@ -112,9 +112,9 @@ public FormatTest int64(Long int64) { * Get int64 * @return int64 */ - @JsonProperty("int64") @Schema(name = "int64", required = false) + @JsonProperty("int64") public Long getInt64() { return int64; } @@ -134,9 +134,9 @@ public FormatTest number(BigDecimal number) { * maximum: 543.2 * @return number */ - @JsonProperty("number") @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") @Schema(name = "number", required = true) + @JsonProperty("number") public BigDecimal getNumber() { return number; } @@ -156,9 +156,9 @@ public FormatTest _float(Float _float) { * maximum: 987.6 * @return _float */ - @JsonProperty("float") @DecimalMin("54.3") @DecimalMax("987.6") @Schema(name = "float", required = false) + @JsonProperty("float") public Float getFloat() { return _float; } @@ -178,9 +178,9 @@ public FormatTest _double(Double _double) { * maximum: 123.4 * @return _double */ - @JsonProperty("double") @DecimalMin("67.8") @DecimalMax("123.4") @Schema(name = "double", required = false) + @JsonProperty("double") public Double getDouble() { return _double; } @@ -198,9 +198,9 @@ public FormatTest string(String string) { * Get string * @return string */ - @JsonProperty("string") @Pattern(regexp = "/[a-z]/i") @Schema(name = "string", required = false) + @JsonProperty("string") public String getString() { return string; } @@ -218,9 +218,9 @@ public FormatTest _byte(byte[] _byte) { * Get _byte * @return _byte */ - @JsonProperty("byte") @NotNull @Schema(name = "byte", required = true) + @JsonProperty("byte") public byte[] getByte() { return _byte; } @@ -238,9 +238,9 @@ public FormatTest binary(org.springframework.core.io.Resource binary) { * Get binary * @return binary */ - @JsonProperty("binary") @Valid @Schema(name = "binary", required = false) + @JsonProperty("binary") public org.springframework.core.io.Resource getBinary() { return binary; } @@ -258,9 +258,9 @@ public FormatTest date(LocalDate date) { * Get date * @return date */ - @JsonProperty("date") @NotNull @Valid @Schema(name = "date", required = true) + @JsonProperty("date") public LocalDate getDate() { return date; } @@ -278,9 +278,9 @@ public FormatTest dateTime(OffsetDateTime dateTime) { * Get dateTime * @return dateTime */ - @JsonProperty("dateTime") @Valid @Schema(name = "dateTime", required = false) + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -298,9 +298,9 @@ public FormatTest uuid(UUID uuid) { * Get uuid * @return uuid */ - @JsonProperty("uuid") @Valid @Schema(name = "uuid", example = "72f98069-206d-4f12-9f12-3d1e525a8e84", required = false) + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -318,9 +318,9 @@ public FormatTest password(String password) { * Get password * @return password */ - @JsonProperty("password") @NotNull @Size(min = 10, max = 64) @Schema(name = "password", required = true) + @JsonProperty("password") public String getPassword() { return password; } @@ -338,9 +338,9 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) { * Get bigDecimal * @return bigDecimal */ - @JsonProperty("BigDecimal") @Valid @Schema(name = "BigDecimal", required = false) + @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { return bigDecimal; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index aa8c3ee2514a..0a04cd2d070c 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -36,9 +36,9 @@ public HasOnlyReadOnly bar(String bar) { * Get bar * @return bar */ - @JsonProperty("bar") @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, required = false) + @JsonProperty("bar") public String getBar() { return bar; } @@ -56,9 +56,9 @@ public HasOnlyReadOnly foo(String foo) { * Get foo * @return foo */ - @JsonProperty("foo") @Schema(name = "foo", accessMode = Schema.AccessMode.READ_ONLY, required = false) + @JsonProperty("foo") public String getFoo() { return foo; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java index 594021c36d2d..4cfeaeb6c63d 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java @@ -88,9 +88,9 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapMapOfString * @return mapMapOfString */ - @JsonProperty("map_map_of_string") @Valid @Schema(name = "map_map_of_string", required = false) + @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { return mapMapOfString; } @@ -116,9 +116,9 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) * Get mapOfEnumString * @return mapOfEnumString */ - @JsonProperty("map_of_enum_string") @Schema(name = "map_of_enum_string", required = false) + @JsonProperty("map_of_enum_string") public Map getMapOfEnumString() { return mapOfEnumString; } @@ -144,9 +144,9 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) { * Get directMap * @return directMap */ - @JsonProperty("direct_map") @Schema(name = "direct_map", required = false) + @JsonProperty("direct_map") public Map getDirectMap() { return directMap; } @@ -172,9 +172,9 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) { * Get indirectMap * @return indirectMap */ - @JsonProperty("indirect_map") @Schema(name = "indirect_map", required = false) + @JsonProperty("indirect_map") public Map getIndirectMap() { return indirectMap; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index af4644ee1fd8..12e8bd36800c 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -44,9 +44,9 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { * Get uuid * @return uuid */ - @JsonProperty("uuid") @Valid @Schema(name = "uuid", required = false) + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -64,9 +64,9 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT * Get dateTime * @return dateTime */ - @JsonProperty("dateTime") @Valid @Schema(name = "dateTime", required = false) + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -92,9 +92,9 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * Get map * @return map */ - @JsonProperty("map") @Valid @Schema(name = "map", required = false) + @JsonProperty("map") public Map getMap() { return map; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Model200Response.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Model200Response.java index 329840fd1cd5..08bb506f2bd3 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Model200Response.java @@ -37,9 +37,9 @@ public Model200Response name(Integer name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public Integer getName() { return name; } @@ -57,9 +57,9 @@ public Model200Response propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ - @JsonProperty("class") @Schema(name = "class", required = false) + @JsonProperty("class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelApiResponse.java index 14ea90b13917..4851d6074c2f 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -38,9 +38,9 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ - @JsonProperty("code") @Schema(name = "code", required = false) + @JsonProperty("code") public Integer getCode() { return code; } @@ -58,9 +58,9 @@ public ModelApiResponse type(String type) { * Get type * @return type */ - @JsonProperty("type") @Schema(name = "type", required = false) + @JsonProperty("type") public String getType() { return type; } @@ -78,9 +78,9 @@ public ModelApiResponse message(String message) { * Get message * @return message */ - @JsonProperty("message") @Schema(name = "message", required = false) + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelList.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelList.java index 1e0bcffc220c..cf953ee17e25 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelList.java @@ -34,9 +34,9 @@ public ModelList _123list(String _123list) { * Get _123list * @return _123list */ - @JsonProperty("123-list") @Schema(name = "123-list", required = false) + @JsonProperty("123-list") public String get123list() { return _123list; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelReturn.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelReturn.java index 90b17a6d6850..d863cf8d63fe 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelReturn.java @@ -35,9 +35,9 @@ public ModelReturn _return(Integer _return) { * Get _return * @return _return */ - @JsonProperty("return") @Schema(name = "return", required = false) + @JsonProperty("return") public Integer getReturn() { return _return; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Name.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Name.java index bcbb5aab0f79..ad984399e918 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Name.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Name.java @@ -39,9 +39,9 @@ public Name name(Integer name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @Schema(name = "name", required = true) + @JsonProperty("name") public Integer getName() { return name; } @@ -59,9 +59,9 @@ public Name snakeCase(Integer snakeCase) { * Get snakeCase * @return snakeCase */ - @JsonProperty("snake_case") @Schema(name = "snake_case", accessMode = Schema.AccessMode.READ_ONLY, required = false) + @JsonProperty("snake_case") public Integer getSnakeCase() { return snakeCase; } @@ -79,9 +79,9 @@ public Name property(String property) { * Get property * @return property */ - @JsonProperty("property") @Schema(name = "property", required = false) + @JsonProperty("property") public String getProperty() { return property; } @@ -99,9 +99,9 @@ public Name _123number(Integer _123number) { * Get _123number * @return _123number */ - @JsonProperty("123Number") @Schema(name = "123Number", accessMode = Schema.AccessMode.READ_ONLY, required = false) + @JsonProperty("123Number") public Integer get123number() { return _123number; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NumberOnly.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NumberOnly.java index a597943a3ef7..23b2cdff8675 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NumberOnly.java @@ -33,9 +33,9 @@ public NumberOnly justNumber(BigDecimal justNumber) { * Get justNumber * @return justNumber */ - @JsonProperty("JustNumber") @Valid @Schema(name = "JustNumber", required = false) + @JsonProperty("JustNumber") public BigDecimal getJustNumber() { return justNumber; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Order.java index 10e257004cf9..0167b80e837c 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Order.java @@ -83,9 +83,9 @@ public Order id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -103,9 +103,9 @@ public Order petId(Long petId) { * Get petId * @return petId */ - @JsonProperty("petId") @Schema(name = "petId", required = false) + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -123,9 +123,9 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ - @JsonProperty("quantity") @Schema(name = "quantity", required = false) + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -143,9 +143,9 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ - @JsonProperty("shipDate") @Valid @Schema(name = "shipDate", required = false) + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -163,9 +163,9 @@ public Order status(StatusEnum status) { * Order Status * @return status */ - @JsonProperty("status") @Schema(name = "status", description = "Order Status", required = false) + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -183,9 +183,9 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ - @JsonProperty("complete") @Schema(name = "complete", required = false) + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/OuterComposite.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/OuterComposite.java index da3403158231..4f01a0edad71 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/OuterComposite.java @@ -37,9 +37,9 @@ public OuterComposite myNumber(BigDecimal myNumber) { * Get myNumber * @return myNumber */ - @JsonProperty("my_number") @Valid @Schema(name = "my_number", required = false) + @JsonProperty("my_number") public BigDecimal getMyNumber() { return myNumber; } @@ -57,9 +57,9 @@ public OuterComposite myString(String myString) { * Get myString * @return myString */ - @JsonProperty("my_string") @Schema(name = "my_string", required = false) + @JsonProperty("my_string") public String getMyString() { return myString; } @@ -77,9 +77,9 @@ public OuterComposite myBoolean(Boolean myBoolean) { * Get myBoolean * @return myBoolean */ - @JsonProperty("my_boolean") @Schema(name = "my_boolean", required = false) + @JsonProperty("my_boolean") public Boolean getMyBoolean() { return myBoolean; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java index edfea99a4441..27219d2daa74 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java @@ -89,9 +89,9 @@ public Pet id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -109,9 +109,9 @@ public Pet category(Category category) { * Get category * @return category */ - @JsonProperty("category") @Valid @Schema(name = "category", required = false) + @JsonProperty("category") public Category getCategory() { return category; } @@ -129,9 +129,9 @@ public Pet name(String name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @Schema(name = "name", example = "doggie", required = true) + @JsonProperty("name") public String getName() { return name; } @@ -154,9 +154,9 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ - @JsonProperty("photoUrls") @NotNull @Schema(name = "photoUrls", required = true) + @JsonProperty("photoUrls") public Set getPhotoUrls() { return photoUrls; } @@ -183,9 +183,9 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @JsonProperty("tags") @Valid @Schema(name = "tags", required = false) + @JsonProperty("tags") public List getTags() { return tags; } @@ -203,9 +203,9 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ - @JsonProperty("status") @Schema(name = "status", description = "pet status in the store", required = false) + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java index 5bb864fdfdf9..78d279153054 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -34,9 +34,9 @@ public ReadOnlyFirst bar(String bar) { * Get bar * @return bar */ - @JsonProperty("bar") @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, required = false) + @JsonProperty("bar") public String getBar() { return bar; } @@ -54,9 +54,9 @@ public ReadOnlyFirst baz(String baz) { * Get baz * @return baz */ - @JsonProperty("baz") @Schema(name = "baz", required = false) + @JsonProperty("baz") public String getBaz() { return baz; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java index d30f01ffd4ce..85284bda0ff2 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java @@ -34,9 +34,9 @@ public class SpecialModelName { * Get $specialPropertyName * @return $specialPropertyName */ - @JsonProperty("$special[property.name]") @Schema(name = "$special[property.name]", required = false) + @JsonProperty("$special[property.name]") public Long get$SpecialPropertyName() { return $specialPropertyName; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Tag.java index 7e0f150664d9..fd2a0db14b5d 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Tag.java @@ -34,9 +34,9 @@ public Tag id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -54,9 +54,9 @@ public Tag name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java index 151d7623b25f..230033993752 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -44,9 +44,9 @@ public TypeHolderDefault stringItem(String stringItem) { * Get stringItem * @return stringItem */ - @JsonProperty("string_item") @NotNull @Schema(name = "string_item", required = true) + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -64,9 +64,9 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ - @JsonProperty("number_item") @NotNull @Valid @Schema(name = "number_item", required = true) + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -84,9 +84,9 @@ public TypeHolderDefault integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ - @JsonProperty("integer_item") @NotNull @Schema(name = "integer_item", required = true) + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -104,9 +104,9 @@ public TypeHolderDefault boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ - @JsonProperty("bool_item") @NotNull @Schema(name = "bool_item", required = true) + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -129,9 +129,9 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ - @JsonProperty("array_item") @NotNull @Schema(name = "array_item", required = true) + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java index 7239836800df..964c94fd5627 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -46,9 +46,9 @@ public TypeHolderExample stringItem(String stringItem) { * Get stringItem * @return stringItem */ - @JsonProperty("string_item") @NotNull @Schema(name = "string_item", example = "what", required = true) + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -66,9 +66,9 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ - @JsonProperty("number_item") @NotNull @Valid @Schema(name = "number_item", example = "1.234", required = true) + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -86,9 +86,9 @@ public TypeHolderExample floatItem(Float floatItem) { * Get floatItem * @return floatItem */ - @JsonProperty("float_item") @NotNull @Schema(name = "float_item", example = "1.234", required = true) + @JsonProperty("float_item") public Float getFloatItem() { return floatItem; } @@ -106,9 +106,9 @@ public TypeHolderExample integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ - @JsonProperty("integer_item") @NotNull @Schema(name = "integer_item", example = "-2", required = true) + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -126,9 +126,9 @@ public TypeHolderExample boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ - @JsonProperty("bool_item") @NotNull @Schema(name = "bool_item", example = "true", required = true) + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -151,9 +151,9 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ - @JsonProperty("array_item") @NotNull @Schema(name = "array_item", example = "[0, 1, 2, 3]", required = true) + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/User.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/User.java index eb52ac9bab84..68e52752bfbe 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/User.java @@ -46,9 +46,9 @@ public User id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -66,9 +66,9 @@ public User username(String username) { * Get username * @return username */ - @JsonProperty("username") @Schema(name = "username", required = false) + @JsonProperty("username") public String getUsername() { return username; } @@ -86,9 +86,9 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ - @JsonProperty("firstName") @Schema(name = "firstName", required = false) + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -106,9 +106,9 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ - @JsonProperty("lastName") @Schema(name = "lastName", required = false) + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -126,9 +126,9 @@ public User email(String email) { * Get email * @return email */ - @JsonProperty("email") @Schema(name = "email", required = false) + @JsonProperty("email") public String getEmail() { return email; } @@ -146,9 +146,9 @@ public User password(String password) { * Get password * @return password */ - @JsonProperty("password") @Schema(name = "password", required = false) + @JsonProperty("password") public String getPassword() { return password; } @@ -166,9 +166,9 @@ public User phone(String phone) { * Get phone * @return phone */ - @JsonProperty("phone") @Schema(name = "phone", required = false) + @JsonProperty("phone") public String getPhone() { return phone; } @@ -186,9 +186,9 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ - @JsonProperty("userStatus") @Schema(name = "userStatus", description = "User Status", required = false) + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java index 4b287492cc75..19b62a5139ae 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java @@ -100,9 +100,9 @@ public XmlItem attributeString(String attributeString) { * Get attributeString * @return attributeString */ - @JsonProperty("attribute_string") @Schema(name = "attribute_string", example = "string", required = false) + @JsonProperty("attribute_string") public String getAttributeString() { return attributeString; } @@ -120,9 +120,9 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) { * Get attributeNumber * @return attributeNumber */ - @JsonProperty("attribute_number") @Valid @Schema(name = "attribute_number", example = "1.234", required = false) + @JsonProperty("attribute_number") public BigDecimal getAttributeNumber() { return attributeNumber; } @@ -140,9 +140,9 @@ public XmlItem attributeInteger(Integer attributeInteger) { * Get attributeInteger * @return attributeInteger */ - @JsonProperty("attribute_integer") @Schema(name = "attribute_integer", example = "-2", required = false) + @JsonProperty("attribute_integer") public Integer getAttributeInteger() { return attributeInteger; } @@ -160,9 +160,9 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) { * Get attributeBoolean * @return attributeBoolean */ - @JsonProperty("attribute_boolean") @Schema(name = "attribute_boolean", example = "true", required = false) + @JsonProperty("attribute_boolean") public Boolean getAttributeBoolean() { return attributeBoolean; } @@ -188,9 +188,9 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) { * Get wrappedArray * @return wrappedArray */ - @JsonProperty("wrapped_array") @Schema(name = "wrapped_array", required = false) + @JsonProperty("wrapped_array") public List getWrappedArray() { return wrappedArray; } @@ -208,9 +208,9 @@ public XmlItem nameString(String nameString) { * Get nameString * @return nameString */ - @JsonProperty("name_string") @Schema(name = "name_string", example = "string", required = false) + @JsonProperty("name_string") public String getNameString() { return nameString; } @@ -228,9 +228,9 @@ public XmlItem nameNumber(BigDecimal nameNumber) { * Get nameNumber * @return nameNumber */ - @JsonProperty("name_number") @Valid @Schema(name = "name_number", example = "1.234", required = false) + @JsonProperty("name_number") public BigDecimal getNameNumber() { return nameNumber; } @@ -248,9 +248,9 @@ public XmlItem nameInteger(Integer nameInteger) { * Get nameInteger * @return nameInteger */ - @JsonProperty("name_integer") @Schema(name = "name_integer", example = "-2", required = false) + @JsonProperty("name_integer") public Integer getNameInteger() { return nameInteger; } @@ -268,9 +268,9 @@ public XmlItem nameBoolean(Boolean nameBoolean) { * Get nameBoolean * @return nameBoolean */ - @JsonProperty("name_boolean") @Schema(name = "name_boolean", example = "true", required = false) + @JsonProperty("name_boolean") public Boolean getNameBoolean() { return nameBoolean; } @@ -296,9 +296,9 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) { * Get nameArray * @return nameArray */ - @JsonProperty("name_array") @Schema(name = "name_array", required = false) + @JsonProperty("name_array") public List getNameArray() { return nameArray; } @@ -324,9 +324,9 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) { * Get nameWrappedArray * @return nameWrappedArray */ - @JsonProperty("name_wrapped_array") @Schema(name = "name_wrapped_array", required = false) + @JsonProperty("name_wrapped_array") public List getNameWrappedArray() { return nameWrappedArray; } @@ -344,9 +344,9 @@ public XmlItem prefixString(String prefixString) { * Get prefixString * @return prefixString */ - @JsonProperty("prefix_string") @Schema(name = "prefix_string", example = "string", required = false) + @JsonProperty("prefix_string") public String getPrefixString() { return prefixString; } @@ -364,9 +364,9 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) { * Get prefixNumber * @return prefixNumber */ - @JsonProperty("prefix_number") @Valid @Schema(name = "prefix_number", example = "1.234", required = false) + @JsonProperty("prefix_number") public BigDecimal getPrefixNumber() { return prefixNumber; } @@ -384,9 +384,9 @@ public XmlItem prefixInteger(Integer prefixInteger) { * Get prefixInteger * @return prefixInteger */ - @JsonProperty("prefix_integer") @Schema(name = "prefix_integer", example = "-2", required = false) + @JsonProperty("prefix_integer") public Integer getPrefixInteger() { return prefixInteger; } @@ -404,9 +404,9 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) { * Get prefixBoolean * @return prefixBoolean */ - @JsonProperty("prefix_boolean") @Schema(name = "prefix_boolean", example = "true", required = false) + @JsonProperty("prefix_boolean") public Boolean getPrefixBoolean() { return prefixBoolean; } @@ -432,9 +432,9 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) { * Get prefixArray * @return prefixArray */ - @JsonProperty("prefix_array") @Schema(name = "prefix_array", required = false) + @JsonProperty("prefix_array") public List getPrefixArray() { return prefixArray; } @@ -460,9 +460,9 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) { * Get prefixWrappedArray * @return prefixWrappedArray */ - @JsonProperty("prefix_wrapped_array") @Schema(name = "prefix_wrapped_array", required = false) + @JsonProperty("prefix_wrapped_array") public List getPrefixWrappedArray() { return prefixWrappedArray; } @@ -480,9 +480,9 @@ public XmlItem namespaceString(String namespaceString) { * Get namespaceString * @return namespaceString */ - @JsonProperty("namespace_string") @Schema(name = "namespace_string", example = "string", required = false) + @JsonProperty("namespace_string") public String getNamespaceString() { return namespaceString; } @@ -500,9 +500,9 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) { * Get namespaceNumber * @return namespaceNumber */ - @JsonProperty("namespace_number") @Valid @Schema(name = "namespace_number", example = "1.234", required = false) + @JsonProperty("namespace_number") public BigDecimal getNamespaceNumber() { return namespaceNumber; } @@ -520,9 +520,9 @@ public XmlItem namespaceInteger(Integer namespaceInteger) { * Get namespaceInteger * @return namespaceInteger */ - @JsonProperty("namespace_integer") @Schema(name = "namespace_integer", example = "-2", required = false) + @JsonProperty("namespace_integer") public Integer getNamespaceInteger() { return namespaceInteger; } @@ -540,9 +540,9 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) { * Get namespaceBoolean * @return namespaceBoolean */ - @JsonProperty("namespace_boolean") @Schema(name = "namespace_boolean", example = "true", required = false) + @JsonProperty("namespace_boolean") public Boolean getNamespaceBoolean() { return namespaceBoolean; } @@ -568,9 +568,9 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) { * Get namespaceArray * @return namespaceArray */ - @JsonProperty("namespace_array") @Schema(name = "namespace_array", required = false) + @JsonProperty("namespace_array") public List getNamespaceArray() { return namespaceArray; } @@ -596,9 +596,9 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) { * Get namespaceWrappedArray * @return namespaceWrappedArray */ - @JsonProperty("namespace_wrapped_array") @Schema(name = "namespace_wrapped_array", required = false) + @JsonProperty("namespace_wrapped_array") public List getNamespaceWrappedArray() { return namespaceWrappedArray; } @@ -616,9 +616,9 @@ public XmlItem prefixNsString(String prefixNsString) { * Get prefixNsString * @return prefixNsString */ - @JsonProperty("prefix_ns_string") @Schema(name = "prefix_ns_string", example = "string", required = false) + @JsonProperty("prefix_ns_string") public String getPrefixNsString() { return prefixNsString; } @@ -636,9 +636,9 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) { * Get prefixNsNumber * @return prefixNsNumber */ - @JsonProperty("prefix_ns_number") @Valid @Schema(name = "prefix_ns_number", example = "1.234", required = false) + @JsonProperty("prefix_ns_number") public BigDecimal getPrefixNsNumber() { return prefixNsNumber; } @@ -656,9 +656,9 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) { * Get prefixNsInteger * @return prefixNsInteger */ - @JsonProperty("prefix_ns_integer") @Schema(name = "prefix_ns_integer", example = "-2", required = false) + @JsonProperty("prefix_ns_integer") public Integer getPrefixNsInteger() { return prefixNsInteger; } @@ -676,9 +676,9 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) { * Get prefixNsBoolean * @return prefixNsBoolean */ - @JsonProperty("prefix_ns_boolean") @Schema(name = "prefix_ns_boolean", example = "true", required = false) + @JsonProperty("prefix_ns_boolean") public Boolean getPrefixNsBoolean() { return prefixNsBoolean; } @@ -704,9 +704,9 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) { * Get prefixNsArray * @return prefixNsArray */ - @JsonProperty("prefix_ns_array") @Schema(name = "prefix_ns_array", required = false) + @JsonProperty("prefix_ns_array") public List getPrefixNsArray() { return prefixNsArray; } @@ -732,9 +732,9 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) { * Get prefixNsWrappedArray * @return prefixNsWrappedArray */ - @JsonProperty("prefix_ns_wrapped_array") @Schema(name = "prefix_ns_wrapped_array", required = false) + @JsonProperty("prefix_ns_wrapped_array") public List getPrefixNsWrappedArray() { return prefixNsWrappedArray; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/resources/openapi.yaml b/samples/openapi3/server/petstore/springboot-delegate/src/main/resources/openapi.yaml index 2999e6f2f8d6..5fdcfc33eada 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/resources/openapi.yaml +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/resources/openapi.yaml @@ -2111,7 +2111,6 @@ components: status: description: Updated status of the pet type: string - type: object uploadFile_request: properties: additionalMetadata: @@ -2121,7 +2120,6 @@ components: description: file to upload format: binary type: string - type: object testEnumParameters_request: properties: enum_form_string_array: @@ -2141,7 +2139,6 @@ components: - -efg - (xyz) type: string - type: object testEndpointParameters_request: properties: integer: @@ -2214,7 +2211,6 @@ components: - double - number - pattern_without_delimiter - type: object testJsonFormData_request: properties: param: @@ -2226,7 +2222,6 @@ components: required: - param - param2 - type: object uploadFileWithRequiredFile_request: properties: additionalMetadata: @@ -2238,7 +2233,6 @@ components: type: string required: - requiredFile - type: object Dog_allOf: properties: breed: diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/.openapi-generator/FILES b/samples/openapi3/server/petstore/springboot-implicitHeaders/.openapi-generator/FILES index 5d716a83385b..cf9ab80cce1d 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/.openapi-generator/FILES +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/.openapi-generator/FILES @@ -15,7 +15,6 @@ src/main/java/org/openapitools/api/StoreApi.java src/main/java/org/openapitools/api/StoreApiController.java src/main/java/org/openapitools/api/UserApi.java src/main/java/org/openapitools/api/UserApiController.java -src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/configuration/SpringDocConfiguration.java src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/.openapi-generator/VERSION b/samples/openapi3/server/petstore/springboot-implicitHeaders/.openapi-generator/VERSION index d6b4ec4aa783..ed829dbcddec 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/.openapi-generator/VERSION +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0-SNAPSHOT \ No newline at end of file +6.2.1-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java index fba11ac08bb4..1e7e4c5a8f57 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApiController.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApiController.java index c2db7ca5a815..65c9de6908c2 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApiController.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApiController.java @@ -28,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class AnotherFakeApiController implements AnotherFakeApi { private final NativeWebRequest request; 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 b408fc5c062b..dd2f374cb91d 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApiController.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApiController.java index 5ae5d5fed985..b30f53bb595c 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApiController.java @@ -38,7 +38,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeApiController implements FakeApi { private final NativeWebRequest request; diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 8d87477c2b16..c0a2a3ac70d2 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java index 65b695629d43..05196793d4c2 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java @@ -28,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeClassnameTestApiController implements FakeClassnameTestApi { private final NativeWebRequest request; 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 7fa1f66a018c..e3efdfdce81c 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApiController.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApiController.java index ea6c56e02c11..0b88e5980bf1 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApiController.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApiController.java @@ -30,7 +30,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class PetApiController implements PetApi { private final NativeWebRequest request; diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java index 836aa2500f7f..4e91ff36d5c3 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApiController.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApiController.java index 1292dc0b721d..f8c784ff3838 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApiController.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApiController.java @@ -29,7 +29,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class StoreApiController implements StoreApi { private final NativeWebRequest request; diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java index 09484728d829..b0db1eddef46 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApiController.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApiController.java index ca00184d2a56..894bf6db762e 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApiController.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApiController.java @@ -30,7 +30,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class UserApiController implements UserApi { private final NativeWebRequest request; diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index e45a52c7a8af..62bd9f2bdf5f 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -34,9 +34,9 @@ public AdditionalPropertiesAnyType name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index ff8e902ab955..774a995fa648 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -35,9 +35,9 @@ public AdditionalPropertiesArray name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index c21068182c49..e46980d51924 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -34,9 +34,9 @@ public AdditionalPropertiesBoolean name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index c43432f178b1..2987ecb804c9 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -72,9 +72,9 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt * Get mapString * @return mapString */ - @JsonProperty("map_string") @Schema(name = "map_string", required = false) + @JsonProperty("map_string") public Map getMapString() { return mapString; } @@ -100,9 +100,9 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * Get mapNumber * @return mapNumber */ - @JsonProperty("map_number") @Valid @Schema(name = "map_number", required = false) + @JsonProperty("map_number") public Map getMapNumber() { return mapNumber; } @@ -128,9 +128,9 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege * Get mapInteger * @return mapInteger */ - @JsonProperty("map_integer") @Schema(name = "map_integer", required = false) + @JsonProperty("map_integer") public Map getMapInteger() { return mapInteger; } @@ -156,9 +156,9 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea * Get mapBoolean * @return mapBoolean */ - @JsonProperty("map_boolean") @Schema(name = "map_boolean", required = false) + @JsonProperty("map_boolean") public Map getMapBoolean() { return mapBoolean; } @@ -184,9 +184,9 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { return mapArrayInteger; } @@ -212,9 +212,9 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * Get mapArrayAnytype * @return mapArrayAnytype */ - @JsonProperty("map_array_anytype") @Valid @Schema(name = "map_array_anytype", required = false) + @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { return mapArrayAnytype; } @@ -240,9 +240,9 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { return mapMapString; } @@ -268,9 +268,9 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { return mapMapAnytype; } @@ -288,9 +288,9 @@ public AdditionalPropertiesClass anytype1(Object anytype1) { * Get anytype1 * @return anytype1 */ - @JsonProperty("anytype_1") @Schema(name = "anytype_1", required = false) + @JsonProperty("anytype_1") public Object getAnytype1() { return anytype1; } @@ -308,9 +308,9 @@ public AdditionalPropertiesClass anytype2(Object anytype2) { * Get anytype2 * @return anytype2 */ - @JsonProperty("anytype_2") @Schema(name = "anytype_2", required = false) + @JsonProperty("anytype_2") public Object getAnytype2() { return anytype2; } @@ -328,9 +328,9 @@ public AdditionalPropertiesClass anytype3(Object anytype3) { * Get anytype3 * @return anytype3 */ - @JsonProperty("anytype_3") @Schema(name = "anytype_3", required = false) + @JsonProperty("anytype_3") public Object getAnytype3() { return anytype3; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index d4fe82193e30..5f8b17f159fd 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -34,9 +34,9 @@ public AdditionalPropertiesInteger name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 11f9dda21f3f..a02c1a6284ec 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -35,9 +35,9 @@ public AdditionalPropertiesNumber name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index ce4f9f1ff862..b3c54932d1a6 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -34,9 +34,9 @@ public AdditionalPropertiesObject name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 2669a2e08d51..50ebbaf82d5a 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -34,9 +34,9 @@ public AdditionalPropertiesString name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java index 50eb6fe3c62b..f045573f0903 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java @@ -51,9 +51,9 @@ public Animal className(String className) { * Get className * @return className */ - @JsonProperty("className") @NotNull @Schema(name = "className", required = true) + @JsonProperty("className") public String getClassName() { return className; } @@ -71,9 +71,9 @@ public Animal color(String color) { * Get color * @return color */ - @JsonProperty("color") @Schema(name = "color", required = false) + @JsonProperty("color") public String getColor() { return color; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 99f5ef3aa439..ed60f2697f52 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -44,9 +44,9 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * Get arrayArrayNumber * @return arrayArrayNumber */ - @JsonProperty("ArrayArrayNumber") @Valid @Schema(name = "ArrayArrayNumber", required = false) + @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 563d0dc0f933..8e2d978eb5b9 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -44,9 +44,9 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ - @JsonProperty("ArrayNumber") @Valid @Schema(name = "ArrayNumber", required = false) + @JsonProperty("ArrayNumber") public List getArrayNumber() { return arrayNumber; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java index 839cf3ac40ab..576f202a0210 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java @@ -50,9 +50,9 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) { * Get arrayOfString * @return arrayOfString */ - @JsonProperty("array_of_string") @Schema(name = "array_of_string", required = false) + @JsonProperty("array_of_string") public List getArrayOfString() { return arrayOfString; } @@ -78,9 +78,9 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ - @JsonProperty("array_array_of_integer") @Valid @Schema(name = "array_array_of_integer", required = false) + @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; } @@ -106,9 +106,9 @@ public ArrayTest addArrayArrayOfModelItem(List arrayArrayOfModelI * Get arrayArrayOfModel * @return arrayArrayOfModel */ - @JsonProperty("array_array_of_model") @Valid @Schema(name = "array_array_of_model", required = false) + @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java index e0b22753e9e8..2dd10a30ea9a 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java @@ -77,9 +77,9 @@ public BigCat kind(KindEnum kind) { * Get kind * @return kind */ - @JsonProperty("kind") @Schema(name = "kind", required = false) + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCatAllOf.java index 3b0788b0b304..a29d08eadf7f 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCatAllOf.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCatAllOf.java @@ -74,9 +74,9 @@ public BigCatAllOf kind(KindEnum kind) { * Get kind * @return kind */ - @JsonProperty("kind") @Schema(name = "kind", required = false) + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Capitalization.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Capitalization.java index 7270c14a949f..e6c6b39b3e8d 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Capitalization.java @@ -42,9 +42,9 @@ public Capitalization smallCamel(String smallCamel) { * Get smallCamel * @return smallCamel */ - @JsonProperty("smallCamel") @Schema(name = "smallCamel", required = false) + @JsonProperty("smallCamel") public String getSmallCamel() { return smallCamel; } @@ -62,9 +62,9 @@ public Capitalization capitalCamel(String capitalCamel) { * Get capitalCamel * @return capitalCamel */ - @JsonProperty("CapitalCamel") @Schema(name = "CapitalCamel", required = false) + @JsonProperty("CapitalCamel") public String getCapitalCamel() { return capitalCamel; } @@ -82,9 +82,9 @@ public Capitalization smallSnake(String smallSnake) { * Get smallSnake * @return smallSnake */ - @JsonProperty("small_Snake") @Schema(name = "small_Snake", required = false) + @JsonProperty("small_Snake") public String getSmallSnake() { return smallSnake; } @@ -102,9 +102,9 @@ public Capitalization capitalSnake(String capitalSnake) { * Get capitalSnake * @return capitalSnake */ - @JsonProperty("Capital_Snake") @Schema(name = "Capital_Snake", required = false) + @JsonProperty("Capital_Snake") public String getCapitalSnake() { return capitalSnake; } @@ -122,9 +122,9 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) { * Get scAETHFlowPoints * @return scAETHFlowPoints */ - @JsonProperty("SCA_ETH_Flow_Points") @Schema(name = "SCA_ETH_Flow_Points", required = false) + @JsonProperty("SCA_ETH_Flow_Points") public String getScAETHFlowPoints() { return scAETHFlowPoints; } @@ -142,9 +142,9 @@ public Capitalization ATT_NAME(String ATT_NAME) { * Name of the pet * @return ATT_NAME */ - @JsonProperty("ATT_NAME") @Schema(name = "ATT_NAME", description = "Name of the pet ", required = false) + @JsonProperty("ATT_NAME") public String getATTNAME() { return ATT_NAME; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java index d1bb205b11b3..6a5ec912b5b5 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java @@ -46,9 +46,9 @@ public Cat declawed(Boolean declawed) { * Get declawed * @return declawed */ - @JsonProperty("declawed") @Schema(name = "declawed", required = false) + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/CatAllOf.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/CatAllOf.java index b7a7ed5def6a..0647507cd05e 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/CatAllOf.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/CatAllOf.java @@ -34,9 +34,9 @@ public CatAllOf declawed(Boolean declawed) { * Get declawed * @return declawed */ - @JsonProperty("declawed") @Schema(name = "declawed", required = false) + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Category.java index 9b1acc5a5c07..4d6450b7b2af 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Category.java @@ -34,9 +34,9 @@ public Category id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -54,9 +54,9 @@ public Category name(String name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @Schema(name = "name", required = true) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ClassModel.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ClassModel.java index 20f5e2de16dd..4c5aac3991ab 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ClassModel.java @@ -33,9 +33,9 @@ public ClassModel propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ - @JsonProperty("_class") @Schema(name = "_class", required = false) + @JsonProperty("_class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Client.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Client.java index 11ed7ead459c..98e9244f3922 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Client.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Client.java @@ -32,9 +32,9 @@ public Client client(String client) { * Get client * @return client */ - @JsonProperty("client") @Schema(name = "client", required = false) + @JsonProperty("client") public String getClient() { return client; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Dog.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Dog.java index b0f901978716..63ff356bf3f5 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Dog.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Dog.java @@ -37,9 +37,9 @@ public Dog breed(String breed) { * Get breed * @return breed */ - @JsonProperty("breed") @Schema(name = "breed", required = false) + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/DogAllOf.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/DogAllOf.java index 097dc159ee65..be10fcc8175e 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/DogAllOf.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/DogAllOf.java @@ -34,9 +34,9 @@ public DogAllOf breed(String breed) { * Get breed * @return breed */ - @JsonProperty("breed") @Schema(name = "breed", required = false) + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java index cb84a65b9e1c..fb2769e537ca 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java @@ -108,9 +108,9 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) { * Get justSymbol * @return justSymbol */ - @JsonProperty("just_symbol") @Schema(name = "just_symbol", required = false) + @JsonProperty("just_symbol") public JustSymbolEnum getJustSymbol() { return justSymbol; } @@ -136,9 +136,9 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) { * Get arrayEnum * @return arrayEnum */ - @JsonProperty("array_enum") @Schema(name = "array_enum", required = false) + @JsonProperty("array_enum") public List getArrayEnum() { return arrayEnum; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java index 2243d0fb1b8b..8e6d9e9fb8d1 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java @@ -188,9 +188,9 @@ public EnumTest enumString(EnumStringEnum enumString) { * Get enumString * @return enumString */ - @JsonProperty("enum_string") @Schema(name = "enum_string", required = false) + @JsonProperty("enum_string") public EnumStringEnum getEnumString() { return enumString; } @@ -208,9 +208,9 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) { * Get enumStringRequired * @return enumStringRequired */ - @JsonProperty("enum_string_required") @NotNull @Schema(name = "enum_string_required", required = true) + @JsonProperty("enum_string_required") public EnumStringRequiredEnum getEnumStringRequired() { return enumStringRequired; } @@ -228,9 +228,9 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) { * Get enumInteger * @return enumInteger */ - @JsonProperty("enum_integer") @Schema(name = "enum_integer", required = false) + @JsonProperty("enum_integer") public EnumIntegerEnum getEnumInteger() { return enumInteger; } @@ -248,9 +248,9 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) { * Get enumNumber * @return enumNumber */ - @JsonProperty("enum_number") @Schema(name = "enum_number", required = false) + @JsonProperty("enum_number") public EnumNumberEnum getEnumNumber() { return enumNumber; } @@ -268,9 +268,9 @@ public EnumTest outerEnum(OuterEnum outerEnum) { * Get outerEnum * @return outerEnum */ - @JsonProperty("outerEnum") @Valid @Schema(name = "outerEnum", required = false) + @JsonProperty("outerEnum") public OuterEnum getOuterEnum() { return outerEnum; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/File.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/File.java index 7d0f08137a62..dbdc0c147803 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/File.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/File.java @@ -33,9 +33,9 @@ public File sourceURI(String sourceURI) { * Test capitalization * @return sourceURI */ - @JsonProperty("sourceURI") @Schema(name = "sourceURI", description = "Test capitalization", required = false) + @JsonProperty("sourceURI") public String getSourceURI() { return sourceURI; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 50df4bf463a8..e4378be9ee0f 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -38,9 +38,9 @@ public FileSchemaTestClass file(File file) { * Get file * @return file */ - @JsonProperty("file") @Valid @Schema(name = "file", required = false) + @JsonProperty("file") public File getFile() { return file; } @@ -66,9 +66,9 @@ public FileSchemaTestClass addFilesItem(File filesItem) { * Get files * @return files */ - @JsonProperty("files") @Valid @Schema(name = "files", required = false) + @JsonProperty("files") public List getFiles() { return files; } 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 c9ae6ace8274..1bf83a5a5091 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 @@ -70,9 +70,9 @@ public FormatTest integer(Integer integer) { * maximum: 100 * @return integer */ - @JsonProperty("integer") @Min(10) @Max(100) @Schema(name = "integer", required = false) + @JsonProperty("integer") public Integer getInteger() { return integer; } @@ -92,9 +92,9 @@ public FormatTest int32(Integer int32) { * maximum: 200 * @return int32 */ - @JsonProperty("int32") @Min(20) @Max(200) @Schema(name = "int32", required = false) + @JsonProperty("int32") public Integer getInt32() { return int32; } @@ -112,9 +112,9 @@ public FormatTest int64(Long int64) { * Get int64 * @return int64 */ - @JsonProperty("int64") @Schema(name = "int64", required = false) + @JsonProperty("int64") public Long getInt64() { return int64; } @@ -134,9 +134,9 @@ public FormatTest number(BigDecimal number) { * maximum: 543.2 * @return number */ - @JsonProperty("number") @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") @Schema(name = "number", required = true) + @JsonProperty("number") public BigDecimal getNumber() { return number; } @@ -156,9 +156,9 @@ public FormatTest _float(Float _float) { * maximum: 987.6 * @return _float */ - @JsonProperty("float") @DecimalMin("54.3") @DecimalMax("987.6") @Schema(name = "float", required = false) + @JsonProperty("float") public Float getFloat() { return _float; } @@ -178,9 +178,9 @@ public FormatTest _double(Double _double) { * maximum: 123.4 * @return _double */ - @JsonProperty("double") @DecimalMin("67.8") @DecimalMax("123.4") @Schema(name = "double", required = false) + @JsonProperty("double") public Double getDouble() { return _double; } @@ -198,9 +198,9 @@ public FormatTest string(String string) { * Get string * @return string */ - @JsonProperty("string") @Pattern(regexp = "/[a-z]/i") @Schema(name = "string", required = false) + @JsonProperty("string") public String getString() { return string; } @@ -218,9 +218,9 @@ public FormatTest _byte(byte[] _byte) { * Get _byte * @return _byte */ - @JsonProperty("byte") @NotNull @Schema(name = "byte", required = true) + @JsonProperty("byte") public byte[] getByte() { return _byte; } @@ -238,9 +238,9 @@ public FormatTest binary(org.springframework.core.io.Resource binary) { * Get binary * @return binary */ - @JsonProperty("binary") @Valid @Schema(name = "binary", required = false) + @JsonProperty("binary") public org.springframework.core.io.Resource getBinary() { return binary; } @@ -258,9 +258,9 @@ public FormatTest date(LocalDate date) { * Get date * @return date */ - @JsonProperty("date") @NotNull @Valid @Schema(name = "date", required = true) + @JsonProperty("date") public LocalDate getDate() { return date; } @@ -278,9 +278,9 @@ public FormatTest dateTime(OffsetDateTime dateTime) { * Get dateTime * @return dateTime */ - @JsonProperty("dateTime") @Valid @Schema(name = "dateTime", required = false) + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -298,9 +298,9 @@ public FormatTest uuid(UUID uuid) { * Get uuid * @return uuid */ - @JsonProperty("uuid") @Valid @Schema(name = "uuid", example = "72f98069-206d-4f12-9f12-3d1e525a8e84", required = false) + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -318,9 +318,9 @@ public FormatTest password(String password) { * Get password * @return password */ - @JsonProperty("password") @NotNull @Size(min = 10, max = 64) @Schema(name = "password", required = true) + @JsonProperty("password") public String getPassword() { return password; } @@ -338,9 +338,9 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) { * Get bigDecimal * @return bigDecimal */ - @JsonProperty("BigDecimal") @Valid @Schema(name = "BigDecimal", required = false) + @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { return bigDecimal; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index aa8c3ee2514a..0a04cd2d070c 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -36,9 +36,9 @@ public HasOnlyReadOnly bar(String bar) { * Get bar * @return bar */ - @JsonProperty("bar") @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, required = false) + @JsonProperty("bar") public String getBar() { return bar; } @@ -56,9 +56,9 @@ public HasOnlyReadOnly foo(String foo) { * Get foo * @return foo */ - @JsonProperty("foo") @Schema(name = "foo", accessMode = Schema.AccessMode.READ_ONLY, required = false) + @JsonProperty("foo") public String getFoo() { return foo; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java index 594021c36d2d..4cfeaeb6c63d 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java @@ -88,9 +88,9 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapMapOfString * @return mapMapOfString */ - @JsonProperty("map_map_of_string") @Valid @Schema(name = "map_map_of_string", required = false) + @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { return mapMapOfString; } @@ -116,9 +116,9 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) * Get mapOfEnumString * @return mapOfEnumString */ - @JsonProperty("map_of_enum_string") @Schema(name = "map_of_enum_string", required = false) + @JsonProperty("map_of_enum_string") public Map getMapOfEnumString() { return mapOfEnumString; } @@ -144,9 +144,9 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) { * Get directMap * @return directMap */ - @JsonProperty("direct_map") @Schema(name = "direct_map", required = false) + @JsonProperty("direct_map") public Map getDirectMap() { return directMap; } @@ -172,9 +172,9 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) { * Get indirectMap * @return indirectMap */ - @JsonProperty("indirect_map") @Schema(name = "indirect_map", required = false) + @JsonProperty("indirect_map") public Map getIndirectMap() { return indirectMap; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index af4644ee1fd8..12e8bd36800c 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -44,9 +44,9 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { * Get uuid * @return uuid */ - @JsonProperty("uuid") @Valid @Schema(name = "uuid", required = false) + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -64,9 +64,9 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT * Get dateTime * @return dateTime */ - @JsonProperty("dateTime") @Valid @Schema(name = "dateTime", required = false) + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -92,9 +92,9 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * Get map * @return map */ - @JsonProperty("map") @Valid @Schema(name = "map", required = false) + @JsonProperty("map") public Map getMap() { return map; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Model200Response.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Model200Response.java index 329840fd1cd5..08bb506f2bd3 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Model200Response.java @@ -37,9 +37,9 @@ public Model200Response name(Integer name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public Integer getName() { return name; } @@ -57,9 +57,9 @@ public Model200Response propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ - @JsonProperty("class") @Schema(name = "class", required = false) + @JsonProperty("class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelApiResponse.java index 14ea90b13917..4851d6074c2f 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -38,9 +38,9 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ - @JsonProperty("code") @Schema(name = "code", required = false) + @JsonProperty("code") public Integer getCode() { return code; } @@ -58,9 +58,9 @@ public ModelApiResponse type(String type) { * Get type * @return type */ - @JsonProperty("type") @Schema(name = "type", required = false) + @JsonProperty("type") public String getType() { return type; } @@ -78,9 +78,9 @@ public ModelApiResponse message(String message) { * Get message * @return message */ - @JsonProperty("message") @Schema(name = "message", required = false) + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelList.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelList.java index 1e0bcffc220c..cf953ee17e25 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelList.java @@ -34,9 +34,9 @@ public ModelList _123list(String _123list) { * Get _123list * @return _123list */ - @JsonProperty("123-list") @Schema(name = "123-list", required = false) + @JsonProperty("123-list") public String get123list() { return _123list; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelReturn.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelReturn.java index 90b17a6d6850..d863cf8d63fe 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelReturn.java @@ -35,9 +35,9 @@ public ModelReturn _return(Integer _return) { * Get _return * @return _return */ - @JsonProperty("return") @Schema(name = "return", required = false) + @JsonProperty("return") public Integer getReturn() { return _return; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Name.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Name.java index bcbb5aab0f79..ad984399e918 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Name.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Name.java @@ -39,9 +39,9 @@ public Name name(Integer name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @Schema(name = "name", required = true) + @JsonProperty("name") public Integer getName() { return name; } @@ -59,9 +59,9 @@ public Name snakeCase(Integer snakeCase) { * Get snakeCase * @return snakeCase */ - @JsonProperty("snake_case") @Schema(name = "snake_case", accessMode = Schema.AccessMode.READ_ONLY, required = false) + @JsonProperty("snake_case") public Integer getSnakeCase() { return snakeCase; } @@ -79,9 +79,9 @@ public Name property(String property) { * Get property * @return property */ - @JsonProperty("property") @Schema(name = "property", required = false) + @JsonProperty("property") public String getProperty() { return property; } @@ -99,9 +99,9 @@ public Name _123number(Integer _123number) { * Get _123number * @return _123number */ - @JsonProperty("123Number") @Schema(name = "123Number", accessMode = Schema.AccessMode.READ_ONLY, required = false) + @JsonProperty("123Number") public Integer get123number() { return _123number; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NumberOnly.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NumberOnly.java index a597943a3ef7..23b2cdff8675 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NumberOnly.java @@ -33,9 +33,9 @@ public NumberOnly justNumber(BigDecimal justNumber) { * Get justNumber * @return justNumber */ - @JsonProperty("JustNumber") @Valid @Schema(name = "JustNumber", required = false) + @JsonProperty("JustNumber") public BigDecimal getJustNumber() { return justNumber; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Order.java index 10e257004cf9..0167b80e837c 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Order.java @@ -83,9 +83,9 @@ public Order id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -103,9 +103,9 @@ public Order petId(Long petId) { * Get petId * @return petId */ - @JsonProperty("petId") @Schema(name = "petId", required = false) + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -123,9 +123,9 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ - @JsonProperty("quantity") @Schema(name = "quantity", required = false) + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -143,9 +143,9 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ - @JsonProperty("shipDate") @Valid @Schema(name = "shipDate", required = false) + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -163,9 +163,9 @@ public Order status(StatusEnum status) { * Order Status * @return status */ - @JsonProperty("status") @Schema(name = "status", description = "Order Status", required = false) + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -183,9 +183,9 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ - @JsonProperty("complete") @Schema(name = "complete", required = false) + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/OuterComposite.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/OuterComposite.java index da3403158231..4f01a0edad71 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/OuterComposite.java @@ -37,9 +37,9 @@ public OuterComposite myNumber(BigDecimal myNumber) { * Get myNumber * @return myNumber */ - @JsonProperty("my_number") @Valid @Schema(name = "my_number", required = false) + @JsonProperty("my_number") public BigDecimal getMyNumber() { return myNumber; } @@ -57,9 +57,9 @@ public OuterComposite myString(String myString) { * Get myString * @return myString */ - @JsonProperty("my_string") @Schema(name = "my_string", required = false) + @JsonProperty("my_string") public String getMyString() { return myString; } @@ -77,9 +77,9 @@ public OuterComposite myBoolean(Boolean myBoolean) { * Get myBoolean * @return myBoolean */ - @JsonProperty("my_boolean") @Schema(name = "my_boolean", required = false) + @JsonProperty("my_boolean") public Boolean getMyBoolean() { return myBoolean; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java index edfea99a4441..27219d2daa74 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java @@ -89,9 +89,9 @@ public Pet id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -109,9 +109,9 @@ public Pet category(Category category) { * Get category * @return category */ - @JsonProperty("category") @Valid @Schema(name = "category", required = false) + @JsonProperty("category") public Category getCategory() { return category; } @@ -129,9 +129,9 @@ public Pet name(String name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @Schema(name = "name", example = "doggie", required = true) + @JsonProperty("name") public String getName() { return name; } @@ -154,9 +154,9 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ - @JsonProperty("photoUrls") @NotNull @Schema(name = "photoUrls", required = true) + @JsonProperty("photoUrls") public Set getPhotoUrls() { return photoUrls; } @@ -183,9 +183,9 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @JsonProperty("tags") @Valid @Schema(name = "tags", required = false) + @JsonProperty("tags") public List getTags() { return tags; } @@ -203,9 +203,9 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ - @JsonProperty("status") @Schema(name = "status", description = "pet status in the store", required = false) + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java index 5bb864fdfdf9..78d279153054 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -34,9 +34,9 @@ public ReadOnlyFirst bar(String bar) { * Get bar * @return bar */ - @JsonProperty("bar") @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, required = false) + @JsonProperty("bar") public String getBar() { return bar; } @@ -54,9 +54,9 @@ public ReadOnlyFirst baz(String baz) { * Get baz * @return baz */ - @JsonProperty("baz") @Schema(name = "baz", required = false) + @JsonProperty("baz") public String getBaz() { return baz; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java index d30f01ffd4ce..85284bda0ff2 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java @@ -34,9 +34,9 @@ public class SpecialModelName { * Get $specialPropertyName * @return $specialPropertyName */ - @JsonProperty("$special[property.name]") @Schema(name = "$special[property.name]", required = false) + @JsonProperty("$special[property.name]") public Long get$SpecialPropertyName() { return $specialPropertyName; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Tag.java index 7e0f150664d9..fd2a0db14b5d 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Tag.java @@ -34,9 +34,9 @@ public Tag id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -54,9 +54,9 @@ public Tag name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java index 151d7623b25f..230033993752 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -44,9 +44,9 @@ public TypeHolderDefault stringItem(String stringItem) { * Get stringItem * @return stringItem */ - @JsonProperty("string_item") @NotNull @Schema(name = "string_item", required = true) + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -64,9 +64,9 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ - @JsonProperty("number_item") @NotNull @Valid @Schema(name = "number_item", required = true) + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -84,9 +84,9 @@ public TypeHolderDefault integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ - @JsonProperty("integer_item") @NotNull @Schema(name = "integer_item", required = true) + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -104,9 +104,9 @@ public TypeHolderDefault boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ - @JsonProperty("bool_item") @NotNull @Schema(name = "bool_item", required = true) + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -129,9 +129,9 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ - @JsonProperty("array_item") @NotNull @Schema(name = "array_item", required = true) + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java index 7239836800df..964c94fd5627 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -46,9 +46,9 @@ public TypeHolderExample stringItem(String stringItem) { * Get stringItem * @return stringItem */ - @JsonProperty("string_item") @NotNull @Schema(name = "string_item", example = "what", required = true) + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -66,9 +66,9 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ - @JsonProperty("number_item") @NotNull @Valid @Schema(name = "number_item", example = "1.234", required = true) + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -86,9 +86,9 @@ public TypeHolderExample floatItem(Float floatItem) { * Get floatItem * @return floatItem */ - @JsonProperty("float_item") @NotNull @Schema(name = "float_item", example = "1.234", required = true) + @JsonProperty("float_item") public Float getFloatItem() { return floatItem; } @@ -106,9 +106,9 @@ public TypeHolderExample integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ - @JsonProperty("integer_item") @NotNull @Schema(name = "integer_item", example = "-2", required = true) + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -126,9 +126,9 @@ public TypeHolderExample boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ - @JsonProperty("bool_item") @NotNull @Schema(name = "bool_item", example = "true", required = true) + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -151,9 +151,9 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ - @JsonProperty("array_item") @NotNull @Schema(name = "array_item", example = "[0, 1, 2, 3]", required = true) + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/User.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/User.java index eb52ac9bab84..68e52752bfbe 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/User.java @@ -46,9 +46,9 @@ public User id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -66,9 +66,9 @@ public User username(String username) { * Get username * @return username */ - @JsonProperty("username") @Schema(name = "username", required = false) + @JsonProperty("username") public String getUsername() { return username; } @@ -86,9 +86,9 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ - @JsonProperty("firstName") @Schema(name = "firstName", required = false) + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -106,9 +106,9 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ - @JsonProperty("lastName") @Schema(name = "lastName", required = false) + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -126,9 +126,9 @@ public User email(String email) { * Get email * @return email */ - @JsonProperty("email") @Schema(name = "email", required = false) + @JsonProperty("email") public String getEmail() { return email; } @@ -146,9 +146,9 @@ public User password(String password) { * Get password * @return password */ - @JsonProperty("password") @Schema(name = "password", required = false) + @JsonProperty("password") public String getPassword() { return password; } @@ -166,9 +166,9 @@ public User phone(String phone) { * Get phone * @return phone */ - @JsonProperty("phone") @Schema(name = "phone", required = false) + @JsonProperty("phone") public String getPhone() { return phone; } @@ -186,9 +186,9 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ - @JsonProperty("userStatus") @Schema(name = "userStatus", description = "User Status", required = false) + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java index 4b287492cc75..19b62a5139ae 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java @@ -100,9 +100,9 @@ public XmlItem attributeString(String attributeString) { * Get attributeString * @return attributeString */ - @JsonProperty("attribute_string") @Schema(name = "attribute_string", example = "string", required = false) + @JsonProperty("attribute_string") public String getAttributeString() { return attributeString; } @@ -120,9 +120,9 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) { * Get attributeNumber * @return attributeNumber */ - @JsonProperty("attribute_number") @Valid @Schema(name = "attribute_number", example = "1.234", required = false) + @JsonProperty("attribute_number") public BigDecimal getAttributeNumber() { return attributeNumber; } @@ -140,9 +140,9 @@ public XmlItem attributeInteger(Integer attributeInteger) { * Get attributeInteger * @return attributeInteger */ - @JsonProperty("attribute_integer") @Schema(name = "attribute_integer", example = "-2", required = false) + @JsonProperty("attribute_integer") public Integer getAttributeInteger() { return attributeInteger; } @@ -160,9 +160,9 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) { * Get attributeBoolean * @return attributeBoolean */ - @JsonProperty("attribute_boolean") @Schema(name = "attribute_boolean", example = "true", required = false) + @JsonProperty("attribute_boolean") public Boolean getAttributeBoolean() { return attributeBoolean; } @@ -188,9 +188,9 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) { * Get wrappedArray * @return wrappedArray */ - @JsonProperty("wrapped_array") @Schema(name = "wrapped_array", required = false) + @JsonProperty("wrapped_array") public List getWrappedArray() { return wrappedArray; } @@ -208,9 +208,9 @@ public XmlItem nameString(String nameString) { * Get nameString * @return nameString */ - @JsonProperty("name_string") @Schema(name = "name_string", example = "string", required = false) + @JsonProperty("name_string") public String getNameString() { return nameString; } @@ -228,9 +228,9 @@ public XmlItem nameNumber(BigDecimal nameNumber) { * Get nameNumber * @return nameNumber */ - @JsonProperty("name_number") @Valid @Schema(name = "name_number", example = "1.234", required = false) + @JsonProperty("name_number") public BigDecimal getNameNumber() { return nameNumber; } @@ -248,9 +248,9 @@ public XmlItem nameInteger(Integer nameInteger) { * Get nameInteger * @return nameInteger */ - @JsonProperty("name_integer") @Schema(name = "name_integer", example = "-2", required = false) + @JsonProperty("name_integer") public Integer getNameInteger() { return nameInteger; } @@ -268,9 +268,9 @@ public XmlItem nameBoolean(Boolean nameBoolean) { * Get nameBoolean * @return nameBoolean */ - @JsonProperty("name_boolean") @Schema(name = "name_boolean", example = "true", required = false) + @JsonProperty("name_boolean") public Boolean getNameBoolean() { return nameBoolean; } @@ -296,9 +296,9 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) { * Get nameArray * @return nameArray */ - @JsonProperty("name_array") @Schema(name = "name_array", required = false) + @JsonProperty("name_array") public List getNameArray() { return nameArray; } @@ -324,9 +324,9 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) { * Get nameWrappedArray * @return nameWrappedArray */ - @JsonProperty("name_wrapped_array") @Schema(name = "name_wrapped_array", required = false) + @JsonProperty("name_wrapped_array") public List getNameWrappedArray() { return nameWrappedArray; } @@ -344,9 +344,9 @@ public XmlItem prefixString(String prefixString) { * Get prefixString * @return prefixString */ - @JsonProperty("prefix_string") @Schema(name = "prefix_string", example = "string", required = false) + @JsonProperty("prefix_string") public String getPrefixString() { return prefixString; } @@ -364,9 +364,9 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) { * Get prefixNumber * @return prefixNumber */ - @JsonProperty("prefix_number") @Valid @Schema(name = "prefix_number", example = "1.234", required = false) + @JsonProperty("prefix_number") public BigDecimal getPrefixNumber() { return prefixNumber; } @@ -384,9 +384,9 @@ public XmlItem prefixInteger(Integer prefixInteger) { * Get prefixInteger * @return prefixInteger */ - @JsonProperty("prefix_integer") @Schema(name = "prefix_integer", example = "-2", required = false) + @JsonProperty("prefix_integer") public Integer getPrefixInteger() { return prefixInteger; } @@ -404,9 +404,9 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) { * Get prefixBoolean * @return prefixBoolean */ - @JsonProperty("prefix_boolean") @Schema(name = "prefix_boolean", example = "true", required = false) + @JsonProperty("prefix_boolean") public Boolean getPrefixBoolean() { return prefixBoolean; } @@ -432,9 +432,9 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) { * Get prefixArray * @return prefixArray */ - @JsonProperty("prefix_array") @Schema(name = "prefix_array", required = false) + @JsonProperty("prefix_array") public List getPrefixArray() { return prefixArray; } @@ -460,9 +460,9 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) { * Get prefixWrappedArray * @return prefixWrappedArray */ - @JsonProperty("prefix_wrapped_array") @Schema(name = "prefix_wrapped_array", required = false) + @JsonProperty("prefix_wrapped_array") public List getPrefixWrappedArray() { return prefixWrappedArray; } @@ -480,9 +480,9 @@ public XmlItem namespaceString(String namespaceString) { * Get namespaceString * @return namespaceString */ - @JsonProperty("namespace_string") @Schema(name = "namespace_string", example = "string", required = false) + @JsonProperty("namespace_string") public String getNamespaceString() { return namespaceString; } @@ -500,9 +500,9 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) { * Get namespaceNumber * @return namespaceNumber */ - @JsonProperty("namespace_number") @Valid @Schema(name = "namespace_number", example = "1.234", required = false) + @JsonProperty("namespace_number") public BigDecimal getNamespaceNumber() { return namespaceNumber; } @@ -520,9 +520,9 @@ public XmlItem namespaceInteger(Integer namespaceInteger) { * Get namespaceInteger * @return namespaceInteger */ - @JsonProperty("namespace_integer") @Schema(name = "namespace_integer", example = "-2", required = false) + @JsonProperty("namespace_integer") public Integer getNamespaceInteger() { return namespaceInteger; } @@ -540,9 +540,9 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) { * Get namespaceBoolean * @return namespaceBoolean */ - @JsonProperty("namespace_boolean") @Schema(name = "namespace_boolean", example = "true", required = false) + @JsonProperty("namespace_boolean") public Boolean getNamespaceBoolean() { return namespaceBoolean; } @@ -568,9 +568,9 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) { * Get namespaceArray * @return namespaceArray */ - @JsonProperty("namespace_array") @Schema(name = "namespace_array", required = false) + @JsonProperty("namespace_array") public List getNamespaceArray() { return namespaceArray; } @@ -596,9 +596,9 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) { * Get namespaceWrappedArray * @return namespaceWrappedArray */ - @JsonProperty("namespace_wrapped_array") @Schema(name = "namespace_wrapped_array", required = false) + @JsonProperty("namespace_wrapped_array") public List getNamespaceWrappedArray() { return namespaceWrappedArray; } @@ -616,9 +616,9 @@ public XmlItem prefixNsString(String prefixNsString) { * Get prefixNsString * @return prefixNsString */ - @JsonProperty("prefix_ns_string") @Schema(name = "prefix_ns_string", example = "string", required = false) + @JsonProperty("prefix_ns_string") public String getPrefixNsString() { return prefixNsString; } @@ -636,9 +636,9 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) { * Get prefixNsNumber * @return prefixNsNumber */ - @JsonProperty("prefix_ns_number") @Valid @Schema(name = "prefix_ns_number", example = "1.234", required = false) + @JsonProperty("prefix_ns_number") public BigDecimal getPrefixNsNumber() { return prefixNsNumber; } @@ -656,9 +656,9 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) { * Get prefixNsInteger * @return prefixNsInteger */ - @JsonProperty("prefix_ns_integer") @Schema(name = "prefix_ns_integer", example = "-2", required = false) + @JsonProperty("prefix_ns_integer") public Integer getPrefixNsInteger() { return prefixNsInteger; } @@ -676,9 +676,9 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) { * Get prefixNsBoolean * @return prefixNsBoolean */ - @JsonProperty("prefix_ns_boolean") @Schema(name = "prefix_ns_boolean", example = "true", required = false) + @JsonProperty("prefix_ns_boolean") public Boolean getPrefixNsBoolean() { return prefixNsBoolean; } @@ -704,9 +704,9 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) { * Get prefixNsArray * @return prefixNsArray */ - @JsonProperty("prefix_ns_array") @Schema(name = "prefix_ns_array", required = false) + @JsonProperty("prefix_ns_array") public List getPrefixNsArray() { return prefixNsArray; } @@ -732,9 +732,9 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) { * Get prefixNsWrappedArray * @return prefixNsWrappedArray */ - @JsonProperty("prefix_ns_wrapped_array") @Schema(name = "prefix_ns_wrapped_array", required = false) + @JsonProperty("prefix_ns_wrapped_array") public List getPrefixNsWrappedArray() { return prefixNsWrappedArray; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml index 2999e6f2f8d6..5fdcfc33eada 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml @@ -2111,7 +2111,6 @@ components: status: description: Updated status of the pet type: string - type: object uploadFile_request: properties: additionalMetadata: @@ -2121,7 +2120,6 @@ components: description: file to upload format: binary type: string - type: object testEnumParameters_request: properties: enum_form_string_array: @@ -2141,7 +2139,6 @@ components: - -efg - (xyz) type: string - type: object testEndpointParameters_request: properties: integer: @@ -2214,7 +2211,6 @@ components: - double - number - pattern_without_delimiter - type: object testJsonFormData_request: properties: param: @@ -2226,7 +2222,6 @@ components: required: - param - param2 - type: object uploadFileWithRequiredFile_request: properties: additionalMetadata: @@ -2238,7 +2233,6 @@ components: type: string required: - requiredFile - type: object Dog_allOf: properties: breed: diff --git a/samples/openapi3/server/petstore/springboot-reactive/.openapi-generator/FILES b/samples/openapi3/server/petstore/springboot-reactive/.openapi-generator/FILES index 1fc07e54e680..0ed351e7bdaf 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/.openapi-generator/FILES +++ b/samples/openapi3/server/petstore/springboot-reactive/.openapi-generator/FILES @@ -21,7 +21,6 @@ src/main/java/org/openapitools/api/StoreApiDelegate.java src/main/java/org/openapitools/api/UserApi.java src/main/java/org/openapitools/api/UserApiController.java src/main/java/org/openapitools/api/UserApiDelegate.java -src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java src/main/java/org/openapitools/model/AdditionalPropertiesArray.java diff --git a/samples/openapi3/server/petstore/springboot-reactive/.openapi-generator/VERSION b/samples/openapi3/server/petstore/springboot-reactive/.openapi-generator/VERSION index d6b4ec4aa783..ed829dbcddec 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/.openapi-generator/VERSION +++ b/samples/openapi3/server/petstore/springboot-reactive/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0-SNAPSHOT \ No newline at end of file +6.2.1-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java index 66d3dc150993..41a409aa15dd 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApiController.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApiController.java index e27e2fc20ea9..7c3f20492479 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApiController.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApiController.java @@ -27,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class AnotherFakeApiController implements AnotherFakeApi { private final AnotherFakeApiDelegate delegate; 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 1a9631a15ada..45345657e8fd 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiController.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiController.java index 726b17779f18..8e624ba5fb59 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiController.java @@ -37,7 +37,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeApiController implements FakeApi { private final FakeApiDelegate delegate; diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 2baae42af1b0..2f85e6df84de 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java index 21e28fe8b213..48a276daf130 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java @@ -27,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeClassnameTestApiController implements FakeClassnameTestApi { private final FakeClassnameTestApiDelegate delegate; 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 e5bb02ffaffc..859a0eec04dd 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiController.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiController.java index 5ef3de965ff8..e27c4c3b49d6 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiController.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiController.java @@ -29,7 +29,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class PetApiController implements PetApi { private final PetApiDelegate delegate; diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java index 3e9c0e7217e2..2bb36d80331c 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiController.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiController.java index e9e29a41b4f9..8c3b33a99af6 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiController.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiController.java @@ -28,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class StoreApiController implements StoreApi { private final StoreApiDelegate delegate; diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java index fb9f62f466fe..c2ca0b02dd40 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApiController.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApiController.java index 1b48d4a9444b..58511a07291c 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApiController.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApiController.java @@ -29,7 +29,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class UserApiController implements UserApi { private final UserApiDelegate delegate; diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index e45a52c7a8af..62bd9f2bdf5f 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -34,9 +34,9 @@ public AdditionalPropertiesAnyType name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index ff8e902ab955..774a995fa648 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -35,9 +35,9 @@ public AdditionalPropertiesArray name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index c21068182c49..e46980d51924 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -34,9 +34,9 @@ public AdditionalPropertiesBoolean name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index c43432f178b1..2987ecb804c9 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -72,9 +72,9 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt * Get mapString * @return mapString */ - @JsonProperty("map_string") @Schema(name = "map_string", required = false) + @JsonProperty("map_string") public Map getMapString() { return mapString; } @@ -100,9 +100,9 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * Get mapNumber * @return mapNumber */ - @JsonProperty("map_number") @Valid @Schema(name = "map_number", required = false) + @JsonProperty("map_number") public Map getMapNumber() { return mapNumber; } @@ -128,9 +128,9 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege * Get mapInteger * @return mapInteger */ - @JsonProperty("map_integer") @Schema(name = "map_integer", required = false) + @JsonProperty("map_integer") public Map getMapInteger() { return mapInteger; } @@ -156,9 +156,9 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea * Get mapBoolean * @return mapBoolean */ - @JsonProperty("map_boolean") @Schema(name = "map_boolean", required = false) + @JsonProperty("map_boolean") public Map getMapBoolean() { return mapBoolean; } @@ -184,9 +184,9 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { return mapArrayInteger; } @@ -212,9 +212,9 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * Get mapArrayAnytype * @return mapArrayAnytype */ - @JsonProperty("map_array_anytype") @Valid @Schema(name = "map_array_anytype", required = false) + @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { return mapArrayAnytype; } @@ -240,9 +240,9 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { return mapMapString; } @@ -268,9 +268,9 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { return mapMapAnytype; } @@ -288,9 +288,9 @@ public AdditionalPropertiesClass anytype1(Object anytype1) { * Get anytype1 * @return anytype1 */ - @JsonProperty("anytype_1") @Schema(name = "anytype_1", required = false) + @JsonProperty("anytype_1") public Object getAnytype1() { return anytype1; } @@ -308,9 +308,9 @@ public AdditionalPropertiesClass anytype2(Object anytype2) { * Get anytype2 * @return anytype2 */ - @JsonProperty("anytype_2") @Schema(name = "anytype_2", required = false) + @JsonProperty("anytype_2") public Object getAnytype2() { return anytype2; } @@ -328,9 +328,9 @@ public AdditionalPropertiesClass anytype3(Object anytype3) { * Get anytype3 * @return anytype3 */ - @JsonProperty("anytype_3") @Schema(name = "anytype_3", required = false) + @JsonProperty("anytype_3") public Object getAnytype3() { return anytype3; } diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index d4fe82193e30..5f8b17f159fd 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -34,9 +34,9 @@ public AdditionalPropertiesInteger name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 11f9dda21f3f..a02c1a6284ec 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -35,9 +35,9 @@ public AdditionalPropertiesNumber name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index ce4f9f1ff862..b3c54932d1a6 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -34,9 +34,9 @@ public AdditionalPropertiesObject name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 2669a2e08d51..50ebbaf82d5a 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -34,9 +34,9 @@ public AdditionalPropertiesString name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Animal.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Animal.java index 50eb6fe3c62b..f045573f0903 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Animal.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Animal.java @@ -51,9 +51,9 @@ public Animal className(String className) { * Get className * @return className */ - @JsonProperty("className") @NotNull @Schema(name = "className", required = true) + @JsonProperty("className") public String getClassName() { return className; } @@ -71,9 +71,9 @@ public Animal color(String color) { * Get color * @return color */ - @JsonProperty("color") @Schema(name = "color", required = false) + @JsonProperty("color") public String getColor() { return color; } diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 99f5ef3aa439..ed60f2697f52 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -44,9 +44,9 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * Get arrayArrayNumber * @return arrayArrayNumber */ - @JsonProperty("ArrayArrayNumber") @Valid @Schema(name = "ArrayArrayNumber", required = false) + @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 563d0dc0f933..8e2d978eb5b9 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -44,9 +44,9 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ - @JsonProperty("ArrayNumber") @Valid @Schema(name = "ArrayNumber", required = false) + @JsonProperty("ArrayNumber") public List getArrayNumber() { return arrayNumber; } diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayTest.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayTest.java index 839cf3ac40ab..576f202a0210 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayTest.java @@ -50,9 +50,9 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) { * Get arrayOfString * @return arrayOfString */ - @JsonProperty("array_of_string") @Schema(name = "array_of_string", required = false) + @JsonProperty("array_of_string") public List getArrayOfString() { return arrayOfString; } @@ -78,9 +78,9 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ - @JsonProperty("array_array_of_integer") @Valid @Schema(name = "array_array_of_integer", required = false) + @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; } @@ -106,9 +106,9 @@ public ArrayTest addArrayArrayOfModelItem(List arrayArrayOfModelI * Get arrayArrayOfModel * @return arrayArrayOfModel */ - @JsonProperty("array_array_of_model") @Valid @Schema(name = "array_array_of_model", required = false) + @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCat.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCat.java index e0b22753e9e8..2dd10a30ea9a 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCat.java @@ -77,9 +77,9 @@ public BigCat kind(KindEnum kind) { * Get kind * @return kind */ - @JsonProperty("kind") @Schema(name = "kind", required = false) + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCatAllOf.java index 3b0788b0b304..a29d08eadf7f 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCatAllOf.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCatAllOf.java @@ -74,9 +74,9 @@ public BigCatAllOf kind(KindEnum kind) { * Get kind * @return kind */ - @JsonProperty("kind") @Schema(name = "kind", required = false) + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Capitalization.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Capitalization.java index 7270c14a949f..e6c6b39b3e8d 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Capitalization.java @@ -42,9 +42,9 @@ public Capitalization smallCamel(String smallCamel) { * Get smallCamel * @return smallCamel */ - @JsonProperty("smallCamel") @Schema(name = "smallCamel", required = false) + @JsonProperty("smallCamel") public String getSmallCamel() { return smallCamel; } @@ -62,9 +62,9 @@ public Capitalization capitalCamel(String capitalCamel) { * Get capitalCamel * @return capitalCamel */ - @JsonProperty("CapitalCamel") @Schema(name = "CapitalCamel", required = false) + @JsonProperty("CapitalCamel") public String getCapitalCamel() { return capitalCamel; } @@ -82,9 +82,9 @@ public Capitalization smallSnake(String smallSnake) { * Get smallSnake * @return smallSnake */ - @JsonProperty("small_Snake") @Schema(name = "small_Snake", required = false) + @JsonProperty("small_Snake") public String getSmallSnake() { return smallSnake; } @@ -102,9 +102,9 @@ public Capitalization capitalSnake(String capitalSnake) { * Get capitalSnake * @return capitalSnake */ - @JsonProperty("Capital_Snake") @Schema(name = "Capital_Snake", required = false) + @JsonProperty("Capital_Snake") public String getCapitalSnake() { return capitalSnake; } @@ -122,9 +122,9 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) { * Get scAETHFlowPoints * @return scAETHFlowPoints */ - @JsonProperty("SCA_ETH_Flow_Points") @Schema(name = "SCA_ETH_Flow_Points", required = false) + @JsonProperty("SCA_ETH_Flow_Points") public String getScAETHFlowPoints() { return scAETHFlowPoints; } @@ -142,9 +142,9 @@ public Capitalization ATT_NAME(String ATT_NAME) { * Name of the pet * @return ATT_NAME */ - @JsonProperty("ATT_NAME") @Schema(name = "ATT_NAME", description = "Name of the pet ", required = false) + @JsonProperty("ATT_NAME") public String getATTNAME() { return ATT_NAME; } diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Cat.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Cat.java index d1bb205b11b3..6a5ec912b5b5 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Cat.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Cat.java @@ -46,9 +46,9 @@ public Cat declawed(Boolean declawed) { * Get declawed * @return declawed */ - @JsonProperty("declawed") @Schema(name = "declawed", required = false) + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/CatAllOf.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/CatAllOf.java index b7a7ed5def6a..0647507cd05e 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/CatAllOf.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/CatAllOf.java @@ -34,9 +34,9 @@ public CatAllOf declawed(Boolean declawed) { * Get declawed * @return declawed */ - @JsonProperty("declawed") @Schema(name = "declawed", required = false) + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Category.java index 9b1acc5a5c07..4d6450b7b2af 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Category.java @@ -34,9 +34,9 @@ public Category id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -54,9 +54,9 @@ public Category name(String name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @Schema(name = "name", required = true) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ClassModel.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ClassModel.java index 20f5e2de16dd..4c5aac3991ab 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ClassModel.java @@ -33,9 +33,9 @@ public ClassModel propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ - @JsonProperty("_class") @Schema(name = "_class", required = false) + @JsonProperty("_class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Client.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Client.java index 11ed7ead459c..98e9244f3922 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Client.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Client.java @@ -32,9 +32,9 @@ public Client client(String client) { * Get client * @return client */ - @JsonProperty("client") @Schema(name = "client", required = false) + @JsonProperty("client") public String getClient() { return client; } diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Dog.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Dog.java index b0f901978716..63ff356bf3f5 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Dog.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Dog.java @@ -37,9 +37,9 @@ public Dog breed(String breed) { * Get breed * @return breed */ - @JsonProperty("breed") @Schema(name = "breed", required = false) + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/DogAllOf.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/DogAllOf.java index 097dc159ee65..be10fcc8175e 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/DogAllOf.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/DogAllOf.java @@ -34,9 +34,9 @@ public DogAllOf breed(String breed) { * Get breed * @return breed */ - @JsonProperty("breed") @Schema(name = "breed", required = false) + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumArrays.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumArrays.java index cb84a65b9e1c..fb2769e537ca 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumArrays.java @@ -108,9 +108,9 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) { * Get justSymbol * @return justSymbol */ - @JsonProperty("just_symbol") @Schema(name = "just_symbol", required = false) + @JsonProperty("just_symbol") public JustSymbolEnum getJustSymbol() { return justSymbol; } @@ -136,9 +136,9 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) { * Get arrayEnum * @return arrayEnum */ - @JsonProperty("array_enum") @Schema(name = "array_enum", required = false) + @JsonProperty("array_enum") public List getArrayEnum() { return arrayEnum; } diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumTest.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumTest.java index 2243d0fb1b8b..8e6d9e9fb8d1 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumTest.java @@ -188,9 +188,9 @@ public EnumTest enumString(EnumStringEnum enumString) { * Get enumString * @return enumString */ - @JsonProperty("enum_string") @Schema(name = "enum_string", required = false) + @JsonProperty("enum_string") public EnumStringEnum getEnumString() { return enumString; } @@ -208,9 +208,9 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) { * Get enumStringRequired * @return enumStringRequired */ - @JsonProperty("enum_string_required") @NotNull @Schema(name = "enum_string_required", required = true) + @JsonProperty("enum_string_required") public EnumStringRequiredEnum getEnumStringRequired() { return enumStringRequired; } @@ -228,9 +228,9 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) { * Get enumInteger * @return enumInteger */ - @JsonProperty("enum_integer") @Schema(name = "enum_integer", required = false) + @JsonProperty("enum_integer") public EnumIntegerEnum getEnumInteger() { return enumInteger; } @@ -248,9 +248,9 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) { * Get enumNumber * @return enumNumber */ - @JsonProperty("enum_number") @Schema(name = "enum_number", required = false) + @JsonProperty("enum_number") public EnumNumberEnum getEnumNumber() { return enumNumber; } @@ -268,9 +268,9 @@ public EnumTest outerEnum(OuterEnum outerEnum) { * Get outerEnum * @return outerEnum */ - @JsonProperty("outerEnum") @Valid @Schema(name = "outerEnum", required = false) + @JsonProperty("outerEnum") public OuterEnum getOuterEnum() { return outerEnum; } diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/File.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/File.java index 7d0f08137a62..dbdc0c147803 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/File.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/File.java @@ -33,9 +33,9 @@ public File sourceURI(String sourceURI) { * Test capitalization * @return sourceURI */ - @JsonProperty("sourceURI") @Schema(name = "sourceURI", description = "Test capitalization", required = false) + @JsonProperty("sourceURI") public String getSourceURI() { return sourceURI; } diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 50df4bf463a8..e4378be9ee0f 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -38,9 +38,9 @@ public FileSchemaTestClass file(File file) { * Get file * @return file */ - @JsonProperty("file") @Valid @Schema(name = "file", required = false) + @JsonProperty("file") public File getFile() { return file; } @@ -66,9 +66,9 @@ public FileSchemaTestClass addFilesItem(File filesItem) { * Get files * @return files */ - @JsonProperty("files") @Valid @Schema(name = "files", required = false) + @JsonProperty("files") public List getFiles() { return files; } 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 c9ae6ace8274..1bf83a5a5091 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 @@ -70,9 +70,9 @@ public FormatTest integer(Integer integer) { * maximum: 100 * @return integer */ - @JsonProperty("integer") @Min(10) @Max(100) @Schema(name = "integer", required = false) + @JsonProperty("integer") public Integer getInteger() { return integer; } @@ -92,9 +92,9 @@ public FormatTest int32(Integer int32) { * maximum: 200 * @return int32 */ - @JsonProperty("int32") @Min(20) @Max(200) @Schema(name = "int32", required = false) + @JsonProperty("int32") public Integer getInt32() { return int32; } @@ -112,9 +112,9 @@ public FormatTest int64(Long int64) { * Get int64 * @return int64 */ - @JsonProperty("int64") @Schema(name = "int64", required = false) + @JsonProperty("int64") public Long getInt64() { return int64; } @@ -134,9 +134,9 @@ public FormatTest number(BigDecimal number) { * maximum: 543.2 * @return number */ - @JsonProperty("number") @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") @Schema(name = "number", required = true) + @JsonProperty("number") public BigDecimal getNumber() { return number; } @@ -156,9 +156,9 @@ public FormatTest _float(Float _float) { * maximum: 987.6 * @return _float */ - @JsonProperty("float") @DecimalMin("54.3") @DecimalMax("987.6") @Schema(name = "float", required = false) + @JsonProperty("float") public Float getFloat() { return _float; } @@ -178,9 +178,9 @@ public FormatTest _double(Double _double) { * maximum: 123.4 * @return _double */ - @JsonProperty("double") @DecimalMin("67.8") @DecimalMax("123.4") @Schema(name = "double", required = false) + @JsonProperty("double") public Double getDouble() { return _double; } @@ -198,9 +198,9 @@ public FormatTest string(String string) { * Get string * @return string */ - @JsonProperty("string") @Pattern(regexp = "/[a-z]/i") @Schema(name = "string", required = false) + @JsonProperty("string") public String getString() { return string; } @@ -218,9 +218,9 @@ public FormatTest _byte(byte[] _byte) { * Get _byte * @return _byte */ - @JsonProperty("byte") @NotNull @Schema(name = "byte", required = true) + @JsonProperty("byte") public byte[] getByte() { return _byte; } @@ -238,9 +238,9 @@ public FormatTest binary(org.springframework.core.io.Resource binary) { * Get binary * @return binary */ - @JsonProperty("binary") @Valid @Schema(name = "binary", required = false) + @JsonProperty("binary") public org.springframework.core.io.Resource getBinary() { return binary; } @@ -258,9 +258,9 @@ public FormatTest date(LocalDate date) { * Get date * @return date */ - @JsonProperty("date") @NotNull @Valid @Schema(name = "date", required = true) + @JsonProperty("date") public LocalDate getDate() { return date; } @@ -278,9 +278,9 @@ public FormatTest dateTime(OffsetDateTime dateTime) { * Get dateTime * @return dateTime */ - @JsonProperty("dateTime") @Valid @Schema(name = "dateTime", required = false) + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -298,9 +298,9 @@ public FormatTest uuid(UUID uuid) { * Get uuid * @return uuid */ - @JsonProperty("uuid") @Valid @Schema(name = "uuid", example = "72f98069-206d-4f12-9f12-3d1e525a8e84", required = false) + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -318,9 +318,9 @@ public FormatTest password(String password) { * Get password * @return password */ - @JsonProperty("password") @NotNull @Size(min = 10, max = 64) @Schema(name = "password", required = true) + @JsonProperty("password") public String getPassword() { return password; } @@ -338,9 +338,9 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) { * Get bigDecimal * @return bigDecimal */ - @JsonProperty("BigDecimal") @Valid @Schema(name = "BigDecimal", required = false) + @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { return bigDecimal; } diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index aa8c3ee2514a..0a04cd2d070c 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -36,9 +36,9 @@ public HasOnlyReadOnly bar(String bar) { * Get bar * @return bar */ - @JsonProperty("bar") @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, required = false) + @JsonProperty("bar") public String getBar() { return bar; } @@ -56,9 +56,9 @@ public HasOnlyReadOnly foo(String foo) { * Get foo * @return foo */ - @JsonProperty("foo") @Schema(name = "foo", accessMode = Schema.AccessMode.READ_ONLY, required = false) + @JsonProperty("foo") public String getFoo() { return foo; } diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MapTest.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MapTest.java index 594021c36d2d..4cfeaeb6c63d 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MapTest.java @@ -88,9 +88,9 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapMapOfString * @return mapMapOfString */ - @JsonProperty("map_map_of_string") @Valid @Schema(name = "map_map_of_string", required = false) + @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { return mapMapOfString; } @@ -116,9 +116,9 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) * Get mapOfEnumString * @return mapOfEnumString */ - @JsonProperty("map_of_enum_string") @Schema(name = "map_of_enum_string", required = false) + @JsonProperty("map_of_enum_string") public Map getMapOfEnumString() { return mapOfEnumString; } @@ -144,9 +144,9 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) { * Get directMap * @return directMap */ - @JsonProperty("direct_map") @Schema(name = "direct_map", required = false) + @JsonProperty("direct_map") public Map getDirectMap() { return directMap; } @@ -172,9 +172,9 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) { * Get indirectMap * @return indirectMap */ - @JsonProperty("indirect_map") @Schema(name = "indirect_map", required = false) + @JsonProperty("indirect_map") public Map getIndirectMap() { return indirectMap; } diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index af4644ee1fd8..12e8bd36800c 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -44,9 +44,9 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { * Get uuid * @return uuid */ - @JsonProperty("uuid") @Valid @Schema(name = "uuid", required = false) + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -64,9 +64,9 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT * Get dateTime * @return dateTime */ - @JsonProperty("dateTime") @Valid @Schema(name = "dateTime", required = false) + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -92,9 +92,9 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * Get map * @return map */ - @JsonProperty("map") @Valid @Schema(name = "map", required = false) + @JsonProperty("map") public Map getMap() { return map; } diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Model200Response.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Model200Response.java index 329840fd1cd5..08bb506f2bd3 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Model200Response.java @@ -37,9 +37,9 @@ public Model200Response name(Integer name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public Integer getName() { return name; } @@ -57,9 +57,9 @@ public Model200Response propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ - @JsonProperty("class") @Schema(name = "class", required = false) + @JsonProperty("class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java index 14ea90b13917..4851d6074c2f 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -38,9 +38,9 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ - @JsonProperty("code") @Schema(name = "code", required = false) + @JsonProperty("code") public Integer getCode() { return code; } @@ -58,9 +58,9 @@ public ModelApiResponse type(String type) { * Get type * @return type */ - @JsonProperty("type") @Schema(name = "type", required = false) + @JsonProperty("type") public String getType() { return type; } @@ -78,9 +78,9 @@ public ModelApiResponse message(String message) { * Get message * @return message */ - @JsonProperty("message") @Schema(name = "message", required = false) + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelList.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelList.java index 1e0bcffc220c..cf953ee17e25 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelList.java @@ -34,9 +34,9 @@ public ModelList _123list(String _123list) { * Get _123list * @return _123list */ - @JsonProperty("123-list") @Schema(name = "123-list", required = false) + @JsonProperty("123-list") public String get123list() { return _123list; } diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelReturn.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelReturn.java index 90b17a6d6850..d863cf8d63fe 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelReturn.java @@ -35,9 +35,9 @@ public ModelReturn _return(Integer _return) { * Get _return * @return _return */ - @JsonProperty("return") @Schema(name = "return", required = false) + @JsonProperty("return") public Integer getReturn() { return _return; } diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Name.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Name.java index bcbb5aab0f79..ad984399e918 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Name.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Name.java @@ -39,9 +39,9 @@ public Name name(Integer name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @Schema(name = "name", required = true) + @JsonProperty("name") public Integer getName() { return name; } @@ -59,9 +59,9 @@ public Name snakeCase(Integer snakeCase) { * Get snakeCase * @return snakeCase */ - @JsonProperty("snake_case") @Schema(name = "snake_case", accessMode = Schema.AccessMode.READ_ONLY, required = false) + @JsonProperty("snake_case") public Integer getSnakeCase() { return snakeCase; } @@ -79,9 +79,9 @@ public Name property(String property) { * Get property * @return property */ - @JsonProperty("property") @Schema(name = "property", required = false) + @JsonProperty("property") public String getProperty() { return property; } @@ -99,9 +99,9 @@ public Name _123number(Integer _123number) { * Get _123number * @return _123number */ - @JsonProperty("123Number") @Schema(name = "123Number", accessMode = Schema.AccessMode.READ_ONLY, required = false) + @JsonProperty("123Number") public Integer get123number() { return _123number; } diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NumberOnly.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NumberOnly.java index a597943a3ef7..23b2cdff8675 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NumberOnly.java @@ -33,9 +33,9 @@ public NumberOnly justNumber(BigDecimal justNumber) { * Get justNumber * @return justNumber */ - @JsonProperty("JustNumber") @Valid @Schema(name = "JustNumber", required = false) + @JsonProperty("JustNumber") public BigDecimal getJustNumber() { return justNumber; } diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Order.java index 10e257004cf9..0167b80e837c 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Order.java @@ -83,9 +83,9 @@ public Order id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -103,9 +103,9 @@ public Order petId(Long petId) { * Get petId * @return petId */ - @JsonProperty("petId") @Schema(name = "petId", required = false) + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -123,9 +123,9 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ - @JsonProperty("quantity") @Schema(name = "quantity", required = false) + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -143,9 +143,9 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ - @JsonProperty("shipDate") @Valid @Schema(name = "shipDate", required = false) + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -163,9 +163,9 @@ public Order status(StatusEnum status) { * Order Status * @return status */ - @JsonProperty("status") @Schema(name = "status", description = "Order Status", required = false) + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -183,9 +183,9 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ - @JsonProperty("complete") @Schema(name = "complete", required = false) + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/OuterComposite.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/OuterComposite.java index da3403158231..4f01a0edad71 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/OuterComposite.java @@ -37,9 +37,9 @@ public OuterComposite myNumber(BigDecimal myNumber) { * Get myNumber * @return myNumber */ - @JsonProperty("my_number") @Valid @Schema(name = "my_number", required = false) + @JsonProperty("my_number") public BigDecimal getMyNumber() { return myNumber; } @@ -57,9 +57,9 @@ public OuterComposite myString(String myString) { * Get myString * @return myString */ - @JsonProperty("my_string") @Schema(name = "my_string", required = false) + @JsonProperty("my_string") public String getMyString() { return myString; } @@ -77,9 +77,9 @@ public OuterComposite myBoolean(Boolean myBoolean) { * Get myBoolean * @return myBoolean */ - @JsonProperty("my_boolean") @Schema(name = "my_boolean", required = false) + @JsonProperty("my_boolean") public Boolean getMyBoolean() { return myBoolean; } diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java index edfea99a4441..27219d2daa74 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java @@ -89,9 +89,9 @@ public Pet id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -109,9 +109,9 @@ public Pet category(Category category) { * Get category * @return category */ - @JsonProperty("category") @Valid @Schema(name = "category", required = false) + @JsonProperty("category") public Category getCategory() { return category; } @@ -129,9 +129,9 @@ public Pet name(String name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @Schema(name = "name", example = "doggie", required = true) + @JsonProperty("name") public String getName() { return name; } @@ -154,9 +154,9 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ - @JsonProperty("photoUrls") @NotNull @Schema(name = "photoUrls", required = true) + @JsonProperty("photoUrls") public Set getPhotoUrls() { return photoUrls; } @@ -183,9 +183,9 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @JsonProperty("tags") @Valid @Schema(name = "tags", required = false) + @JsonProperty("tags") public List getTags() { return tags; } @@ -203,9 +203,9 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ - @JsonProperty("status") @Schema(name = "status", description = "pet status in the store", required = false) + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java index 5bb864fdfdf9..78d279153054 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -34,9 +34,9 @@ public ReadOnlyFirst bar(String bar) { * Get bar * @return bar */ - @JsonProperty("bar") @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, required = false) + @JsonProperty("bar") public String getBar() { return bar; } @@ -54,9 +54,9 @@ public ReadOnlyFirst baz(String baz) { * Get baz * @return baz */ - @JsonProperty("baz") @Schema(name = "baz", required = false) + @JsonProperty("baz") public String getBaz() { return baz; } diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/SpecialModelName.java index d30f01ffd4ce..85284bda0ff2 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/SpecialModelName.java @@ -34,9 +34,9 @@ public class SpecialModelName { * Get $specialPropertyName * @return $specialPropertyName */ - @JsonProperty("$special[property.name]") @Schema(name = "$special[property.name]", required = false) + @JsonProperty("$special[property.name]") public Long get$SpecialPropertyName() { return $specialPropertyName; } diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Tag.java index 7e0f150664d9..fd2a0db14b5d 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Tag.java @@ -34,9 +34,9 @@ public Tag id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -54,9 +54,9 @@ public Tag name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java index 151d7623b25f..230033993752 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -44,9 +44,9 @@ public TypeHolderDefault stringItem(String stringItem) { * Get stringItem * @return stringItem */ - @JsonProperty("string_item") @NotNull @Schema(name = "string_item", required = true) + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -64,9 +64,9 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ - @JsonProperty("number_item") @NotNull @Valid @Schema(name = "number_item", required = true) + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -84,9 +84,9 @@ public TypeHolderDefault integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ - @JsonProperty("integer_item") @NotNull @Schema(name = "integer_item", required = true) + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -104,9 +104,9 @@ public TypeHolderDefault boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ - @JsonProperty("bool_item") @NotNull @Schema(name = "bool_item", required = true) + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -129,9 +129,9 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ - @JsonProperty("array_item") @NotNull @Schema(name = "array_item", required = true) + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java index 7239836800df..964c94fd5627 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -46,9 +46,9 @@ public TypeHolderExample stringItem(String stringItem) { * Get stringItem * @return stringItem */ - @JsonProperty("string_item") @NotNull @Schema(name = "string_item", example = "what", required = true) + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -66,9 +66,9 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ - @JsonProperty("number_item") @NotNull @Valid @Schema(name = "number_item", example = "1.234", required = true) + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -86,9 +86,9 @@ public TypeHolderExample floatItem(Float floatItem) { * Get floatItem * @return floatItem */ - @JsonProperty("float_item") @NotNull @Schema(name = "float_item", example = "1.234", required = true) + @JsonProperty("float_item") public Float getFloatItem() { return floatItem; } @@ -106,9 +106,9 @@ public TypeHolderExample integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ - @JsonProperty("integer_item") @NotNull @Schema(name = "integer_item", example = "-2", required = true) + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -126,9 +126,9 @@ public TypeHolderExample boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ - @JsonProperty("bool_item") @NotNull @Schema(name = "bool_item", example = "true", required = true) + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -151,9 +151,9 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ - @JsonProperty("array_item") @NotNull @Schema(name = "array_item", example = "[0, 1, 2, 3]", required = true) + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/User.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/User.java index eb52ac9bab84..68e52752bfbe 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/User.java @@ -46,9 +46,9 @@ public User id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -66,9 +66,9 @@ public User username(String username) { * Get username * @return username */ - @JsonProperty("username") @Schema(name = "username", required = false) + @JsonProperty("username") public String getUsername() { return username; } @@ -86,9 +86,9 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ - @JsonProperty("firstName") @Schema(name = "firstName", required = false) + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -106,9 +106,9 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ - @JsonProperty("lastName") @Schema(name = "lastName", required = false) + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -126,9 +126,9 @@ public User email(String email) { * Get email * @return email */ - @JsonProperty("email") @Schema(name = "email", required = false) + @JsonProperty("email") public String getEmail() { return email; } @@ -146,9 +146,9 @@ public User password(String password) { * Get password * @return password */ - @JsonProperty("password") @Schema(name = "password", required = false) + @JsonProperty("password") public String getPassword() { return password; } @@ -166,9 +166,9 @@ public User phone(String phone) { * Get phone * @return phone */ - @JsonProperty("phone") @Schema(name = "phone", required = false) + @JsonProperty("phone") public String getPhone() { return phone; } @@ -186,9 +186,9 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ - @JsonProperty("userStatus") @Schema(name = "userStatus", description = "User Status", required = false) + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/XmlItem.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/XmlItem.java index 4b287492cc75..19b62a5139ae 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/XmlItem.java @@ -100,9 +100,9 @@ public XmlItem attributeString(String attributeString) { * Get attributeString * @return attributeString */ - @JsonProperty("attribute_string") @Schema(name = "attribute_string", example = "string", required = false) + @JsonProperty("attribute_string") public String getAttributeString() { return attributeString; } @@ -120,9 +120,9 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) { * Get attributeNumber * @return attributeNumber */ - @JsonProperty("attribute_number") @Valid @Schema(name = "attribute_number", example = "1.234", required = false) + @JsonProperty("attribute_number") public BigDecimal getAttributeNumber() { return attributeNumber; } @@ -140,9 +140,9 @@ public XmlItem attributeInteger(Integer attributeInteger) { * Get attributeInteger * @return attributeInteger */ - @JsonProperty("attribute_integer") @Schema(name = "attribute_integer", example = "-2", required = false) + @JsonProperty("attribute_integer") public Integer getAttributeInteger() { return attributeInteger; } @@ -160,9 +160,9 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) { * Get attributeBoolean * @return attributeBoolean */ - @JsonProperty("attribute_boolean") @Schema(name = "attribute_boolean", example = "true", required = false) + @JsonProperty("attribute_boolean") public Boolean getAttributeBoolean() { return attributeBoolean; } @@ -188,9 +188,9 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) { * Get wrappedArray * @return wrappedArray */ - @JsonProperty("wrapped_array") @Schema(name = "wrapped_array", required = false) + @JsonProperty("wrapped_array") public List getWrappedArray() { return wrappedArray; } @@ -208,9 +208,9 @@ public XmlItem nameString(String nameString) { * Get nameString * @return nameString */ - @JsonProperty("name_string") @Schema(name = "name_string", example = "string", required = false) + @JsonProperty("name_string") public String getNameString() { return nameString; } @@ -228,9 +228,9 @@ public XmlItem nameNumber(BigDecimal nameNumber) { * Get nameNumber * @return nameNumber */ - @JsonProperty("name_number") @Valid @Schema(name = "name_number", example = "1.234", required = false) + @JsonProperty("name_number") public BigDecimal getNameNumber() { return nameNumber; } @@ -248,9 +248,9 @@ public XmlItem nameInteger(Integer nameInteger) { * Get nameInteger * @return nameInteger */ - @JsonProperty("name_integer") @Schema(name = "name_integer", example = "-2", required = false) + @JsonProperty("name_integer") public Integer getNameInteger() { return nameInteger; } @@ -268,9 +268,9 @@ public XmlItem nameBoolean(Boolean nameBoolean) { * Get nameBoolean * @return nameBoolean */ - @JsonProperty("name_boolean") @Schema(name = "name_boolean", example = "true", required = false) + @JsonProperty("name_boolean") public Boolean getNameBoolean() { return nameBoolean; } @@ -296,9 +296,9 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) { * Get nameArray * @return nameArray */ - @JsonProperty("name_array") @Schema(name = "name_array", required = false) + @JsonProperty("name_array") public List getNameArray() { return nameArray; } @@ -324,9 +324,9 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) { * Get nameWrappedArray * @return nameWrappedArray */ - @JsonProperty("name_wrapped_array") @Schema(name = "name_wrapped_array", required = false) + @JsonProperty("name_wrapped_array") public List getNameWrappedArray() { return nameWrappedArray; } @@ -344,9 +344,9 @@ public XmlItem prefixString(String prefixString) { * Get prefixString * @return prefixString */ - @JsonProperty("prefix_string") @Schema(name = "prefix_string", example = "string", required = false) + @JsonProperty("prefix_string") public String getPrefixString() { return prefixString; } @@ -364,9 +364,9 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) { * Get prefixNumber * @return prefixNumber */ - @JsonProperty("prefix_number") @Valid @Schema(name = "prefix_number", example = "1.234", required = false) + @JsonProperty("prefix_number") public BigDecimal getPrefixNumber() { return prefixNumber; } @@ -384,9 +384,9 @@ public XmlItem prefixInteger(Integer prefixInteger) { * Get prefixInteger * @return prefixInteger */ - @JsonProperty("prefix_integer") @Schema(name = "prefix_integer", example = "-2", required = false) + @JsonProperty("prefix_integer") public Integer getPrefixInteger() { return prefixInteger; } @@ -404,9 +404,9 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) { * Get prefixBoolean * @return prefixBoolean */ - @JsonProperty("prefix_boolean") @Schema(name = "prefix_boolean", example = "true", required = false) + @JsonProperty("prefix_boolean") public Boolean getPrefixBoolean() { return prefixBoolean; } @@ -432,9 +432,9 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) { * Get prefixArray * @return prefixArray */ - @JsonProperty("prefix_array") @Schema(name = "prefix_array", required = false) + @JsonProperty("prefix_array") public List getPrefixArray() { return prefixArray; } @@ -460,9 +460,9 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) { * Get prefixWrappedArray * @return prefixWrappedArray */ - @JsonProperty("prefix_wrapped_array") @Schema(name = "prefix_wrapped_array", required = false) + @JsonProperty("prefix_wrapped_array") public List getPrefixWrappedArray() { return prefixWrappedArray; } @@ -480,9 +480,9 @@ public XmlItem namespaceString(String namespaceString) { * Get namespaceString * @return namespaceString */ - @JsonProperty("namespace_string") @Schema(name = "namespace_string", example = "string", required = false) + @JsonProperty("namespace_string") public String getNamespaceString() { return namespaceString; } @@ -500,9 +500,9 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) { * Get namespaceNumber * @return namespaceNumber */ - @JsonProperty("namespace_number") @Valid @Schema(name = "namespace_number", example = "1.234", required = false) + @JsonProperty("namespace_number") public BigDecimal getNamespaceNumber() { return namespaceNumber; } @@ -520,9 +520,9 @@ public XmlItem namespaceInteger(Integer namespaceInteger) { * Get namespaceInteger * @return namespaceInteger */ - @JsonProperty("namespace_integer") @Schema(name = "namespace_integer", example = "-2", required = false) + @JsonProperty("namespace_integer") public Integer getNamespaceInteger() { return namespaceInteger; } @@ -540,9 +540,9 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) { * Get namespaceBoolean * @return namespaceBoolean */ - @JsonProperty("namespace_boolean") @Schema(name = "namespace_boolean", example = "true", required = false) + @JsonProperty("namespace_boolean") public Boolean getNamespaceBoolean() { return namespaceBoolean; } @@ -568,9 +568,9 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) { * Get namespaceArray * @return namespaceArray */ - @JsonProperty("namespace_array") @Schema(name = "namespace_array", required = false) + @JsonProperty("namespace_array") public List getNamespaceArray() { return namespaceArray; } @@ -596,9 +596,9 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) { * Get namespaceWrappedArray * @return namespaceWrappedArray */ - @JsonProperty("namespace_wrapped_array") @Schema(name = "namespace_wrapped_array", required = false) + @JsonProperty("namespace_wrapped_array") public List getNamespaceWrappedArray() { return namespaceWrappedArray; } @@ -616,9 +616,9 @@ public XmlItem prefixNsString(String prefixNsString) { * Get prefixNsString * @return prefixNsString */ - @JsonProperty("prefix_ns_string") @Schema(name = "prefix_ns_string", example = "string", required = false) + @JsonProperty("prefix_ns_string") public String getPrefixNsString() { return prefixNsString; } @@ -636,9 +636,9 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) { * Get prefixNsNumber * @return prefixNsNumber */ - @JsonProperty("prefix_ns_number") @Valid @Schema(name = "prefix_ns_number", example = "1.234", required = false) + @JsonProperty("prefix_ns_number") public BigDecimal getPrefixNsNumber() { return prefixNsNumber; } @@ -656,9 +656,9 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) { * Get prefixNsInteger * @return prefixNsInteger */ - @JsonProperty("prefix_ns_integer") @Schema(name = "prefix_ns_integer", example = "-2", required = false) + @JsonProperty("prefix_ns_integer") public Integer getPrefixNsInteger() { return prefixNsInteger; } @@ -676,9 +676,9 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) { * Get prefixNsBoolean * @return prefixNsBoolean */ - @JsonProperty("prefix_ns_boolean") @Schema(name = "prefix_ns_boolean", example = "true", required = false) + @JsonProperty("prefix_ns_boolean") public Boolean getPrefixNsBoolean() { return prefixNsBoolean; } @@ -704,9 +704,9 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) { * Get prefixNsArray * @return prefixNsArray */ - @JsonProperty("prefix_ns_array") @Schema(name = "prefix_ns_array", required = false) + @JsonProperty("prefix_ns_array") public List getPrefixNsArray() { return prefixNsArray; } @@ -732,9 +732,9 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) { * Get prefixNsWrappedArray * @return prefixNsWrappedArray */ - @JsonProperty("prefix_ns_wrapped_array") @Schema(name = "prefix_ns_wrapped_array", required = false) + @JsonProperty("prefix_ns_wrapped_array") public List getPrefixNsWrappedArray() { return prefixNsWrappedArray; } diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/resources/openapi.yaml b/samples/openapi3/server/petstore/springboot-reactive/src/main/resources/openapi.yaml index 2999e6f2f8d6..5fdcfc33eada 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/resources/openapi.yaml +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/resources/openapi.yaml @@ -2111,7 +2111,6 @@ components: status: description: Updated status of the pet type: string - type: object uploadFile_request: properties: additionalMetadata: @@ -2121,7 +2120,6 @@ components: description: file to upload format: binary type: string - type: object testEnumParameters_request: properties: enum_form_string_array: @@ -2141,7 +2139,6 @@ components: - -efg - (xyz) type: string - type: object testEndpointParameters_request: properties: integer: @@ -2214,7 +2211,6 @@ components: - double - number - pattern_without_delimiter - type: object testJsonFormData_request: properties: param: @@ -2226,7 +2222,6 @@ components: required: - param - param2 - type: object uploadFileWithRequiredFile_request: properties: additionalMetadata: @@ -2238,7 +2233,6 @@ components: type: string required: - requiredFile - type: object Dog_allOf: properties: breed: diff --git a/samples/openapi3/server/petstore/springboot-source/.openapi-generator/VERSION b/samples/openapi3/server/petstore/springboot-source/.openapi-generator/VERSION index d6b4ec4aa783..ed829dbcddec 100644 --- a/samples/openapi3/server/petstore/springboot-source/.openapi-generator/VERSION +++ b/samples/openapi3/server/petstore/springboot-source/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0-SNAPSHOT \ No newline at end of file +6.2.1-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/PetApi.java index fd146f2bc8f5..3a5b295e2e58 100644 --- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/PetApiController.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/PetApiController.java index b8fa3720a211..7713fe93c419 100644 --- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/PetApiController.java +++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/PetApiController.java @@ -29,7 +29,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class PetApiController implements PetApi { private final NativeWebRequest request; diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/StoreApi.java index 3044b699b0d0..e149518ef0c5 100644 --- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/StoreApiController.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/StoreApiController.java index 1292dc0b721d..f8c784ff3838 100644 --- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/StoreApiController.java +++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/StoreApiController.java @@ -29,7 +29,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class StoreApiController implements StoreApi { private final NativeWebRequest request; diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/UserApi.java index 66fab2a5f573..ebf5be7009ed 100644 --- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/UserApiController.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/UserApiController.java index ca00184d2a56..894bf6db762e 100644 --- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/UserApiController.java +++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/UserApiController.java @@ -30,7 +30,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class UserApiController implements UserApi { private final NativeWebRequest request; diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Category.java index 870578890cac..d48f33e470be 100644 --- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Category.java @@ -33,8 +33,8 @@ public Category id(Long id) { * Get id * @return id */ - @JsonProperty("id") + @JsonProperty("id") public Long getId() { return id; } @@ -52,8 +52,8 @@ public Category name(String name) { * Get name * @return name */ - @JsonProperty("name") @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/ModelApiResponse.java index 6fb2e932dade..5376fa62cc31 100644 --- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -37,8 +37,8 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ - @JsonProperty("code") + @JsonProperty("code") public Integer getCode() { return code; } @@ -56,8 +56,8 @@ public ModelApiResponse type(String type) { * Get type * @return type */ - @JsonProperty("type") + @JsonProperty("type") public String getType() { return type; } @@ -75,8 +75,8 @@ public ModelApiResponse message(String message) { * Get message * @return message */ - @JsonProperty("message") + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Order.java index 55aefcfb7441..ad7ddb217362 100644 --- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Order.java @@ -82,8 +82,8 @@ public Order id(Long id) { * Get id * @return id */ - @JsonProperty("id") + @JsonProperty("id") public Long getId() { return id; } @@ -101,8 +101,8 @@ public Order petId(Long petId) { * Get petId * @return petId */ - @JsonProperty("petId") + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -120,8 +120,8 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ - @JsonProperty("quantity") + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -139,8 +139,8 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ - @JsonProperty("shipDate") @Valid + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -158,8 +158,8 @@ public Order status(StatusEnum status) { * Order Status * @return status */ - @JsonProperty("status") + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -177,8 +177,8 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ - @JsonProperty("complete") + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Pet.java index 0180283859c6..cb9f33371fd1 100644 --- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Pet.java @@ -85,8 +85,8 @@ public Pet id(Long id) { * Get id * @return id */ - @JsonProperty("id") + @JsonProperty("id") public Long getId() { return id; } @@ -104,8 +104,8 @@ public Pet category(Category category) { * Get category * @return category */ - @JsonProperty("category") @Valid + @JsonProperty("category") public Category getCategory() { return category; } @@ -123,8 +123,8 @@ public Pet name(String name) { * Get name * @return name */ - @JsonProperty("name") @NotNull + @JsonProperty("name") public String getName() { return name; } @@ -147,8 +147,8 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ - @JsonProperty("photoUrls") @NotNull + @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; } @@ -174,8 +174,8 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @JsonProperty("tags") @Valid + @JsonProperty("tags") public List getTags() { return tags; } @@ -193,8 +193,8 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ - @JsonProperty("status") + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Tag.java index 430014eecc26..ae8b17e77928 100644 --- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Tag.java @@ -33,8 +33,8 @@ public Tag id(Long id) { * Get id * @return id */ - @JsonProperty("id") + @JsonProperty("id") public Long getId() { return id; } @@ -52,8 +52,8 @@ public Tag name(String name) { * Get name * @return name */ - @JsonProperty("name") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/User.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/User.java index 6e3daf33b33c..f825d42b636b 100644 --- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/User.java @@ -45,8 +45,8 @@ public User id(Long id) { * Get id * @return id */ - @JsonProperty("id") + @JsonProperty("id") public Long getId() { return id; } @@ -64,8 +64,8 @@ public User username(String username) { * Get username * @return username */ - @JsonProperty("username") + @JsonProperty("username") public String getUsername() { return username; } @@ -83,8 +83,8 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ - @JsonProperty("firstName") + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -102,8 +102,8 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ - @JsonProperty("lastName") + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -121,8 +121,8 @@ public User email(String email) { * Get email * @return email */ - @JsonProperty("email") + @JsonProperty("email") public String getEmail() { return email; } @@ -140,8 +140,8 @@ public User password(String password) { * Get password * @return password */ - @JsonProperty("password") + @JsonProperty("password") public String getPassword() { return password; } @@ -159,8 +159,8 @@ public User phone(String phone) { * Get phone * @return phone */ - @JsonProperty("phone") + @JsonProperty("phone") public String getPhone() { return phone; } @@ -178,8 +178,8 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ - @JsonProperty("userStatus") + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/openapi3/server/petstore/springboot-useoptional/.openapi-generator/FILES b/samples/openapi3/server/petstore/springboot-useoptional/.openapi-generator/FILES index 5d716a83385b..cf9ab80cce1d 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/.openapi-generator/FILES +++ b/samples/openapi3/server/petstore/springboot-useoptional/.openapi-generator/FILES @@ -15,7 +15,6 @@ src/main/java/org/openapitools/api/StoreApi.java src/main/java/org/openapitools/api/StoreApiController.java src/main/java/org/openapitools/api/UserApi.java src/main/java/org/openapitools/api/UserApiController.java -src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/configuration/SpringDocConfiguration.java src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java diff --git a/samples/openapi3/server/petstore/springboot-useoptional/.openapi-generator/VERSION b/samples/openapi3/server/petstore/springboot-useoptional/.openapi-generator/VERSION index d6b4ec4aa783..ed829dbcddec 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/.openapi-generator/VERSION +++ b/samples/openapi3/server/petstore/springboot-useoptional/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0-SNAPSHOT \ No newline at end of file +6.2.1-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java index fba11ac08bb4..1e7e4c5a8f57 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApiController.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApiController.java index c2db7ca5a815..65c9de6908c2 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApiController.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApiController.java @@ -28,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class AnotherFakeApiController implements AnotherFakeApi { private final NativeWebRequest request; 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 fcfa5b29f408..8a59b5abb483 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApiController.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApiController.java index 5ae5d5fed985..b30f53bb595c 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApiController.java @@ -38,7 +38,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeApiController implements FakeApi { private final NativeWebRequest request; diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 8d87477c2b16..c0a2a3ac70d2 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java index 65b695629d43..05196793d4c2 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java @@ -28,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeClassnameTestApiController implements FakeClassnameTestApi { private final NativeWebRequest request; 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 765556556729..9f8af8e60dda 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApiController.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApiController.java index ea6c56e02c11..0b88e5980bf1 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApiController.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApiController.java @@ -30,7 +30,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class PetApiController implements PetApi { private final NativeWebRequest request; diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java index 836aa2500f7f..4e91ff36d5c3 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApiController.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApiController.java index 1292dc0b721d..f8c784ff3838 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApiController.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApiController.java @@ -29,7 +29,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class StoreApiController implements StoreApi { private final NativeWebRequest request; diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java index 09484728d829..b0db1eddef46 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApiController.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApiController.java index ca00184d2a56..894bf6db762e 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApiController.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApiController.java @@ -30,7 +30,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class UserApiController implements UserApi { private final NativeWebRequest request; diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index e45a52c7a8af..62bd9f2bdf5f 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -34,9 +34,9 @@ public AdditionalPropertiesAnyType name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index ff8e902ab955..774a995fa648 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -35,9 +35,9 @@ public AdditionalPropertiesArray name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index c21068182c49..e46980d51924 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -34,9 +34,9 @@ public AdditionalPropertiesBoolean name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index c43432f178b1..2987ecb804c9 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -72,9 +72,9 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt * Get mapString * @return mapString */ - @JsonProperty("map_string") @Schema(name = "map_string", required = false) + @JsonProperty("map_string") public Map getMapString() { return mapString; } @@ -100,9 +100,9 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * Get mapNumber * @return mapNumber */ - @JsonProperty("map_number") @Valid @Schema(name = "map_number", required = false) + @JsonProperty("map_number") public Map getMapNumber() { return mapNumber; } @@ -128,9 +128,9 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege * Get mapInteger * @return mapInteger */ - @JsonProperty("map_integer") @Schema(name = "map_integer", required = false) + @JsonProperty("map_integer") public Map getMapInteger() { return mapInteger; } @@ -156,9 +156,9 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea * Get mapBoolean * @return mapBoolean */ - @JsonProperty("map_boolean") @Schema(name = "map_boolean", required = false) + @JsonProperty("map_boolean") public Map getMapBoolean() { return mapBoolean; } @@ -184,9 +184,9 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { return mapArrayInteger; } @@ -212,9 +212,9 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * Get mapArrayAnytype * @return mapArrayAnytype */ - @JsonProperty("map_array_anytype") @Valid @Schema(name = "map_array_anytype", required = false) + @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { return mapArrayAnytype; } @@ -240,9 +240,9 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { return mapMapString; } @@ -268,9 +268,9 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { return mapMapAnytype; } @@ -288,9 +288,9 @@ public AdditionalPropertiesClass anytype1(Object anytype1) { * Get anytype1 * @return anytype1 */ - @JsonProperty("anytype_1") @Schema(name = "anytype_1", required = false) + @JsonProperty("anytype_1") public Object getAnytype1() { return anytype1; } @@ -308,9 +308,9 @@ public AdditionalPropertiesClass anytype2(Object anytype2) { * Get anytype2 * @return anytype2 */ - @JsonProperty("anytype_2") @Schema(name = "anytype_2", required = false) + @JsonProperty("anytype_2") public Object getAnytype2() { return anytype2; } @@ -328,9 +328,9 @@ public AdditionalPropertiesClass anytype3(Object anytype3) { * Get anytype3 * @return anytype3 */ - @JsonProperty("anytype_3") @Schema(name = "anytype_3", required = false) + @JsonProperty("anytype_3") public Object getAnytype3() { return anytype3; } diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index d4fe82193e30..5f8b17f159fd 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -34,9 +34,9 @@ public AdditionalPropertiesInteger name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 11f9dda21f3f..a02c1a6284ec 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -35,9 +35,9 @@ public AdditionalPropertiesNumber name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index ce4f9f1ff862..b3c54932d1a6 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -34,9 +34,9 @@ public AdditionalPropertiesObject name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 2669a2e08d51..50ebbaf82d5a 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -34,9 +34,9 @@ public AdditionalPropertiesString name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Animal.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Animal.java index 50eb6fe3c62b..f045573f0903 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Animal.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Animal.java @@ -51,9 +51,9 @@ public Animal className(String className) { * Get className * @return className */ - @JsonProperty("className") @NotNull @Schema(name = "className", required = true) + @JsonProperty("className") public String getClassName() { return className; } @@ -71,9 +71,9 @@ public Animal color(String color) { * Get color * @return color */ - @JsonProperty("color") @Schema(name = "color", required = false) + @JsonProperty("color") public String getColor() { return color; } diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 99f5ef3aa439..ed60f2697f52 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -44,9 +44,9 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * Get arrayArrayNumber * @return arrayArrayNumber */ - @JsonProperty("ArrayArrayNumber") @Valid @Schema(name = "ArrayArrayNumber", required = false) + @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 563d0dc0f933..8e2d978eb5b9 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -44,9 +44,9 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ - @JsonProperty("ArrayNumber") @Valid @Schema(name = "ArrayNumber", required = false) + @JsonProperty("ArrayNumber") public List getArrayNumber() { return arrayNumber; } diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java index 839cf3ac40ab..576f202a0210 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java @@ -50,9 +50,9 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) { * Get arrayOfString * @return arrayOfString */ - @JsonProperty("array_of_string") @Schema(name = "array_of_string", required = false) + @JsonProperty("array_of_string") public List getArrayOfString() { return arrayOfString; } @@ -78,9 +78,9 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ - @JsonProperty("array_array_of_integer") @Valid @Schema(name = "array_array_of_integer", required = false) + @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; } @@ -106,9 +106,9 @@ public ArrayTest addArrayArrayOfModelItem(List arrayArrayOfModelI * Get arrayArrayOfModel * @return arrayArrayOfModel */ - @JsonProperty("array_array_of_model") @Valid @Schema(name = "array_array_of_model", required = false) + @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java index e0b22753e9e8..2dd10a30ea9a 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java @@ -77,9 +77,9 @@ public BigCat kind(KindEnum kind) { * Get kind * @return kind */ - @JsonProperty("kind") @Schema(name = "kind", required = false) + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCatAllOf.java index 3b0788b0b304..a29d08eadf7f 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCatAllOf.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCatAllOf.java @@ -74,9 +74,9 @@ public BigCatAllOf kind(KindEnum kind) { * Get kind * @return kind */ - @JsonProperty("kind") @Schema(name = "kind", required = false) + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Capitalization.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Capitalization.java index 7270c14a949f..e6c6b39b3e8d 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Capitalization.java @@ -42,9 +42,9 @@ public Capitalization smallCamel(String smallCamel) { * Get smallCamel * @return smallCamel */ - @JsonProperty("smallCamel") @Schema(name = "smallCamel", required = false) + @JsonProperty("smallCamel") public String getSmallCamel() { return smallCamel; } @@ -62,9 +62,9 @@ public Capitalization capitalCamel(String capitalCamel) { * Get capitalCamel * @return capitalCamel */ - @JsonProperty("CapitalCamel") @Schema(name = "CapitalCamel", required = false) + @JsonProperty("CapitalCamel") public String getCapitalCamel() { return capitalCamel; } @@ -82,9 +82,9 @@ public Capitalization smallSnake(String smallSnake) { * Get smallSnake * @return smallSnake */ - @JsonProperty("small_Snake") @Schema(name = "small_Snake", required = false) + @JsonProperty("small_Snake") public String getSmallSnake() { return smallSnake; } @@ -102,9 +102,9 @@ public Capitalization capitalSnake(String capitalSnake) { * Get capitalSnake * @return capitalSnake */ - @JsonProperty("Capital_Snake") @Schema(name = "Capital_Snake", required = false) + @JsonProperty("Capital_Snake") public String getCapitalSnake() { return capitalSnake; } @@ -122,9 +122,9 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) { * Get scAETHFlowPoints * @return scAETHFlowPoints */ - @JsonProperty("SCA_ETH_Flow_Points") @Schema(name = "SCA_ETH_Flow_Points", required = false) + @JsonProperty("SCA_ETH_Flow_Points") public String getScAETHFlowPoints() { return scAETHFlowPoints; } @@ -142,9 +142,9 @@ public Capitalization ATT_NAME(String ATT_NAME) { * Name of the pet * @return ATT_NAME */ - @JsonProperty("ATT_NAME") @Schema(name = "ATT_NAME", description = "Name of the pet ", required = false) + @JsonProperty("ATT_NAME") public String getATTNAME() { return ATT_NAME; } diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java index d1bb205b11b3..6a5ec912b5b5 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java @@ -46,9 +46,9 @@ public Cat declawed(Boolean declawed) { * Get declawed * @return declawed */ - @JsonProperty("declawed") @Schema(name = "declawed", required = false) + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/CatAllOf.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/CatAllOf.java index b7a7ed5def6a..0647507cd05e 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/CatAllOf.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/CatAllOf.java @@ -34,9 +34,9 @@ public CatAllOf declawed(Boolean declawed) { * Get declawed * @return declawed */ - @JsonProperty("declawed") @Schema(name = "declawed", required = false) + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Category.java index 9b1acc5a5c07..4d6450b7b2af 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Category.java @@ -34,9 +34,9 @@ public Category id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -54,9 +54,9 @@ public Category name(String name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @Schema(name = "name", required = true) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ClassModel.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ClassModel.java index 20f5e2de16dd..4c5aac3991ab 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ClassModel.java @@ -33,9 +33,9 @@ public ClassModel propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ - @JsonProperty("_class") @Schema(name = "_class", required = false) + @JsonProperty("_class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Client.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Client.java index 11ed7ead459c..98e9244f3922 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Client.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Client.java @@ -32,9 +32,9 @@ public Client client(String client) { * Get client * @return client */ - @JsonProperty("client") @Schema(name = "client", required = false) + @JsonProperty("client") public String getClient() { return client; } diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Dog.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Dog.java index b0f901978716..63ff356bf3f5 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Dog.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Dog.java @@ -37,9 +37,9 @@ public Dog breed(String breed) { * Get breed * @return breed */ - @JsonProperty("breed") @Schema(name = "breed", required = false) + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/DogAllOf.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/DogAllOf.java index 097dc159ee65..be10fcc8175e 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/DogAllOf.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/DogAllOf.java @@ -34,9 +34,9 @@ public DogAllOf breed(String breed) { * Get breed * @return breed */ - @JsonProperty("breed") @Schema(name = "breed", required = false) + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java index cb84a65b9e1c..fb2769e537ca 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java @@ -108,9 +108,9 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) { * Get justSymbol * @return justSymbol */ - @JsonProperty("just_symbol") @Schema(name = "just_symbol", required = false) + @JsonProperty("just_symbol") public JustSymbolEnum getJustSymbol() { return justSymbol; } @@ -136,9 +136,9 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) { * Get arrayEnum * @return arrayEnum */ - @JsonProperty("array_enum") @Schema(name = "array_enum", required = false) + @JsonProperty("array_enum") public List getArrayEnum() { return arrayEnum; } diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java index 2243d0fb1b8b..8e6d9e9fb8d1 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java @@ -188,9 +188,9 @@ public EnumTest enumString(EnumStringEnum enumString) { * Get enumString * @return enumString */ - @JsonProperty("enum_string") @Schema(name = "enum_string", required = false) + @JsonProperty("enum_string") public EnumStringEnum getEnumString() { return enumString; } @@ -208,9 +208,9 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) { * Get enumStringRequired * @return enumStringRequired */ - @JsonProperty("enum_string_required") @NotNull @Schema(name = "enum_string_required", required = true) + @JsonProperty("enum_string_required") public EnumStringRequiredEnum getEnumStringRequired() { return enumStringRequired; } @@ -228,9 +228,9 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) { * Get enumInteger * @return enumInteger */ - @JsonProperty("enum_integer") @Schema(name = "enum_integer", required = false) + @JsonProperty("enum_integer") public EnumIntegerEnum getEnumInteger() { return enumInteger; } @@ -248,9 +248,9 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) { * Get enumNumber * @return enumNumber */ - @JsonProperty("enum_number") @Schema(name = "enum_number", required = false) + @JsonProperty("enum_number") public EnumNumberEnum getEnumNumber() { return enumNumber; } @@ -268,9 +268,9 @@ public EnumTest outerEnum(OuterEnum outerEnum) { * Get outerEnum * @return outerEnum */ - @JsonProperty("outerEnum") @Valid @Schema(name = "outerEnum", required = false) + @JsonProperty("outerEnum") public OuterEnum getOuterEnum() { return outerEnum; } diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/File.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/File.java index 7d0f08137a62..dbdc0c147803 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/File.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/File.java @@ -33,9 +33,9 @@ public File sourceURI(String sourceURI) { * Test capitalization * @return sourceURI */ - @JsonProperty("sourceURI") @Schema(name = "sourceURI", description = "Test capitalization", required = false) + @JsonProperty("sourceURI") public String getSourceURI() { return sourceURI; } diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 50df4bf463a8..e4378be9ee0f 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -38,9 +38,9 @@ public FileSchemaTestClass file(File file) { * Get file * @return file */ - @JsonProperty("file") @Valid @Schema(name = "file", required = false) + @JsonProperty("file") public File getFile() { return file; } @@ -66,9 +66,9 @@ public FileSchemaTestClass addFilesItem(File filesItem) { * Get files * @return files */ - @JsonProperty("files") @Valid @Schema(name = "files", required = false) + @JsonProperty("files") public List getFiles() { return files; } 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 c9ae6ace8274..1bf83a5a5091 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 @@ -70,9 +70,9 @@ public FormatTest integer(Integer integer) { * maximum: 100 * @return integer */ - @JsonProperty("integer") @Min(10) @Max(100) @Schema(name = "integer", required = false) + @JsonProperty("integer") public Integer getInteger() { return integer; } @@ -92,9 +92,9 @@ public FormatTest int32(Integer int32) { * maximum: 200 * @return int32 */ - @JsonProperty("int32") @Min(20) @Max(200) @Schema(name = "int32", required = false) + @JsonProperty("int32") public Integer getInt32() { return int32; } @@ -112,9 +112,9 @@ public FormatTest int64(Long int64) { * Get int64 * @return int64 */ - @JsonProperty("int64") @Schema(name = "int64", required = false) + @JsonProperty("int64") public Long getInt64() { return int64; } @@ -134,9 +134,9 @@ public FormatTest number(BigDecimal number) { * maximum: 543.2 * @return number */ - @JsonProperty("number") @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") @Schema(name = "number", required = true) + @JsonProperty("number") public BigDecimal getNumber() { return number; } @@ -156,9 +156,9 @@ public FormatTest _float(Float _float) { * maximum: 987.6 * @return _float */ - @JsonProperty("float") @DecimalMin("54.3") @DecimalMax("987.6") @Schema(name = "float", required = false) + @JsonProperty("float") public Float getFloat() { return _float; } @@ -178,9 +178,9 @@ public FormatTest _double(Double _double) { * maximum: 123.4 * @return _double */ - @JsonProperty("double") @DecimalMin("67.8") @DecimalMax("123.4") @Schema(name = "double", required = false) + @JsonProperty("double") public Double getDouble() { return _double; } @@ -198,9 +198,9 @@ public FormatTest string(String string) { * Get string * @return string */ - @JsonProperty("string") @Pattern(regexp = "/[a-z]/i") @Schema(name = "string", required = false) + @JsonProperty("string") public String getString() { return string; } @@ -218,9 +218,9 @@ public FormatTest _byte(byte[] _byte) { * Get _byte * @return _byte */ - @JsonProperty("byte") @NotNull @Schema(name = "byte", required = true) + @JsonProperty("byte") public byte[] getByte() { return _byte; } @@ -238,9 +238,9 @@ public FormatTest binary(org.springframework.core.io.Resource binary) { * Get binary * @return binary */ - @JsonProperty("binary") @Valid @Schema(name = "binary", required = false) + @JsonProperty("binary") public org.springframework.core.io.Resource getBinary() { return binary; } @@ -258,9 +258,9 @@ public FormatTest date(LocalDate date) { * Get date * @return date */ - @JsonProperty("date") @NotNull @Valid @Schema(name = "date", required = true) + @JsonProperty("date") public LocalDate getDate() { return date; } @@ -278,9 +278,9 @@ public FormatTest dateTime(OffsetDateTime dateTime) { * Get dateTime * @return dateTime */ - @JsonProperty("dateTime") @Valid @Schema(name = "dateTime", required = false) + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -298,9 +298,9 @@ public FormatTest uuid(UUID uuid) { * Get uuid * @return uuid */ - @JsonProperty("uuid") @Valid @Schema(name = "uuid", example = "72f98069-206d-4f12-9f12-3d1e525a8e84", required = false) + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -318,9 +318,9 @@ public FormatTest password(String password) { * Get password * @return password */ - @JsonProperty("password") @NotNull @Size(min = 10, max = 64) @Schema(name = "password", required = true) + @JsonProperty("password") public String getPassword() { return password; } @@ -338,9 +338,9 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) { * Get bigDecimal * @return bigDecimal */ - @JsonProperty("BigDecimal") @Valid @Schema(name = "BigDecimal", required = false) + @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { return bigDecimal; } diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index aa8c3ee2514a..0a04cd2d070c 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -36,9 +36,9 @@ public HasOnlyReadOnly bar(String bar) { * Get bar * @return bar */ - @JsonProperty("bar") @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, required = false) + @JsonProperty("bar") public String getBar() { return bar; } @@ -56,9 +56,9 @@ public HasOnlyReadOnly foo(String foo) { * Get foo * @return foo */ - @JsonProperty("foo") @Schema(name = "foo", accessMode = Schema.AccessMode.READ_ONLY, required = false) + @JsonProperty("foo") public String getFoo() { return foo; } diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MapTest.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MapTest.java index 594021c36d2d..4cfeaeb6c63d 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MapTest.java @@ -88,9 +88,9 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapMapOfString * @return mapMapOfString */ - @JsonProperty("map_map_of_string") @Valid @Schema(name = "map_map_of_string", required = false) + @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { return mapMapOfString; } @@ -116,9 +116,9 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) * Get mapOfEnumString * @return mapOfEnumString */ - @JsonProperty("map_of_enum_string") @Schema(name = "map_of_enum_string", required = false) + @JsonProperty("map_of_enum_string") public Map getMapOfEnumString() { return mapOfEnumString; } @@ -144,9 +144,9 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) { * Get directMap * @return directMap */ - @JsonProperty("direct_map") @Schema(name = "direct_map", required = false) + @JsonProperty("direct_map") public Map getDirectMap() { return directMap; } @@ -172,9 +172,9 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) { * Get indirectMap * @return indirectMap */ - @JsonProperty("indirect_map") @Schema(name = "indirect_map", required = false) + @JsonProperty("indirect_map") public Map getIndirectMap() { return indirectMap; } diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index af4644ee1fd8..12e8bd36800c 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -44,9 +44,9 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { * Get uuid * @return uuid */ - @JsonProperty("uuid") @Valid @Schema(name = "uuid", required = false) + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -64,9 +64,9 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT * Get dateTime * @return dateTime */ - @JsonProperty("dateTime") @Valid @Schema(name = "dateTime", required = false) + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -92,9 +92,9 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * Get map * @return map */ - @JsonProperty("map") @Valid @Schema(name = "map", required = false) + @JsonProperty("map") public Map getMap() { return map; } diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Model200Response.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Model200Response.java index 329840fd1cd5..08bb506f2bd3 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Model200Response.java @@ -37,9 +37,9 @@ public Model200Response name(Integer name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public Integer getName() { return name; } @@ -57,9 +57,9 @@ public Model200Response propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ - @JsonProperty("class") @Schema(name = "class", required = false) + @JsonProperty("class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelApiResponse.java index 14ea90b13917..4851d6074c2f 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -38,9 +38,9 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ - @JsonProperty("code") @Schema(name = "code", required = false) + @JsonProperty("code") public Integer getCode() { return code; } @@ -58,9 +58,9 @@ public ModelApiResponse type(String type) { * Get type * @return type */ - @JsonProperty("type") @Schema(name = "type", required = false) + @JsonProperty("type") public String getType() { return type; } @@ -78,9 +78,9 @@ public ModelApiResponse message(String message) { * Get message * @return message */ - @JsonProperty("message") @Schema(name = "message", required = false) + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelList.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelList.java index 1e0bcffc220c..cf953ee17e25 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelList.java @@ -34,9 +34,9 @@ public ModelList _123list(String _123list) { * Get _123list * @return _123list */ - @JsonProperty("123-list") @Schema(name = "123-list", required = false) + @JsonProperty("123-list") public String get123list() { return _123list; } diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelReturn.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelReturn.java index 90b17a6d6850..d863cf8d63fe 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelReturn.java @@ -35,9 +35,9 @@ public ModelReturn _return(Integer _return) { * Get _return * @return _return */ - @JsonProperty("return") @Schema(name = "return", required = false) + @JsonProperty("return") public Integer getReturn() { return _return; } diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Name.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Name.java index bcbb5aab0f79..ad984399e918 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Name.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Name.java @@ -39,9 +39,9 @@ public Name name(Integer name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @Schema(name = "name", required = true) + @JsonProperty("name") public Integer getName() { return name; } @@ -59,9 +59,9 @@ public Name snakeCase(Integer snakeCase) { * Get snakeCase * @return snakeCase */ - @JsonProperty("snake_case") @Schema(name = "snake_case", accessMode = Schema.AccessMode.READ_ONLY, required = false) + @JsonProperty("snake_case") public Integer getSnakeCase() { return snakeCase; } @@ -79,9 +79,9 @@ public Name property(String property) { * Get property * @return property */ - @JsonProperty("property") @Schema(name = "property", required = false) + @JsonProperty("property") public String getProperty() { return property; } @@ -99,9 +99,9 @@ public Name _123number(Integer _123number) { * Get _123number * @return _123number */ - @JsonProperty("123Number") @Schema(name = "123Number", accessMode = Schema.AccessMode.READ_ONLY, required = false) + @JsonProperty("123Number") public Integer get123number() { return _123number; } diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NumberOnly.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NumberOnly.java index a597943a3ef7..23b2cdff8675 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NumberOnly.java @@ -33,9 +33,9 @@ public NumberOnly justNumber(BigDecimal justNumber) { * Get justNumber * @return justNumber */ - @JsonProperty("JustNumber") @Valid @Schema(name = "JustNumber", required = false) + @JsonProperty("JustNumber") public BigDecimal getJustNumber() { return justNumber; } diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Order.java index 10e257004cf9..0167b80e837c 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Order.java @@ -83,9 +83,9 @@ public Order id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -103,9 +103,9 @@ public Order petId(Long petId) { * Get petId * @return petId */ - @JsonProperty("petId") @Schema(name = "petId", required = false) + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -123,9 +123,9 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ - @JsonProperty("quantity") @Schema(name = "quantity", required = false) + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -143,9 +143,9 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ - @JsonProperty("shipDate") @Valid @Schema(name = "shipDate", required = false) + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -163,9 +163,9 @@ public Order status(StatusEnum status) { * Order Status * @return status */ - @JsonProperty("status") @Schema(name = "status", description = "Order Status", required = false) + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -183,9 +183,9 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ - @JsonProperty("complete") @Schema(name = "complete", required = false) + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/OuterComposite.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/OuterComposite.java index da3403158231..4f01a0edad71 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/OuterComposite.java @@ -37,9 +37,9 @@ public OuterComposite myNumber(BigDecimal myNumber) { * Get myNumber * @return myNumber */ - @JsonProperty("my_number") @Valid @Schema(name = "my_number", required = false) + @JsonProperty("my_number") public BigDecimal getMyNumber() { return myNumber; } @@ -57,9 +57,9 @@ public OuterComposite myString(String myString) { * Get myString * @return myString */ - @JsonProperty("my_string") @Schema(name = "my_string", required = false) + @JsonProperty("my_string") public String getMyString() { return myString; } @@ -77,9 +77,9 @@ public OuterComposite myBoolean(Boolean myBoolean) { * Get myBoolean * @return myBoolean */ - @JsonProperty("my_boolean") @Schema(name = "my_boolean", required = false) + @JsonProperty("my_boolean") public Boolean getMyBoolean() { return myBoolean; } diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java index edfea99a4441..27219d2daa74 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java @@ -89,9 +89,9 @@ public Pet id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -109,9 +109,9 @@ public Pet category(Category category) { * Get category * @return category */ - @JsonProperty("category") @Valid @Schema(name = "category", required = false) + @JsonProperty("category") public Category getCategory() { return category; } @@ -129,9 +129,9 @@ public Pet name(String name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @Schema(name = "name", example = "doggie", required = true) + @JsonProperty("name") public String getName() { return name; } @@ -154,9 +154,9 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ - @JsonProperty("photoUrls") @NotNull @Schema(name = "photoUrls", required = true) + @JsonProperty("photoUrls") public Set getPhotoUrls() { return photoUrls; } @@ -183,9 +183,9 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @JsonProperty("tags") @Valid @Schema(name = "tags", required = false) + @JsonProperty("tags") public List getTags() { return tags; } @@ -203,9 +203,9 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ - @JsonProperty("status") @Schema(name = "status", description = "pet status in the store", required = false) + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ReadOnlyFirst.java index 5bb864fdfdf9..78d279153054 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -34,9 +34,9 @@ public ReadOnlyFirst bar(String bar) { * Get bar * @return bar */ - @JsonProperty("bar") @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, required = false) + @JsonProperty("bar") public String getBar() { return bar; } @@ -54,9 +54,9 @@ public ReadOnlyFirst baz(String baz) { * Get baz * @return baz */ - @JsonProperty("baz") @Schema(name = "baz", required = false) + @JsonProperty("baz") public String getBaz() { return baz; } diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/SpecialModelName.java index d30f01ffd4ce..85284bda0ff2 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/SpecialModelName.java @@ -34,9 +34,9 @@ public class SpecialModelName { * Get $specialPropertyName * @return $specialPropertyName */ - @JsonProperty("$special[property.name]") @Schema(name = "$special[property.name]", required = false) + @JsonProperty("$special[property.name]") public Long get$SpecialPropertyName() { return $specialPropertyName; } diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Tag.java index 7e0f150664d9..fd2a0db14b5d 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Tag.java @@ -34,9 +34,9 @@ public Tag id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -54,9 +54,9 @@ public Tag name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java index 151d7623b25f..230033993752 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -44,9 +44,9 @@ public TypeHolderDefault stringItem(String stringItem) { * Get stringItem * @return stringItem */ - @JsonProperty("string_item") @NotNull @Schema(name = "string_item", required = true) + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -64,9 +64,9 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ - @JsonProperty("number_item") @NotNull @Valid @Schema(name = "number_item", required = true) + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -84,9 +84,9 @@ public TypeHolderDefault integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ - @JsonProperty("integer_item") @NotNull @Schema(name = "integer_item", required = true) + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -104,9 +104,9 @@ public TypeHolderDefault boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ - @JsonProperty("bool_item") @NotNull @Schema(name = "bool_item", required = true) + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -129,9 +129,9 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ - @JsonProperty("array_item") @NotNull @Schema(name = "array_item", required = true) + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java index 7239836800df..964c94fd5627 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -46,9 +46,9 @@ public TypeHolderExample stringItem(String stringItem) { * Get stringItem * @return stringItem */ - @JsonProperty("string_item") @NotNull @Schema(name = "string_item", example = "what", required = true) + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -66,9 +66,9 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ - @JsonProperty("number_item") @NotNull @Valid @Schema(name = "number_item", example = "1.234", required = true) + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -86,9 +86,9 @@ public TypeHolderExample floatItem(Float floatItem) { * Get floatItem * @return floatItem */ - @JsonProperty("float_item") @NotNull @Schema(name = "float_item", example = "1.234", required = true) + @JsonProperty("float_item") public Float getFloatItem() { return floatItem; } @@ -106,9 +106,9 @@ public TypeHolderExample integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ - @JsonProperty("integer_item") @NotNull @Schema(name = "integer_item", example = "-2", required = true) + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -126,9 +126,9 @@ public TypeHolderExample boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ - @JsonProperty("bool_item") @NotNull @Schema(name = "bool_item", example = "true", required = true) + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -151,9 +151,9 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ - @JsonProperty("array_item") @NotNull @Schema(name = "array_item", example = "[0, 1, 2, 3]", required = true) + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/User.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/User.java index eb52ac9bab84..68e52752bfbe 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/User.java @@ -46,9 +46,9 @@ public User id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -66,9 +66,9 @@ public User username(String username) { * Get username * @return username */ - @JsonProperty("username") @Schema(name = "username", required = false) + @JsonProperty("username") public String getUsername() { return username; } @@ -86,9 +86,9 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ - @JsonProperty("firstName") @Schema(name = "firstName", required = false) + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -106,9 +106,9 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ - @JsonProperty("lastName") @Schema(name = "lastName", required = false) + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -126,9 +126,9 @@ public User email(String email) { * Get email * @return email */ - @JsonProperty("email") @Schema(name = "email", required = false) + @JsonProperty("email") public String getEmail() { return email; } @@ -146,9 +146,9 @@ public User password(String password) { * Get password * @return password */ - @JsonProperty("password") @Schema(name = "password", required = false) + @JsonProperty("password") public String getPassword() { return password; } @@ -166,9 +166,9 @@ public User phone(String phone) { * Get phone * @return phone */ - @JsonProperty("phone") @Schema(name = "phone", required = false) + @JsonProperty("phone") public String getPhone() { return phone; } @@ -186,9 +186,9 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ - @JsonProperty("userStatus") @Schema(name = "userStatus", description = "User Status", required = false) + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java index 4b287492cc75..19b62a5139ae 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java @@ -100,9 +100,9 @@ public XmlItem attributeString(String attributeString) { * Get attributeString * @return attributeString */ - @JsonProperty("attribute_string") @Schema(name = "attribute_string", example = "string", required = false) + @JsonProperty("attribute_string") public String getAttributeString() { return attributeString; } @@ -120,9 +120,9 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) { * Get attributeNumber * @return attributeNumber */ - @JsonProperty("attribute_number") @Valid @Schema(name = "attribute_number", example = "1.234", required = false) + @JsonProperty("attribute_number") public BigDecimal getAttributeNumber() { return attributeNumber; } @@ -140,9 +140,9 @@ public XmlItem attributeInteger(Integer attributeInteger) { * Get attributeInteger * @return attributeInteger */ - @JsonProperty("attribute_integer") @Schema(name = "attribute_integer", example = "-2", required = false) + @JsonProperty("attribute_integer") public Integer getAttributeInteger() { return attributeInteger; } @@ -160,9 +160,9 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) { * Get attributeBoolean * @return attributeBoolean */ - @JsonProperty("attribute_boolean") @Schema(name = "attribute_boolean", example = "true", required = false) + @JsonProperty("attribute_boolean") public Boolean getAttributeBoolean() { return attributeBoolean; } @@ -188,9 +188,9 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) { * Get wrappedArray * @return wrappedArray */ - @JsonProperty("wrapped_array") @Schema(name = "wrapped_array", required = false) + @JsonProperty("wrapped_array") public List getWrappedArray() { return wrappedArray; } @@ -208,9 +208,9 @@ public XmlItem nameString(String nameString) { * Get nameString * @return nameString */ - @JsonProperty("name_string") @Schema(name = "name_string", example = "string", required = false) + @JsonProperty("name_string") public String getNameString() { return nameString; } @@ -228,9 +228,9 @@ public XmlItem nameNumber(BigDecimal nameNumber) { * Get nameNumber * @return nameNumber */ - @JsonProperty("name_number") @Valid @Schema(name = "name_number", example = "1.234", required = false) + @JsonProperty("name_number") public BigDecimal getNameNumber() { return nameNumber; } @@ -248,9 +248,9 @@ public XmlItem nameInteger(Integer nameInteger) { * Get nameInteger * @return nameInteger */ - @JsonProperty("name_integer") @Schema(name = "name_integer", example = "-2", required = false) + @JsonProperty("name_integer") public Integer getNameInteger() { return nameInteger; } @@ -268,9 +268,9 @@ public XmlItem nameBoolean(Boolean nameBoolean) { * Get nameBoolean * @return nameBoolean */ - @JsonProperty("name_boolean") @Schema(name = "name_boolean", example = "true", required = false) + @JsonProperty("name_boolean") public Boolean getNameBoolean() { return nameBoolean; } @@ -296,9 +296,9 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) { * Get nameArray * @return nameArray */ - @JsonProperty("name_array") @Schema(name = "name_array", required = false) + @JsonProperty("name_array") public List getNameArray() { return nameArray; } @@ -324,9 +324,9 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) { * Get nameWrappedArray * @return nameWrappedArray */ - @JsonProperty("name_wrapped_array") @Schema(name = "name_wrapped_array", required = false) + @JsonProperty("name_wrapped_array") public List getNameWrappedArray() { return nameWrappedArray; } @@ -344,9 +344,9 @@ public XmlItem prefixString(String prefixString) { * Get prefixString * @return prefixString */ - @JsonProperty("prefix_string") @Schema(name = "prefix_string", example = "string", required = false) + @JsonProperty("prefix_string") public String getPrefixString() { return prefixString; } @@ -364,9 +364,9 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) { * Get prefixNumber * @return prefixNumber */ - @JsonProperty("prefix_number") @Valid @Schema(name = "prefix_number", example = "1.234", required = false) + @JsonProperty("prefix_number") public BigDecimal getPrefixNumber() { return prefixNumber; } @@ -384,9 +384,9 @@ public XmlItem prefixInteger(Integer prefixInteger) { * Get prefixInteger * @return prefixInteger */ - @JsonProperty("prefix_integer") @Schema(name = "prefix_integer", example = "-2", required = false) + @JsonProperty("prefix_integer") public Integer getPrefixInteger() { return prefixInteger; } @@ -404,9 +404,9 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) { * Get prefixBoolean * @return prefixBoolean */ - @JsonProperty("prefix_boolean") @Schema(name = "prefix_boolean", example = "true", required = false) + @JsonProperty("prefix_boolean") public Boolean getPrefixBoolean() { return prefixBoolean; } @@ -432,9 +432,9 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) { * Get prefixArray * @return prefixArray */ - @JsonProperty("prefix_array") @Schema(name = "prefix_array", required = false) + @JsonProperty("prefix_array") public List getPrefixArray() { return prefixArray; } @@ -460,9 +460,9 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) { * Get prefixWrappedArray * @return prefixWrappedArray */ - @JsonProperty("prefix_wrapped_array") @Schema(name = "prefix_wrapped_array", required = false) + @JsonProperty("prefix_wrapped_array") public List getPrefixWrappedArray() { return prefixWrappedArray; } @@ -480,9 +480,9 @@ public XmlItem namespaceString(String namespaceString) { * Get namespaceString * @return namespaceString */ - @JsonProperty("namespace_string") @Schema(name = "namespace_string", example = "string", required = false) + @JsonProperty("namespace_string") public String getNamespaceString() { return namespaceString; } @@ -500,9 +500,9 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) { * Get namespaceNumber * @return namespaceNumber */ - @JsonProperty("namespace_number") @Valid @Schema(name = "namespace_number", example = "1.234", required = false) + @JsonProperty("namespace_number") public BigDecimal getNamespaceNumber() { return namespaceNumber; } @@ -520,9 +520,9 @@ public XmlItem namespaceInteger(Integer namespaceInteger) { * Get namespaceInteger * @return namespaceInteger */ - @JsonProperty("namespace_integer") @Schema(name = "namespace_integer", example = "-2", required = false) + @JsonProperty("namespace_integer") public Integer getNamespaceInteger() { return namespaceInteger; } @@ -540,9 +540,9 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) { * Get namespaceBoolean * @return namespaceBoolean */ - @JsonProperty("namespace_boolean") @Schema(name = "namespace_boolean", example = "true", required = false) + @JsonProperty("namespace_boolean") public Boolean getNamespaceBoolean() { return namespaceBoolean; } @@ -568,9 +568,9 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) { * Get namespaceArray * @return namespaceArray */ - @JsonProperty("namespace_array") @Schema(name = "namespace_array", required = false) + @JsonProperty("namespace_array") public List getNamespaceArray() { return namespaceArray; } @@ -596,9 +596,9 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) { * Get namespaceWrappedArray * @return namespaceWrappedArray */ - @JsonProperty("namespace_wrapped_array") @Schema(name = "namespace_wrapped_array", required = false) + @JsonProperty("namespace_wrapped_array") public List getNamespaceWrappedArray() { return namespaceWrappedArray; } @@ -616,9 +616,9 @@ public XmlItem prefixNsString(String prefixNsString) { * Get prefixNsString * @return prefixNsString */ - @JsonProperty("prefix_ns_string") @Schema(name = "prefix_ns_string", example = "string", required = false) + @JsonProperty("prefix_ns_string") public String getPrefixNsString() { return prefixNsString; } @@ -636,9 +636,9 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) { * Get prefixNsNumber * @return prefixNsNumber */ - @JsonProperty("prefix_ns_number") @Valid @Schema(name = "prefix_ns_number", example = "1.234", required = false) + @JsonProperty("prefix_ns_number") public BigDecimal getPrefixNsNumber() { return prefixNsNumber; } @@ -656,9 +656,9 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) { * Get prefixNsInteger * @return prefixNsInteger */ - @JsonProperty("prefix_ns_integer") @Schema(name = "prefix_ns_integer", example = "-2", required = false) + @JsonProperty("prefix_ns_integer") public Integer getPrefixNsInteger() { return prefixNsInteger; } @@ -676,9 +676,9 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) { * Get prefixNsBoolean * @return prefixNsBoolean */ - @JsonProperty("prefix_ns_boolean") @Schema(name = "prefix_ns_boolean", example = "true", required = false) + @JsonProperty("prefix_ns_boolean") public Boolean getPrefixNsBoolean() { return prefixNsBoolean; } @@ -704,9 +704,9 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) { * Get prefixNsArray * @return prefixNsArray */ - @JsonProperty("prefix_ns_array") @Schema(name = "prefix_ns_array", required = false) + @JsonProperty("prefix_ns_array") public List getPrefixNsArray() { return prefixNsArray; } @@ -732,9 +732,9 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) { * Get prefixNsWrappedArray * @return prefixNsWrappedArray */ - @JsonProperty("prefix_ns_wrapped_array") @Schema(name = "prefix_ns_wrapped_array", required = false) + @JsonProperty("prefix_ns_wrapped_array") public List getPrefixNsWrappedArray() { return prefixNsWrappedArray; } diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/resources/openapi.yaml b/samples/openapi3/server/petstore/springboot-useoptional/src/main/resources/openapi.yaml index 2999e6f2f8d6..5fdcfc33eada 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/resources/openapi.yaml +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/resources/openapi.yaml @@ -2111,7 +2111,6 @@ components: status: description: Updated status of the pet type: string - type: object uploadFile_request: properties: additionalMetadata: @@ -2121,7 +2120,6 @@ components: description: file to upload format: binary type: string - type: object testEnumParameters_request: properties: enum_form_string_array: @@ -2141,7 +2139,6 @@ components: - -efg - (xyz) type: string - type: object testEndpointParameters_request: properties: integer: @@ -2214,7 +2211,6 @@ components: - double - number - pattern_without_delimiter - type: object testJsonFormData_request: properties: param: @@ -2226,7 +2222,6 @@ components: required: - param - param2 - type: object uploadFileWithRequiredFile_request: properties: additionalMetadata: @@ -2238,7 +2233,6 @@ components: type: string required: - requiredFile - type: object Dog_allOf: properties: breed: diff --git a/samples/openapi3/server/petstore/springboot/.openapi-generator/VERSION b/samples/openapi3/server/petstore/springboot/.openapi-generator/VERSION index d6b4ec4aa783..ed829dbcddec 100644 --- a/samples/openapi3/server/petstore/springboot/.openapi-generator/VERSION +++ b/samples/openapi3/server/petstore/springboot/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0-SNAPSHOT \ No newline at end of file +6.2.1-SNAPSHOT \ No newline at end of file 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 0f7ff0628f2e..7896258136fe 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ @@ -33,7 +33,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Validated @Tag(name = "pet", description = "Everything about your Pets") -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public interface PetApi { default Optional getRequest() { diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java index 6dec1f26bb13..abcdd7143a47 100644 --- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ @@ -33,7 +33,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Validated @Tag(name = "store", description = "Access to Petstore orders") -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public interface StoreApi { default Optional getRequest() { diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java index 5b734a75ab6d..c3dbc04ca2b9 100644 --- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ @@ -34,7 +34,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Validated @Tag(name = "user", description = "Operations about user") -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public interface UserApi { default Optional getRequest() { diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Category.java index 59ab132dc0b5..240aeebc1490 100644 --- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Category.java @@ -35,9 +35,9 @@ public Category id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -55,9 +55,9 @@ public Category name(String name) { * Get name * @return name */ - @JsonProperty("name") @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/ModelApiResponse.java index 5d93139025d0..030dba3f7776 100644 --- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -39,9 +39,9 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ - @JsonProperty("code") @Schema(name = "code", required = false) + @JsonProperty("code") public Integer getCode() { return code; } @@ -59,9 +59,9 @@ public ModelApiResponse type(String type) { * Get type * @return type */ - @JsonProperty("type") @Schema(name = "type", required = false) + @JsonProperty("type") public String getType() { return type; } @@ -79,9 +79,9 @@ public ModelApiResponse message(String message) { * Get message * @return message */ - @JsonProperty("message") @Schema(name = "message", required = false) + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Order.java index 57e02c6a0658..dadc85ceab09 100644 --- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Order.java @@ -84,9 +84,9 @@ public Order id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -104,9 +104,9 @@ public Order petId(Long petId) { * Get petId * @return petId */ - @JsonProperty("petId") @Schema(name = "petId", required = false) + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -124,9 +124,9 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ - @JsonProperty("quantity") @Schema(name = "quantity", required = false) + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -144,9 +144,9 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ - @JsonProperty("shipDate") @Valid @Schema(name = "shipDate", required = false) + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -164,9 +164,9 @@ public Order status(StatusEnum status) { * Order Status * @return status */ - @JsonProperty("status") @Schema(name = "status", description = "Order Status", required = false) + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -184,9 +184,9 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ - @JsonProperty("complete") @Schema(name = "complete", required = false) + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java index 935a9242ca57..1637c81b3c69 100644 --- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java @@ -87,9 +87,9 @@ public Pet id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -107,9 +107,9 @@ public Pet category(Category category) { * Get category * @return category */ - @JsonProperty("category") @Valid @Schema(name = "category", required = false) + @JsonProperty("category") public Category getCategory() { return category; } @@ -127,9 +127,9 @@ public Pet name(String name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @Schema(name = "name", example = "doggie", required = true) + @JsonProperty("name") public String getName() { return name; } @@ -152,9 +152,9 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ - @JsonProperty("photoUrls") @NotNull @Schema(name = "photoUrls", required = true) + @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; } @@ -180,9 +180,9 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @JsonProperty("tags") @Valid @Schema(name = "tags", required = false) + @JsonProperty("tags") public List getTags() { return tags; } @@ -200,9 +200,9 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ - @JsonProperty("status") @Schema(name = "status", description = "pet status in the store", required = false) + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Tag.java index 657e04be1aae..2a7aa08f500e 100644 --- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Tag.java @@ -35,9 +35,9 @@ public Tag id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -55,9 +55,9 @@ public Tag name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/User.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/User.java index c51537754aff..b05e507b3efd 100644 --- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/User.java @@ -47,9 +47,9 @@ public User id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -67,9 +67,9 @@ public User username(String username) { * Get username * @return username */ - @JsonProperty("username") @Schema(name = "username", required = false) + @JsonProperty("username") public String getUsername() { return username; } @@ -87,9 +87,9 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ - @JsonProperty("firstName") @Schema(name = "firstName", required = false) + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -107,9 +107,9 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ - @JsonProperty("lastName") @Schema(name = "lastName", required = false) + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -127,9 +127,9 @@ public User email(String email) { * Get email * @return email */ - @JsonProperty("email") @Schema(name = "email", required = false) + @JsonProperty("email") public String getEmail() { return email; } @@ -147,9 +147,9 @@ public User password(String password) { * Get password * @return password */ - @JsonProperty("password") @Schema(name = "password", required = false) + @JsonProperty("password") public String getPassword() { return password; } @@ -167,9 +167,9 @@ public User phone(String phone) { * Get phone * @return phone */ - @JsonProperty("phone") @Schema(name = "phone", required = false) + @JsonProperty("phone") public String getPhone() { return phone; } @@ -187,9 +187,9 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ - @JsonProperty("userStatus") @Schema(name = "userStatus", description = "User Status", required = false) + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/.openapi-generator/VERSION b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/.openapi-generator/VERSION index d6b4ec4aa783..ed829dbcddec 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/.openapi-generator/VERSION +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0-SNAPSHOT \ No newline at end of file +6.2.1-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/AnotherFakeApi.java index 4e261bd44083..136c9ef51280 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeApi.java index eb2dd16ccd3e..ec10007eed09 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index e2586f6f790f..ec2eb9f94e29 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/PetApi.java index e4f09ff62f91..7d794a050f58 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/StoreApi.java index 32c6eda8560e..10ec6b2b86ae 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/UserApi.java index c3bf4cafe03e..fa91e4e025d5 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index e45a52c7a8af..62bd9f2bdf5f 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -34,9 +34,9 @@ public AdditionalPropertiesAnyType name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index ff8e902ab955..774a995fa648 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -35,9 +35,9 @@ public AdditionalPropertiesArray name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index c21068182c49..e46980d51924 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -34,9 +34,9 @@ public AdditionalPropertiesBoolean name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index c43432f178b1..2987ecb804c9 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -72,9 +72,9 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt * Get mapString * @return mapString */ - @JsonProperty("map_string") @Schema(name = "map_string", required = false) + @JsonProperty("map_string") public Map getMapString() { return mapString; } @@ -100,9 +100,9 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * Get mapNumber * @return mapNumber */ - @JsonProperty("map_number") @Valid @Schema(name = "map_number", required = false) + @JsonProperty("map_number") public Map getMapNumber() { return mapNumber; } @@ -128,9 +128,9 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege * Get mapInteger * @return mapInteger */ - @JsonProperty("map_integer") @Schema(name = "map_integer", required = false) + @JsonProperty("map_integer") public Map getMapInteger() { return mapInteger; } @@ -156,9 +156,9 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea * Get mapBoolean * @return mapBoolean */ - @JsonProperty("map_boolean") @Schema(name = "map_boolean", required = false) + @JsonProperty("map_boolean") public Map getMapBoolean() { return mapBoolean; } @@ -184,9 +184,9 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { return mapArrayInteger; } @@ -212,9 +212,9 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * Get mapArrayAnytype * @return mapArrayAnytype */ - @JsonProperty("map_array_anytype") @Valid @Schema(name = "map_array_anytype", required = false) + @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { return mapArrayAnytype; } @@ -240,9 +240,9 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { return mapMapString; } @@ -268,9 +268,9 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { return mapMapAnytype; } @@ -288,9 +288,9 @@ public AdditionalPropertiesClass anytype1(Object anytype1) { * Get anytype1 * @return anytype1 */ - @JsonProperty("anytype_1") @Schema(name = "anytype_1", required = false) + @JsonProperty("anytype_1") public Object getAnytype1() { return anytype1; } @@ -308,9 +308,9 @@ public AdditionalPropertiesClass anytype2(Object anytype2) { * Get anytype2 * @return anytype2 */ - @JsonProperty("anytype_2") @Schema(name = "anytype_2", required = false) + @JsonProperty("anytype_2") public Object getAnytype2() { return anytype2; } @@ -328,9 +328,9 @@ public AdditionalPropertiesClass anytype3(Object anytype3) { * Get anytype3 * @return anytype3 */ - @JsonProperty("anytype_3") @Schema(name = "anytype_3", required = false) + @JsonProperty("anytype_3") public Object getAnytype3() { return anytype3; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index d4fe82193e30..5f8b17f159fd 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -34,9 +34,9 @@ public AdditionalPropertiesInteger name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 11f9dda21f3f..a02c1a6284ec 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -35,9 +35,9 @@ public AdditionalPropertiesNumber name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index ce4f9f1ff862..b3c54932d1a6 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -34,9 +34,9 @@ public AdditionalPropertiesObject name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 2669a2e08d51..50ebbaf82d5a 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -34,9 +34,9 @@ public AdditionalPropertiesString name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Animal.java index 50eb6fe3c62b..f045573f0903 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Animal.java @@ -51,9 +51,9 @@ public Animal className(String className) { * Get className * @return className */ - @JsonProperty("className") @NotNull @Schema(name = "className", required = true) + @JsonProperty("className") public String getClassName() { return className; } @@ -71,9 +71,9 @@ public Animal color(String color) { * Get color * @return color */ - @JsonProperty("color") @Schema(name = "color", required = false) + @JsonProperty("color") public String getColor() { return color; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 99f5ef3aa439..ed60f2697f52 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -44,9 +44,9 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * Get arrayArrayNumber * @return arrayArrayNumber */ - @JsonProperty("ArrayArrayNumber") @Valid @Schema(name = "ArrayArrayNumber", required = false) + @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 563d0dc0f933..8e2d978eb5b9 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -44,9 +44,9 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ - @JsonProperty("ArrayNumber") @Valid @Schema(name = "ArrayNumber", required = false) + @JsonProperty("ArrayNumber") public List getArrayNumber() { return arrayNumber; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayTest.java index 839cf3ac40ab..576f202a0210 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayTest.java @@ -50,9 +50,9 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) { * Get arrayOfString * @return arrayOfString */ - @JsonProperty("array_of_string") @Schema(name = "array_of_string", required = false) + @JsonProperty("array_of_string") public List getArrayOfString() { return arrayOfString; } @@ -78,9 +78,9 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ - @JsonProperty("array_array_of_integer") @Valid @Schema(name = "array_array_of_integer", required = false) + @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; } @@ -106,9 +106,9 @@ public ArrayTest addArrayArrayOfModelItem(List arrayArrayOfModelI * Get arrayArrayOfModel * @return arrayArrayOfModel */ - @JsonProperty("array_array_of_model") @Valid @Schema(name = "array_array_of_model", required = false) + @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/BigCat.java index e0b22753e9e8..2dd10a30ea9a 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/BigCat.java @@ -77,9 +77,9 @@ public BigCat kind(KindEnum kind) { * Get kind * @return kind */ - @JsonProperty("kind") @Schema(name = "kind", required = false) + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/BigCatAllOf.java index 3b0788b0b304..a29d08eadf7f 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/BigCatAllOf.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/BigCatAllOf.java @@ -74,9 +74,9 @@ public BigCatAllOf kind(KindEnum kind) { * Get kind * @return kind */ - @JsonProperty("kind") @Schema(name = "kind", required = false) + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Capitalization.java index 7270c14a949f..e6c6b39b3e8d 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Capitalization.java @@ -42,9 +42,9 @@ public Capitalization smallCamel(String smallCamel) { * Get smallCamel * @return smallCamel */ - @JsonProperty("smallCamel") @Schema(name = "smallCamel", required = false) + @JsonProperty("smallCamel") public String getSmallCamel() { return smallCamel; } @@ -62,9 +62,9 @@ public Capitalization capitalCamel(String capitalCamel) { * Get capitalCamel * @return capitalCamel */ - @JsonProperty("CapitalCamel") @Schema(name = "CapitalCamel", required = false) + @JsonProperty("CapitalCamel") public String getCapitalCamel() { return capitalCamel; } @@ -82,9 +82,9 @@ public Capitalization smallSnake(String smallSnake) { * Get smallSnake * @return smallSnake */ - @JsonProperty("small_Snake") @Schema(name = "small_Snake", required = false) + @JsonProperty("small_Snake") public String getSmallSnake() { return smallSnake; } @@ -102,9 +102,9 @@ public Capitalization capitalSnake(String capitalSnake) { * Get capitalSnake * @return capitalSnake */ - @JsonProperty("Capital_Snake") @Schema(name = "Capital_Snake", required = false) + @JsonProperty("Capital_Snake") public String getCapitalSnake() { return capitalSnake; } @@ -122,9 +122,9 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) { * Get scAETHFlowPoints * @return scAETHFlowPoints */ - @JsonProperty("SCA_ETH_Flow_Points") @Schema(name = "SCA_ETH_Flow_Points", required = false) + @JsonProperty("SCA_ETH_Flow_Points") public String getScAETHFlowPoints() { return scAETHFlowPoints; } @@ -142,9 +142,9 @@ public Capitalization ATT_NAME(String ATT_NAME) { * Name of the pet * @return ATT_NAME */ - @JsonProperty("ATT_NAME") @Schema(name = "ATT_NAME", description = "Name of the pet ", required = false) + @JsonProperty("ATT_NAME") public String getATTNAME() { return ATT_NAME; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Cat.java index d1bb205b11b3..6a5ec912b5b5 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Cat.java @@ -46,9 +46,9 @@ public Cat declawed(Boolean declawed) { * Get declawed * @return declawed */ - @JsonProperty("declawed") @Schema(name = "declawed", required = false) + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/CatAllOf.java index b7a7ed5def6a..0647507cd05e 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/CatAllOf.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/CatAllOf.java @@ -34,9 +34,9 @@ public CatAllOf declawed(Boolean declawed) { * Get declawed * @return declawed */ - @JsonProperty("declawed") @Schema(name = "declawed", required = false) + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Category.java index 9b1acc5a5c07..4d6450b7b2af 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Category.java @@ -34,9 +34,9 @@ public Category id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -54,9 +54,9 @@ public Category name(String name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @Schema(name = "name", required = true) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ClassModel.java index 20f5e2de16dd..4c5aac3991ab 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ClassModel.java @@ -33,9 +33,9 @@ public ClassModel propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ - @JsonProperty("_class") @Schema(name = "_class", required = false) + @JsonProperty("_class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Client.java index 11ed7ead459c..98e9244f3922 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Client.java @@ -32,9 +32,9 @@ public Client client(String client) { * Get client * @return client */ - @JsonProperty("client") @Schema(name = "client", required = false) + @JsonProperty("client") public String getClient() { return client; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Dog.java index b0f901978716..63ff356bf3f5 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Dog.java @@ -37,9 +37,9 @@ public Dog breed(String breed) { * Get breed * @return breed */ - @JsonProperty("breed") @Schema(name = "breed", required = false) + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/DogAllOf.java index 097dc159ee65..be10fcc8175e 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/DogAllOf.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/DogAllOf.java @@ -34,9 +34,9 @@ public DogAllOf breed(String breed) { * Get breed * @return breed */ - @JsonProperty("breed") @Schema(name = "breed", required = false) + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumArrays.java index cb84a65b9e1c..fb2769e537ca 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumArrays.java @@ -108,9 +108,9 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) { * Get justSymbol * @return justSymbol */ - @JsonProperty("just_symbol") @Schema(name = "just_symbol", required = false) + @JsonProperty("just_symbol") public JustSymbolEnum getJustSymbol() { return justSymbol; } @@ -136,9 +136,9 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) { * Get arrayEnum * @return arrayEnum */ - @JsonProperty("array_enum") @Schema(name = "array_enum", required = false) + @JsonProperty("array_enum") public List getArrayEnum() { return arrayEnum; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumTest.java index 2243d0fb1b8b..8e6d9e9fb8d1 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumTest.java @@ -188,9 +188,9 @@ public EnumTest enumString(EnumStringEnum enumString) { * Get enumString * @return enumString */ - @JsonProperty("enum_string") @Schema(name = "enum_string", required = false) + @JsonProperty("enum_string") public EnumStringEnum getEnumString() { return enumString; } @@ -208,9 +208,9 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) { * Get enumStringRequired * @return enumStringRequired */ - @JsonProperty("enum_string_required") @NotNull @Schema(name = "enum_string_required", required = true) + @JsonProperty("enum_string_required") public EnumStringRequiredEnum getEnumStringRequired() { return enumStringRequired; } @@ -228,9 +228,9 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) { * Get enumInteger * @return enumInteger */ - @JsonProperty("enum_integer") @Schema(name = "enum_integer", required = false) + @JsonProperty("enum_integer") public EnumIntegerEnum getEnumInteger() { return enumInteger; } @@ -248,9 +248,9 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) { * Get enumNumber * @return enumNumber */ - @JsonProperty("enum_number") @Schema(name = "enum_number", required = false) + @JsonProperty("enum_number") public EnumNumberEnum getEnumNumber() { return enumNumber; } @@ -268,9 +268,9 @@ public EnumTest outerEnum(OuterEnum outerEnum) { * Get outerEnum * @return outerEnum */ - @JsonProperty("outerEnum") @Valid @Schema(name = "outerEnum", required = false) + @JsonProperty("outerEnum") public OuterEnum getOuterEnum() { return outerEnum; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/File.java index 7d0f08137a62..dbdc0c147803 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/File.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/File.java @@ -33,9 +33,9 @@ public File sourceURI(String sourceURI) { * Test capitalization * @return sourceURI */ - @JsonProperty("sourceURI") @Schema(name = "sourceURI", description = "Test capitalization", required = false) + @JsonProperty("sourceURI") public String getSourceURI() { return sourceURI; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 50df4bf463a8..e4378be9ee0f 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -38,9 +38,9 @@ public FileSchemaTestClass file(File file) { * Get file * @return file */ - @JsonProperty("file") @Valid @Schema(name = "file", required = false) + @JsonProperty("file") public File getFile() { return file; } @@ -66,9 +66,9 @@ public FileSchemaTestClass addFilesItem(File filesItem) { * Get files * @return files */ - @JsonProperty("files") @Valid @Schema(name = "files", required = false) + @JsonProperty("files") public List getFiles() { return files; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FormatTest.java index c9ae6ace8274..1bf83a5a5091 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FormatTest.java @@ -70,9 +70,9 @@ public FormatTest integer(Integer integer) { * maximum: 100 * @return integer */ - @JsonProperty("integer") @Min(10) @Max(100) @Schema(name = "integer", required = false) + @JsonProperty("integer") public Integer getInteger() { return integer; } @@ -92,9 +92,9 @@ public FormatTest int32(Integer int32) { * maximum: 200 * @return int32 */ - @JsonProperty("int32") @Min(20) @Max(200) @Schema(name = "int32", required = false) + @JsonProperty("int32") public Integer getInt32() { return int32; } @@ -112,9 +112,9 @@ public FormatTest int64(Long int64) { * Get int64 * @return int64 */ - @JsonProperty("int64") @Schema(name = "int64", required = false) + @JsonProperty("int64") public Long getInt64() { return int64; } @@ -134,9 +134,9 @@ public FormatTest number(BigDecimal number) { * maximum: 543.2 * @return number */ - @JsonProperty("number") @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") @Schema(name = "number", required = true) + @JsonProperty("number") public BigDecimal getNumber() { return number; } @@ -156,9 +156,9 @@ public FormatTest _float(Float _float) { * maximum: 987.6 * @return _float */ - @JsonProperty("float") @DecimalMin("54.3") @DecimalMax("987.6") @Schema(name = "float", required = false) + @JsonProperty("float") public Float getFloat() { return _float; } @@ -178,9 +178,9 @@ public FormatTest _double(Double _double) { * maximum: 123.4 * @return _double */ - @JsonProperty("double") @DecimalMin("67.8") @DecimalMax("123.4") @Schema(name = "double", required = false) + @JsonProperty("double") public Double getDouble() { return _double; } @@ -198,9 +198,9 @@ public FormatTest string(String string) { * Get string * @return string */ - @JsonProperty("string") @Pattern(regexp = "/[a-z]/i") @Schema(name = "string", required = false) + @JsonProperty("string") public String getString() { return string; } @@ -218,9 +218,9 @@ public FormatTest _byte(byte[] _byte) { * Get _byte * @return _byte */ - @JsonProperty("byte") @NotNull @Schema(name = "byte", required = true) + @JsonProperty("byte") public byte[] getByte() { return _byte; } @@ -238,9 +238,9 @@ public FormatTest binary(org.springframework.core.io.Resource binary) { * Get binary * @return binary */ - @JsonProperty("binary") @Valid @Schema(name = "binary", required = false) + @JsonProperty("binary") public org.springframework.core.io.Resource getBinary() { return binary; } @@ -258,9 +258,9 @@ public FormatTest date(LocalDate date) { * Get date * @return date */ - @JsonProperty("date") @NotNull @Valid @Schema(name = "date", required = true) + @JsonProperty("date") public LocalDate getDate() { return date; } @@ -278,9 +278,9 @@ public FormatTest dateTime(OffsetDateTime dateTime) { * Get dateTime * @return dateTime */ - @JsonProperty("dateTime") @Valid @Schema(name = "dateTime", required = false) + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -298,9 +298,9 @@ public FormatTest uuid(UUID uuid) { * Get uuid * @return uuid */ - @JsonProperty("uuid") @Valid @Schema(name = "uuid", example = "72f98069-206d-4f12-9f12-3d1e525a8e84", required = false) + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -318,9 +318,9 @@ public FormatTest password(String password) { * Get password * @return password */ - @JsonProperty("password") @NotNull @Size(min = 10, max = 64) @Schema(name = "password", required = true) + @JsonProperty("password") public String getPassword() { return password; } @@ -338,9 +338,9 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) { * Get bigDecimal * @return bigDecimal */ - @JsonProperty("BigDecimal") @Valid @Schema(name = "BigDecimal", required = false) + @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { return bigDecimal; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index aa8c3ee2514a..0a04cd2d070c 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -36,9 +36,9 @@ public HasOnlyReadOnly bar(String bar) { * Get bar * @return bar */ - @JsonProperty("bar") @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, required = false) + @JsonProperty("bar") public String getBar() { return bar; } @@ -56,9 +56,9 @@ public HasOnlyReadOnly foo(String foo) { * Get foo * @return foo */ - @JsonProperty("foo") @Schema(name = "foo", accessMode = Schema.AccessMode.READ_ONLY, required = false) + @JsonProperty("foo") public String getFoo() { return foo; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MapTest.java index 594021c36d2d..4cfeaeb6c63d 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MapTest.java @@ -88,9 +88,9 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapMapOfString * @return mapMapOfString */ - @JsonProperty("map_map_of_string") @Valid @Schema(name = "map_map_of_string", required = false) + @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { return mapMapOfString; } @@ -116,9 +116,9 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) * Get mapOfEnumString * @return mapOfEnumString */ - @JsonProperty("map_of_enum_string") @Schema(name = "map_of_enum_string", required = false) + @JsonProperty("map_of_enum_string") public Map getMapOfEnumString() { return mapOfEnumString; } @@ -144,9 +144,9 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) { * Get directMap * @return directMap */ - @JsonProperty("direct_map") @Schema(name = "direct_map", required = false) + @JsonProperty("direct_map") public Map getDirectMap() { return directMap; } @@ -172,9 +172,9 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) { * Get indirectMap * @return indirectMap */ - @JsonProperty("indirect_map") @Schema(name = "indirect_map", required = false) + @JsonProperty("indirect_map") public Map getIndirectMap() { return indirectMap; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index af4644ee1fd8..12e8bd36800c 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -44,9 +44,9 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { * Get uuid * @return uuid */ - @JsonProperty("uuid") @Valid @Schema(name = "uuid", required = false) + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -64,9 +64,9 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT * Get dateTime * @return dateTime */ - @JsonProperty("dateTime") @Valid @Schema(name = "dateTime", required = false) + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -92,9 +92,9 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * Get map * @return map */ - @JsonProperty("map") @Valid @Schema(name = "map", required = false) + @JsonProperty("map") public Map getMap() { return map; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Model200Response.java index 329840fd1cd5..08bb506f2bd3 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Model200Response.java @@ -37,9 +37,9 @@ public Model200Response name(Integer name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public Integer getName() { return name; } @@ -57,9 +57,9 @@ public Model200Response propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ - @JsonProperty("class") @Schema(name = "class", required = false) + @JsonProperty("class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelApiResponse.java index 14ea90b13917..4851d6074c2f 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -38,9 +38,9 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ - @JsonProperty("code") @Schema(name = "code", required = false) + @JsonProperty("code") public Integer getCode() { return code; } @@ -58,9 +58,9 @@ public ModelApiResponse type(String type) { * Get type * @return type */ - @JsonProperty("type") @Schema(name = "type", required = false) + @JsonProperty("type") public String getType() { return type; } @@ -78,9 +78,9 @@ public ModelApiResponse message(String message) { * Get message * @return message */ - @JsonProperty("message") @Schema(name = "message", required = false) + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelList.java index 1e0bcffc220c..cf953ee17e25 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelList.java @@ -34,9 +34,9 @@ public ModelList _123list(String _123list) { * Get _123list * @return _123list */ - @JsonProperty("123-list") @Schema(name = "123-list", required = false) + @JsonProperty("123-list") public String get123list() { return _123list; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelReturn.java index 90b17a6d6850..d863cf8d63fe 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelReturn.java @@ -35,9 +35,9 @@ public ModelReturn _return(Integer _return) { * Get _return * @return _return */ - @JsonProperty("return") @Schema(name = "return", required = false) + @JsonProperty("return") public Integer getReturn() { return _return; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Name.java index bcbb5aab0f79..ad984399e918 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Name.java @@ -39,9 +39,9 @@ public Name name(Integer name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @Schema(name = "name", required = true) + @JsonProperty("name") public Integer getName() { return name; } @@ -59,9 +59,9 @@ public Name snakeCase(Integer snakeCase) { * Get snakeCase * @return snakeCase */ - @JsonProperty("snake_case") @Schema(name = "snake_case", accessMode = Schema.AccessMode.READ_ONLY, required = false) + @JsonProperty("snake_case") public Integer getSnakeCase() { return snakeCase; } @@ -79,9 +79,9 @@ public Name property(String property) { * Get property * @return property */ - @JsonProperty("property") @Schema(name = "property", required = false) + @JsonProperty("property") public String getProperty() { return property; } @@ -99,9 +99,9 @@ public Name _123number(Integer _123number) { * Get _123number * @return _123number */ - @JsonProperty("123Number") @Schema(name = "123Number", accessMode = Schema.AccessMode.READ_ONLY, required = false) + @JsonProperty("123Number") public Integer get123number() { return _123number; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/NumberOnly.java index a597943a3ef7..23b2cdff8675 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/NumberOnly.java @@ -33,9 +33,9 @@ public NumberOnly justNumber(BigDecimal justNumber) { * Get justNumber * @return justNumber */ - @JsonProperty("JustNumber") @Valid @Schema(name = "JustNumber", required = false) + @JsonProperty("JustNumber") public BigDecimal getJustNumber() { return justNumber; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Order.java index 10e257004cf9..0167b80e837c 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Order.java @@ -83,9 +83,9 @@ public Order id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -103,9 +103,9 @@ public Order petId(Long petId) { * Get petId * @return petId */ - @JsonProperty("petId") @Schema(name = "petId", required = false) + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -123,9 +123,9 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ - @JsonProperty("quantity") @Schema(name = "quantity", required = false) + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -143,9 +143,9 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ - @JsonProperty("shipDate") @Valid @Schema(name = "shipDate", required = false) + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -163,9 +163,9 @@ public Order status(StatusEnum status) { * Order Status * @return status */ - @JsonProperty("status") @Schema(name = "status", description = "Order Status", required = false) + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -183,9 +183,9 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ - @JsonProperty("complete") @Schema(name = "complete", required = false) + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/OuterComposite.java index da3403158231..4f01a0edad71 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/OuterComposite.java @@ -37,9 +37,9 @@ public OuterComposite myNumber(BigDecimal myNumber) { * Get myNumber * @return myNumber */ - @JsonProperty("my_number") @Valid @Schema(name = "my_number", required = false) + @JsonProperty("my_number") public BigDecimal getMyNumber() { return myNumber; } @@ -57,9 +57,9 @@ public OuterComposite myString(String myString) { * Get myString * @return myString */ - @JsonProperty("my_string") @Schema(name = "my_string", required = false) + @JsonProperty("my_string") public String getMyString() { return myString; } @@ -77,9 +77,9 @@ public OuterComposite myBoolean(Boolean myBoolean) { * Get myBoolean * @return myBoolean */ - @JsonProperty("my_boolean") @Schema(name = "my_boolean", required = false) + @JsonProperty("my_boolean") public Boolean getMyBoolean() { return myBoolean; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Pet.java index edfea99a4441..27219d2daa74 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Pet.java @@ -89,9 +89,9 @@ public Pet id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -109,9 +109,9 @@ public Pet category(Category category) { * Get category * @return category */ - @JsonProperty("category") @Valid @Schema(name = "category", required = false) + @JsonProperty("category") public Category getCategory() { return category; } @@ -129,9 +129,9 @@ public Pet name(String name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @Schema(name = "name", example = "doggie", required = true) + @JsonProperty("name") public String getName() { return name; } @@ -154,9 +154,9 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ - @JsonProperty("photoUrls") @NotNull @Schema(name = "photoUrls", required = true) + @JsonProperty("photoUrls") public Set getPhotoUrls() { return photoUrls; } @@ -183,9 +183,9 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @JsonProperty("tags") @Valid @Schema(name = "tags", required = false) + @JsonProperty("tags") public List getTags() { return tags; } @@ -203,9 +203,9 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ - @JsonProperty("status") @Schema(name = "status", description = "pet status in the store", required = false) + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ReadOnlyFirst.java index 5bb864fdfdf9..78d279153054 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -34,9 +34,9 @@ public ReadOnlyFirst bar(String bar) { * Get bar * @return bar */ - @JsonProperty("bar") @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, required = false) + @JsonProperty("bar") public String getBar() { return bar; } @@ -54,9 +54,9 @@ public ReadOnlyFirst baz(String baz) { * Get baz * @return baz */ - @JsonProperty("baz") @Schema(name = "baz", required = false) + @JsonProperty("baz") public String getBaz() { return baz; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/SpecialModelName.java index d30f01ffd4ce..85284bda0ff2 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/SpecialModelName.java @@ -34,9 +34,9 @@ public class SpecialModelName { * Get $specialPropertyName * @return $specialPropertyName */ - @JsonProperty("$special[property.name]") @Schema(name = "$special[property.name]", required = false) + @JsonProperty("$special[property.name]") public Long get$SpecialPropertyName() { return $specialPropertyName; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Tag.java index 7e0f150664d9..fd2a0db14b5d 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Tag.java @@ -34,9 +34,9 @@ public Tag id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -54,9 +54,9 @@ public Tag name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderDefault.java index 151d7623b25f..230033993752 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -44,9 +44,9 @@ public TypeHolderDefault stringItem(String stringItem) { * Get stringItem * @return stringItem */ - @JsonProperty("string_item") @NotNull @Schema(name = "string_item", required = true) + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -64,9 +64,9 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ - @JsonProperty("number_item") @NotNull @Valid @Schema(name = "number_item", required = true) + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -84,9 +84,9 @@ public TypeHolderDefault integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ - @JsonProperty("integer_item") @NotNull @Schema(name = "integer_item", required = true) + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -104,9 +104,9 @@ public TypeHolderDefault boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ - @JsonProperty("bool_item") @NotNull @Schema(name = "bool_item", required = true) + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -129,9 +129,9 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ - @JsonProperty("array_item") @NotNull @Schema(name = "array_item", required = true) + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderExample.java index 7239836800df..964c94fd5627 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -46,9 +46,9 @@ public TypeHolderExample stringItem(String stringItem) { * Get stringItem * @return stringItem */ - @JsonProperty("string_item") @NotNull @Schema(name = "string_item", example = "what", required = true) + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -66,9 +66,9 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ - @JsonProperty("number_item") @NotNull @Valid @Schema(name = "number_item", example = "1.234", required = true) + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -86,9 +86,9 @@ public TypeHolderExample floatItem(Float floatItem) { * Get floatItem * @return floatItem */ - @JsonProperty("float_item") @NotNull @Schema(name = "float_item", example = "1.234", required = true) + @JsonProperty("float_item") public Float getFloatItem() { return floatItem; } @@ -106,9 +106,9 @@ public TypeHolderExample integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ - @JsonProperty("integer_item") @NotNull @Schema(name = "integer_item", example = "-2", required = true) + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -126,9 +126,9 @@ public TypeHolderExample boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ - @JsonProperty("bool_item") @NotNull @Schema(name = "bool_item", example = "true", required = true) + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -151,9 +151,9 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ - @JsonProperty("array_item") @NotNull @Schema(name = "array_item", example = "[0, 1, 2, 3]", required = true) + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/User.java index eb52ac9bab84..68e52752bfbe 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/User.java @@ -46,9 +46,9 @@ public User id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -66,9 +66,9 @@ public User username(String username) { * Get username * @return username */ - @JsonProperty("username") @Schema(name = "username", required = false) + @JsonProperty("username") public String getUsername() { return username; } @@ -86,9 +86,9 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ - @JsonProperty("firstName") @Schema(name = "firstName", required = false) + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -106,9 +106,9 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ - @JsonProperty("lastName") @Schema(name = "lastName", required = false) + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -126,9 +126,9 @@ public User email(String email) { * Get email * @return email */ - @JsonProperty("email") @Schema(name = "email", required = false) + @JsonProperty("email") public String getEmail() { return email; } @@ -146,9 +146,9 @@ public User password(String password) { * Get password * @return password */ - @JsonProperty("password") @Schema(name = "password", required = false) + @JsonProperty("password") public String getPassword() { return password; } @@ -166,9 +166,9 @@ public User phone(String phone) { * Get phone * @return phone */ - @JsonProperty("phone") @Schema(name = "phone", required = false) + @JsonProperty("phone") public String getPhone() { return phone; } @@ -186,9 +186,9 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ - @JsonProperty("userStatus") @Schema(name = "userStatus", description = "User Status", required = false) + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/XmlItem.java index 4b287492cc75..19b62a5139ae 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/XmlItem.java @@ -100,9 +100,9 @@ public XmlItem attributeString(String attributeString) { * Get attributeString * @return attributeString */ - @JsonProperty("attribute_string") @Schema(name = "attribute_string", example = "string", required = false) + @JsonProperty("attribute_string") public String getAttributeString() { return attributeString; } @@ -120,9 +120,9 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) { * Get attributeNumber * @return attributeNumber */ - @JsonProperty("attribute_number") @Valid @Schema(name = "attribute_number", example = "1.234", required = false) + @JsonProperty("attribute_number") public BigDecimal getAttributeNumber() { return attributeNumber; } @@ -140,9 +140,9 @@ public XmlItem attributeInteger(Integer attributeInteger) { * Get attributeInteger * @return attributeInteger */ - @JsonProperty("attribute_integer") @Schema(name = "attribute_integer", example = "-2", required = false) + @JsonProperty("attribute_integer") public Integer getAttributeInteger() { return attributeInteger; } @@ -160,9 +160,9 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) { * Get attributeBoolean * @return attributeBoolean */ - @JsonProperty("attribute_boolean") @Schema(name = "attribute_boolean", example = "true", required = false) + @JsonProperty("attribute_boolean") public Boolean getAttributeBoolean() { return attributeBoolean; } @@ -188,9 +188,9 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) { * Get wrappedArray * @return wrappedArray */ - @JsonProperty("wrapped_array") @Schema(name = "wrapped_array", required = false) + @JsonProperty("wrapped_array") public List getWrappedArray() { return wrappedArray; } @@ -208,9 +208,9 @@ public XmlItem nameString(String nameString) { * Get nameString * @return nameString */ - @JsonProperty("name_string") @Schema(name = "name_string", example = "string", required = false) + @JsonProperty("name_string") public String getNameString() { return nameString; } @@ -228,9 +228,9 @@ public XmlItem nameNumber(BigDecimal nameNumber) { * Get nameNumber * @return nameNumber */ - @JsonProperty("name_number") @Valid @Schema(name = "name_number", example = "1.234", required = false) + @JsonProperty("name_number") public BigDecimal getNameNumber() { return nameNumber; } @@ -248,9 +248,9 @@ public XmlItem nameInteger(Integer nameInteger) { * Get nameInteger * @return nameInteger */ - @JsonProperty("name_integer") @Schema(name = "name_integer", example = "-2", required = false) + @JsonProperty("name_integer") public Integer getNameInteger() { return nameInteger; } @@ -268,9 +268,9 @@ public XmlItem nameBoolean(Boolean nameBoolean) { * Get nameBoolean * @return nameBoolean */ - @JsonProperty("name_boolean") @Schema(name = "name_boolean", example = "true", required = false) + @JsonProperty("name_boolean") public Boolean getNameBoolean() { return nameBoolean; } @@ -296,9 +296,9 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) { * Get nameArray * @return nameArray */ - @JsonProperty("name_array") @Schema(name = "name_array", required = false) + @JsonProperty("name_array") public List getNameArray() { return nameArray; } @@ -324,9 +324,9 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) { * Get nameWrappedArray * @return nameWrappedArray */ - @JsonProperty("name_wrapped_array") @Schema(name = "name_wrapped_array", required = false) + @JsonProperty("name_wrapped_array") public List getNameWrappedArray() { return nameWrappedArray; } @@ -344,9 +344,9 @@ public XmlItem prefixString(String prefixString) { * Get prefixString * @return prefixString */ - @JsonProperty("prefix_string") @Schema(name = "prefix_string", example = "string", required = false) + @JsonProperty("prefix_string") public String getPrefixString() { return prefixString; } @@ -364,9 +364,9 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) { * Get prefixNumber * @return prefixNumber */ - @JsonProperty("prefix_number") @Valid @Schema(name = "prefix_number", example = "1.234", required = false) + @JsonProperty("prefix_number") public BigDecimal getPrefixNumber() { return prefixNumber; } @@ -384,9 +384,9 @@ public XmlItem prefixInteger(Integer prefixInteger) { * Get prefixInteger * @return prefixInteger */ - @JsonProperty("prefix_integer") @Schema(name = "prefix_integer", example = "-2", required = false) + @JsonProperty("prefix_integer") public Integer getPrefixInteger() { return prefixInteger; } @@ -404,9 +404,9 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) { * Get prefixBoolean * @return prefixBoolean */ - @JsonProperty("prefix_boolean") @Schema(name = "prefix_boolean", example = "true", required = false) + @JsonProperty("prefix_boolean") public Boolean getPrefixBoolean() { return prefixBoolean; } @@ -432,9 +432,9 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) { * Get prefixArray * @return prefixArray */ - @JsonProperty("prefix_array") @Schema(name = "prefix_array", required = false) + @JsonProperty("prefix_array") public List getPrefixArray() { return prefixArray; } @@ -460,9 +460,9 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) { * Get prefixWrappedArray * @return prefixWrappedArray */ - @JsonProperty("prefix_wrapped_array") @Schema(name = "prefix_wrapped_array", required = false) + @JsonProperty("prefix_wrapped_array") public List getPrefixWrappedArray() { return prefixWrappedArray; } @@ -480,9 +480,9 @@ public XmlItem namespaceString(String namespaceString) { * Get namespaceString * @return namespaceString */ - @JsonProperty("namespace_string") @Schema(name = "namespace_string", example = "string", required = false) + @JsonProperty("namespace_string") public String getNamespaceString() { return namespaceString; } @@ -500,9 +500,9 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) { * Get namespaceNumber * @return namespaceNumber */ - @JsonProperty("namespace_number") @Valid @Schema(name = "namespace_number", example = "1.234", required = false) + @JsonProperty("namespace_number") public BigDecimal getNamespaceNumber() { return namespaceNumber; } @@ -520,9 +520,9 @@ public XmlItem namespaceInteger(Integer namespaceInteger) { * Get namespaceInteger * @return namespaceInteger */ - @JsonProperty("namespace_integer") @Schema(name = "namespace_integer", example = "-2", required = false) + @JsonProperty("namespace_integer") public Integer getNamespaceInteger() { return namespaceInteger; } @@ -540,9 +540,9 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) { * Get namespaceBoolean * @return namespaceBoolean */ - @JsonProperty("namespace_boolean") @Schema(name = "namespace_boolean", example = "true", required = false) + @JsonProperty("namespace_boolean") public Boolean getNamespaceBoolean() { return namespaceBoolean; } @@ -568,9 +568,9 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) { * Get namespaceArray * @return namespaceArray */ - @JsonProperty("namespace_array") @Schema(name = "namespace_array", required = false) + @JsonProperty("namespace_array") public List getNamespaceArray() { return namespaceArray; } @@ -596,9 +596,9 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) { * Get namespaceWrappedArray * @return namespaceWrappedArray */ - @JsonProperty("namespace_wrapped_array") @Schema(name = "namespace_wrapped_array", required = false) + @JsonProperty("namespace_wrapped_array") public List getNamespaceWrappedArray() { return namespaceWrappedArray; } @@ -616,9 +616,9 @@ public XmlItem prefixNsString(String prefixNsString) { * Get prefixNsString * @return prefixNsString */ - @JsonProperty("prefix_ns_string") @Schema(name = "prefix_ns_string", example = "string", required = false) + @JsonProperty("prefix_ns_string") public String getPrefixNsString() { return prefixNsString; } @@ -636,9 +636,9 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) { * Get prefixNsNumber * @return prefixNsNumber */ - @JsonProperty("prefix_ns_number") @Valid @Schema(name = "prefix_ns_number", example = "1.234", required = false) + @JsonProperty("prefix_ns_number") public BigDecimal getPrefixNsNumber() { return prefixNsNumber; } @@ -656,9 +656,9 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) { * Get prefixNsInteger * @return prefixNsInteger */ - @JsonProperty("prefix_ns_integer") @Schema(name = "prefix_ns_integer", example = "-2", required = false) + @JsonProperty("prefix_ns_integer") public Integer getPrefixNsInteger() { return prefixNsInteger; } @@ -676,9 +676,9 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) { * Get prefixNsBoolean * @return prefixNsBoolean */ - @JsonProperty("prefix_ns_boolean") @Schema(name = "prefix_ns_boolean", example = "true", required = false) + @JsonProperty("prefix_ns_boolean") public Boolean getPrefixNsBoolean() { return prefixNsBoolean; } @@ -704,9 +704,9 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) { * Get prefixNsArray * @return prefixNsArray */ - @JsonProperty("prefix_ns_array") @Schema(name = "prefix_ns_array", required = false) + @JsonProperty("prefix_ns_array") public List getPrefixNsArray() { return prefixNsArray; } @@ -732,9 +732,9 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) { * Get prefixNsWrappedArray * @return prefixNsWrappedArray */ - @JsonProperty("prefix_ns_wrapped_array") @Schema(name = "prefix_ns_wrapped_array", required = false) + @JsonProperty("prefix_ns_wrapped_array") public List getPrefixNsWrappedArray() { return prefixNsWrappedArray; } diff --git a/samples/server/petstore/spring-boot-nullable-set/.openapi-generator/VERSION b/samples/server/petstore/spring-boot-nullable-set/.openapi-generator/VERSION index d6b4ec4aa783..ed829dbcddec 100644 --- a/samples/server/petstore/spring-boot-nullable-set/.openapi-generator/VERSION +++ b/samples/server/petstore/spring-boot-nullable-set/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0-SNAPSHOT \ No newline at end of file +6.2.1-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/api/NullableApi.java b/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/api/NullableApi.java index b361abf3ba39..19062e18bd06 100644 --- a/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/api/NullableApi.java +++ b/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/api/NullableApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/model/ObjectWithUniqueItems.java b/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/model/ObjectWithUniqueItems.java index 7052f8d7cfeb..96d1a2a3c4bd 100644 --- a/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/model/ObjectWithUniqueItems.java +++ b/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/model/ObjectWithUniqueItems.java @@ -66,9 +66,9 @@ public ObjectWithUniqueItems addNullSetItem(String nullSetItem) { * Get nullSet * @return nullSet */ - @JsonProperty("nullSet") @Schema(name = "nullSet", required = false) + @JsonProperty("nullSet") public JsonNullable> getNullSet() { return nullSet; } @@ -94,9 +94,9 @@ public ObjectWithUniqueItems addNotNullSetItem(String notNullSetItem) { * Get notNullSet * @return notNullSet */ - @JsonProperty("notNullSet") @Schema(name = "notNullSet", required = false) + @JsonProperty("notNullSet") public Set getNotNullSet() { return notNullSet; } @@ -123,9 +123,9 @@ public ObjectWithUniqueItems addNullListItem(String nullListItem) { * Get nullList * @return nullList */ - @JsonProperty("nullList") @Schema(name = "nullList", required = false) + @JsonProperty("nullList") public JsonNullable> getNullList() { return nullList; } @@ -151,9 +151,9 @@ public ObjectWithUniqueItems addNotNullListItem(String notNullListItem) { * Get notNullList * @return notNullList */ - @JsonProperty("notNullList") @Schema(name = "notNullList", required = false) + @JsonProperty("notNullList") public List getNotNullList() { return notNullList; } @@ -171,9 +171,9 @@ public ObjectWithUniqueItems notNullDateField(OffsetDateTime notNullDateField) { * Get notNullDateField * @return notNullDateField */ - @JsonProperty("notNullDateField") @Valid @Schema(name = "notNullDateField", required = false) + @JsonProperty("notNullDateField") public OffsetDateTime getNotNullDateField() { return notNullDateField; } @@ -191,9 +191,9 @@ public ObjectWithUniqueItems nullDateField(OffsetDateTime nullDateField) { * Get nullDateField * @return nullDateField */ - @JsonProperty("nullDateField") @Valid @Schema(name = "nullDateField", required = false) + @JsonProperty("nullDateField") public OffsetDateTime getNullDateField() { return nullDateField; } diff --git a/samples/server/petstore/spring-stubs/.openapi-generator/VERSION b/samples/server/petstore/spring-stubs/.openapi-generator/VERSION index d6b4ec4aa783..ed829dbcddec 100644 --- a/samples/server/petstore/spring-stubs/.openapi-generator/VERSION +++ b/samples/server/petstore/spring-stubs/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0-SNAPSHOT \ No newline at end of file +6.2.1-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java index 2c9a6dcf5b79..6f4044304b44 100644 --- a/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java index cc4d05b2bb41..c2c5f9e7ef38 100644 --- a/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java index e665e2cdbf97..f27432042ad4 100644 --- a/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/Category.java index 54981cbb60a9..4ca64dd933f3 100644 --- a/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/Category.java @@ -36,9 +36,9 @@ public Category id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -56,9 +56,9 @@ public Category name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/ModelApiResponse.java index 2c232dc89527..a6a565214984 100644 --- a/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -40,9 +40,9 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ - @JsonProperty("code") @ApiModelProperty(value = "") + @JsonProperty("code") public Integer getCode() { return code; } @@ -60,9 +60,9 @@ public ModelApiResponse type(String type) { * Get type * @return type */ - @JsonProperty("type") @ApiModelProperty(value = "") + @JsonProperty("type") public String getType() { return type; } @@ -80,9 +80,9 @@ public ModelApiResponse message(String message) { * Get message * @return message */ - @JsonProperty("message") @ApiModelProperty(value = "") + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/Order.java index 71a0b505c7f4..45802212a9da 100644 --- a/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/Order.java @@ -85,9 +85,9 @@ public Order id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -105,9 +105,9 @@ public Order petId(Long petId) { * Get petId * @return petId */ - @JsonProperty("petId") @ApiModelProperty(value = "") + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -125,9 +125,9 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ - @JsonProperty("quantity") @ApiModelProperty(value = "") + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -145,9 +145,9 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ - @JsonProperty("shipDate") @Valid @ApiModelProperty(value = "") + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -165,9 +165,9 @@ public Order status(StatusEnum status) { * Order Status * @return status */ - @JsonProperty("status") @ApiModelProperty(value = "Order Status") + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -185,9 +185,9 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ - @JsonProperty("complete") @ApiModelProperty(value = "") + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java index 3041d644634e..4b920ce15a20 100644 --- a/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java @@ -88,9 +88,9 @@ public Pet id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -108,9 +108,9 @@ public Pet category(Category category) { * Get category * @return category */ - @JsonProperty("category") @Valid @ApiModelProperty(value = "") + @JsonProperty("category") public Category getCategory() { return category; } @@ -128,9 +128,9 @@ public Pet name(String name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") + @JsonProperty("name") public String getName() { return name; } @@ -153,9 +153,9 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ - @JsonProperty("photoUrls") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; } @@ -181,9 +181,9 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @JsonProperty("tags") @Valid @ApiModelProperty(value = "") + @JsonProperty("tags") public List getTags() { return tags; } @@ -201,9 +201,9 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ - @JsonProperty("status") @ApiModelProperty(value = "pet status in the store") + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/Tag.java index 397f28ba4b4f..b6d3df295734 100644 --- a/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/Tag.java @@ -36,9 +36,9 @@ public Tag id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -56,9 +56,9 @@ public Tag name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/User.java index 42b2a02dc443..a5233b08ae5c 100644 --- a/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/User.java @@ -48,9 +48,9 @@ public User id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -68,9 +68,9 @@ public User username(String username) { * Get username * @return username */ - @JsonProperty("username") @ApiModelProperty(value = "") + @JsonProperty("username") public String getUsername() { return username; } @@ -88,9 +88,9 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ - @JsonProperty("firstName") @ApiModelProperty(value = "") + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -108,9 +108,9 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ - @JsonProperty("lastName") @ApiModelProperty(value = "") + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -128,9 +128,9 @@ public User email(String email) { * Get email * @return email */ - @JsonProperty("email") @ApiModelProperty(value = "") + @JsonProperty("email") public String getEmail() { return email; } @@ -148,9 +148,9 @@ public User password(String password) { * Get password * @return password */ - @JsonProperty("password") @ApiModelProperty(value = "") + @JsonProperty("password") public String getPassword() { return password; } @@ -168,9 +168,9 @@ public User phone(String phone) { * Get phone * @return phone */ - @JsonProperty("phone") @ApiModelProperty(value = "") + @JsonProperty("phone") public String getPhone() { return phone; } @@ -188,9 +188,9 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ - @JsonProperty("userStatus") @ApiModelProperty(value = "User Status") + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/FILES b/samples/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/FILES index 3c2e959bec02..32fdc6a9409b 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/FILES @@ -15,7 +15,6 @@ src/main/java/org/openapitools/api/StoreApi.java src/main/java/org/openapitools/api/StoreApiController.java src/main/java/org/openapitools/api/UserApi.java src/main/java/org/openapitools/api/UserApiController.java -src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/configuration/SpringFoxConfiguration.java src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/VERSION b/samples/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/VERSION index d6b4ec4aa783..ed829dbcddec 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0-SNAPSHOT \ No newline at end of file +6.2.1-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java index b45fcc5dc16c..9ecd403de93c 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApiController.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApiController.java index c2db7ca5a815..65c9de6908c2 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApiController.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApiController.java @@ -28,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class AnotherFakeApiController implements AnotherFakeApi { private final NativeWebRequest request; 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 1220ac16e008..4b87b2def473 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ 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 5ae5d5fed985..b30f53bb595c 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 @@ -38,7 +38,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeApiController implements FakeApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index d54c2670f8e2..decd021376d6 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java index 65b695629d43..05196793d4c2 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java @@ -28,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeClassnameTestApiController implements FakeClassnameTestApi { private final NativeWebRequest request; 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 60ccea3635bc..6247af5faa7b 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ 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 ea6c56e02c11..0b88e5980bf1 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 @@ -30,7 +30,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class PetApiController implements PetApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java index 1afb547b40ee..f4319f650f50 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApiController.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApiController.java index 1292dc0b721d..f8c784ff3838 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApiController.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApiController.java @@ -29,7 +29,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class StoreApiController implements StoreApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java index 981e3a95cbe6..e458b4a0b8bf 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApiController.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApiController.java index ca00184d2a56..894bf6db762e 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApiController.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApiController.java @@ -30,7 +30,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class UserApiController implements UserApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 805450697b7a..57be2f556f53 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -34,9 +34,9 @@ public AdditionalPropertiesAnyType name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 6b55f2777621..f2e2533ad4a2 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -35,9 +35,9 @@ public AdditionalPropertiesArray name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 2cbcb1a3ea3d..f29e8fdc477c 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -34,9 +34,9 @@ public AdditionalPropertiesBoolean name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 168a69386cff..53acae435770 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -72,9 +72,9 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt * Get mapString * @return mapString */ - @JsonProperty("map_string") @ApiModelProperty(value = "") + @JsonProperty("map_string") public Map getMapString() { return mapString; } @@ -100,9 +100,9 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * Get mapNumber * @return mapNumber */ - @JsonProperty("map_number") @Valid @ApiModelProperty(value = "") + @JsonProperty("map_number") public Map getMapNumber() { return mapNumber; } @@ -128,9 +128,9 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege * Get mapInteger * @return mapInteger */ - @JsonProperty("map_integer") @ApiModelProperty(value = "") + @JsonProperty("map_integer") public Map getMapInteger() { return mapInteger; } @@ -156,9 +156,9 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea * Get mapBoolean * @return mapBoolean */ - @JsonProperty("map_boolean") @ApiModelProperty(value = "") + @JsonProperty("map_boolean") public Map getMapBoolean() { return mapBoolean; } @@ -184,9 +184,9 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { return mapArrayInteger; } @@ -212,9 +212,9 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * Get mapArrayAnytype * @return mapArrayAnytype */ - @JsonProperty("map_array_anytype") @Valid @ApiModelProperty(value = "") + @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { return mapArrayAnytype; } @@ -240,9 +240,9 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { return mapMapString; } @@ -268,9 +268,9 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { return mapMapAnytype; } @@ -288,9 +288,9 @@ public AdditionalPropertiesClass anytype1(Object anytype1) { * Get anytype1 * @return anytype1 */ - @JsonProperty("anytype_1") @ApiModelProperty(value = "") + @JsonProperty("anytype_1") public Object getAnytype1() { return anytype1; } @@ -308,9 +308,9 @@ public AdditionalPropertiesClass anytype2(Object anytype2) { * Get anytype2 * @return anytype2 */ - @JsonProperty("anytype_2") @ApiModelProperty(value = "") + @JsonProperty("anytype_2") public Object getAnytype2() { return anytype2; } @@ -328,9 +328,9 @@ public AdditionalPropertiesClass anytype3(Object anytype3) { * Get anytype3 * @return anytype3 */ - @JsonProperty("anytype_3") @ApiModelProperty(value = "") + @JsonProperty("anytype_3") public Object getAnytype3() { return anytype3; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index a58e94eeb4c6..74f4c62dadf6 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -34,9 +34,9 @@ public AdditionalPropertiesInteger name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 358637b55ed5..cb4c419d891c 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -35,9 +35,9 @@ public AdditionalPropertiesNumber name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 9323e4acc464..1dd741d8228d 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -34,9 +34,9 @@ public AdditionalPropertiesObject name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 9e91d5ee4b1b..1b33552ee8a1 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -34,9 +34,9 @@ public AdditionalPropertiesString name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Animal.java index 047875107357..f2aa6cc5bc6d 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Animal.java @@ -51,9 +51,9 @@ public Animal className(String className) { * Get className * @return className */ - @JsonProperty("className") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("className") public String getClassName() { return className; } @@ -71,9 +71,9 @@ public Animal color(String color) { * Get color * @return color */ - @JsonProperty("color") @ApiModelProperty(value = "") + @JsonProperty("color") public String getColor() { return color; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 0866d16c2085..d57f7d32a73d 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -44,9 +44,9 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * Get arrayArrayNumber * @return arrayArrayNumber */ - @JsonProperty("ArrayArrayNumber") @Valid @ApiModelProperty(value = "") + @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index ab4a14712c8e..0e7ab1a961fc 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -44,9 +44,9 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ - @JsonProperty("ArrayNumber") @Valid @ApiModelProperty(value = "") + @JsonProperty("ArrayNumber") public List getArrayNumber() { return arrayNumber; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java index 2a06640386b1..23fffcdcdb53 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java @@ -50,9 +50,9 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) { * Get arrayOfString * @return arrayOfString */ - @JsonProperty("array_of_string") @ApiModelProperty(value = "") + @JsonProperty("array_of_string") public List getArrayOfString() { return arrayOfString; } @@ -78,9 +78,9 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ - @JsonProperty("array_array_of_integer") @Valid @ApiModelProperty(value = "") + @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; } @@ -106,9 +106,9 @@ public ArrayTest addArrayArrayOfModelItem(List arrayArrayOfModelI * Get arrayArrayOfModel * @return arrayArrayOfModel */ - @JsonProperty("array_array_of_model") @Valid @ApiModelProperty(value = "") + @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCat.java index 90929d6dd21a..0079b76bb69f 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCat.java @@ -77,9 +77,9 @@ public BigCat kind(KindEnum kind) { * Get kind * @return kind */ - @JsonProperty("kind") @ApiModelProperty(value = "") + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCatAllOf.java index e82743a46af2..dd11506a9036 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCatAllOf.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCatAllOf.java @@ -74,9 +74,9 @@ public BigCatAllOf kind(KindEnum kind) { * Get kind * @return kind */ - @JsonProperty("kind") @ApiModelProperty(value = "") + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Capitalization.java index 71725188bcf0..96aca57f16f9 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Capitalization.java @@ -42,9 +42,9 @@ public Capitalization smallCamel(String smallCamel) { * Get smallCamel * @return smallCamel */ - @JsonProperty("smallCamel") @ApiModelProperty(value = "") + @JsonProperty("smallCamel") public String getSmallCamel() { return smallCamel; } @@ -62,9 +62,9 @@ public Capitalization capitalCamel(String capitalCamel) { * Get capitalCamel * @return capitalCamel */ - @JsonProperty("CapitalCamel") @ApiModelProperty(value = "") + @JsonProperty("CapitalCamel") public String getCapitalCamel() { return capitalCamel; } @@ -82,9 +82,9 @@ public Capitalization smallSnake(String smallSnake) { * Get smallSnake * @return smallSnake */ - @JsonProperty("small_Snake") @ApiModelProperty(value = "") + @JsonProperty("small_Snake") public String getSmallSnake() { return smallSnake; } @@ -102,9 +102,9 @@ public Capitalization capitalSnake(String capitalSnake) { * Get capitalSnake * @return capitalSnake */ - @JsonProperty("Capital_Snake") @ApiModelProperty(value = "") + @JsonProperty("Capital_Snake") public String getCapitalSnake() { return capitalSnake; } @@ -122,9 +122,9 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) { * Get scAETHFlowPoints * @return scAETHFlowPoints */ - @JsonProperty("SCA_ETH_Flow_Points") @ApiModelProperty(value = "") + @JsonProperty("SCA_ETH_Flow_Points") public String getScAETHFlowPoints() { return scAETHFlowPoints; } @@ -142,9 +142,9 @@ public Capitalization ATT_NAME(String ATT_NAME) { * Name of the pet * @return ATT_NAME */ - @JsonProperty("ATT_NAME") @ApiModelProperty(value = "Name of the pet ") + @JsonProperty("ATT_NAME") public String getATTNAME() { return ATT_NAME; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Cat.java index f38bef8ddffd..1898e2d20964 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Cat.java @@ -46,9 +46,9 @@ public Cat declawed(Boolean declawed) { * Get declawed * @return declawed */ - @JsonProperty("declawed") @ApiModelProperty(value = "") + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/CatAllOf.java index 7aefc5712b73..fbde7c3a8dcd 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/CatAllOf.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/CatAllOf.java @@ -34,9 +34,9 @@ public CatAllOf declawed(Boolean declawed) { * Get declawed * @return declawed */ - @JsonProperty("declawed") @ApiModelProperty(value = "") + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Category.java index e12f5918f918..72fa02d6ae5f 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Category.java @@ -34,9 +34,9 @@ public Category id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -54,9 +54,9 @@ public Category name(String name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ClassModel.java index 627307f66567..630599723ec8 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ClassModel.java @@ -33,9 +33,9 @@ public ClassModel propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ - @JsonProperty("_class") @ApiModelProperty(value = "") + @JsonProperty("_class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Client.java index 7b8131fdb4a3..12947bfa3d9f 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Client.java @@ -32,9 +32,9 @@ public Client client(String client) { * Get client * @return client */ - @JsonProperty("client") @ApiModelProperty(value = "") + @JsonProperty("client") public String getClient() { return client; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Dog.java index 703a2c29f33f..d764a7ae26d5 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Dog.java @@ -37,9 +37,9 @@ public Dog breed(String breed) { * Get breed * @return breed */ - @JsonProperty("breed") @ApiModelProperty(value = "") + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/DogAllOf.java index 4db2a11a829f..c1ff31fcefc5 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/DogAllOf.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/DogAllOf.java @@ -34,9 +34,9 @@ public DogAllOf breed(String breed) { * Get breed * @return breed */ - @JsonProperty("breed") @ApiModelProperty(value = "") + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java index d80a1ff5f57e..9a59e8960527 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java @@ -108,9 +108,9 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) { * Get justSymbol * @return justSymbol */ - @JsonProperty("just_symbol") @ApiModelProperty(value = "") + @JsonProperty("just_symbol") public JustSymbolEnum getJustSymbol() { return justSymbol; } @@ -136,9 +136,9 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) { * Get arrayEnum * @return arrayEnum */ - @JsonProperty("array_enum") @ApiModelProperty(value = "") + @JsonProperty("array_enum") public List getArrayEnum() { return arrayEnum; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumTest.java index b53f11641197..dd04d204b43f 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumTest.java @@ -188,9 +188,9 @@ public EnumTest enumString(EnumStringEnum enumString) { * Get enumString * @return enumString */ - @JsonProperty("enum_string") @ApiModelProperty(value = "") + @JsonProperty("enum_string") public EnumStringEnum getEnumString() { return enumString; } @@ -208,9 +208,9 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) { * Get enumStringRequired * @return enumStringRequired */ - @JsonProperty("enum_string_required") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("enum_string_required") public EnumStringRequiredEnum getEnumStringRequired() { return enumStringRequired; } @@ -228,9 +228,9 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) { * Get enumInteger * @return enumInteger */ - @JsonProperty("enum_integer") @ApiModelProperty(value = "") + @JsonProperty("enum_integer") public EnumIntegerEnum getEnumInteger() { return enumInteger; } @@ -248,9 +248,9 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) { * Get enumNumber * @return enumNumber */ - @JsonProperty("enum_number") @ApiModelProperty(value = "") + @JsonProperty("enum_number") public EnumNumberEnum getEnumNumber() { return enumNumber; } @@ -268,9 +268,9 @@ public EnumTest outerEnum(OuterEnum outerEnum) { * Get outerEnum * @return outerEnum */ - @JsonProperty("outerEnum") @Valid @ApiModelProperty(value = "") + @JsonProperty("outerEnum") public OuterEnum getOuterEnum() { return outerEnum; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/File.java index 046fabe455a0..19a28937ff00 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/File.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/File.java @@ -33,9 +33,9 @@ public File sourceURI(String sourceURI) { * Test capitalization * @return sourceURI */ - @JsonProperty("sourceURI") @ApiModelProperty(value = "Test capitalization") + @JsonProperty("sourceURI") public String getSourceURI() { return sourceURI; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 375e0f9f1f68..d753e63bbb9c 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -38,9 +38,9 @@ public FileSchemaTestClass file(File file) { * Get file * @return file */ - @JsonProperty("file") @Valid @ApiModelProperty(value = "") + @JsonProperty("file") public File getFile() { return file; } @@ -66,9 +66,9 @@ public FileSchemaTestClass addFilesItem(File filesItem) { * Get files * @return files */ - @JsonProperty("files") @Valid @ApiModelProperty(value = "") + @JsonProperty("files") public List getFiles() { return files; } 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 e219159eb2f6..274d8a7e692e 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 @@ -70,9 +70,9 @@ public FormatTest integer(Integer integer) { * maximum: 100 * @return integer */ - @JsonProperty("integer") @Min(10) @Max(100) @ApiModelProperty(value = "") + @JsonProperty("integer") public Integer getInteger() { return integer; } @@ -92,9 +92,9 @@ public FormatTest int32(Integer int32) { * maximum: 200 * @return int32 */ - @JsonProperty("int32") @Min(20) @Max(200) @ApiModelProperty(value = "") + @JsonProperty("int32") public Integer getInt32() { return int32; } @@ -112,9 +112,9 @@ public FormatTest int64(Long int64) { * Get int64 * @return int64 */ - @JsonProperty("int64") @ApiModelProperty(value = "") + @JsonProperty("int64") public Long getInt64() { return int64; } @@ -134,9 +134,9 @@ public FormatTest number(BigDecimal number) { * maximum: 543.2 * @return number */ - @JsonProperty("number") @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") @ApiModelProperty(required = true, value = "") + @JsonProperty("number") public BigDecimal getNumber() { return number; } @@ -156,9 +156,9 @@ public FormatTest _float(Float _float) { * maximum: 987.6 * @return _float */ - @JsonProperty("float") @DecimalMin("54.3") @DecimalMax("987.6") @ApiModelProperty(value = "") + @JsonProperty("float") public Float getFloat() { return _float; } @@ -178,9 +178,9 @@ public FormatTest _double(Double _double) { * maximum: 123.4 * @return _double */ - @JsonProperty("double") @DecimalMin("67.8") @DecimalMax("123.4") @ApiModelProperty(value = "") + @JsonProperty("double") public Double getDouble() { return _double; } @@ -198,9 +198,9 @@ public FormatTest string(String string) { * Get string * @return string */ - @JsonProperty("string") @Pattern(regexp = "/[a-z]/i") @ApiModelProperty(value = "") + @JsonProperty("string") public String getString() { return string; } @@ -218,9 +218,9 @@ public FormatTest _byte(byte[] _byte) { * Get _byte * @return _byte */ - @JsonProperty("byte") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("byte") public byte[] getByte() { return _byte; } @@ -238,9 +238,9 @@ public FormatTest binary(org.springframework.core.io.Resource binary) { * Get binary * @return binary */ - @JsonProperty("binary") @Valid @ApiModelProperty(value = "") + @JsonProperty("binary") public org.springframework.core.io.Resource getBinary() { return binary; } @@ -258,9 +258,9 @@ public FormatTest date(LocalDate date) { * Get date * @return date */ - @JsonProperty("date") @NotNull @Valid @ApiModelProperty(required = true, value = "") + @JsonProperty("date") public LocalDate getDate() { return date; } @@ -278,9 +278,9 @@ public FormatTest dateTime(OffsetDateTime dateTime) { * Get dateTime * @return dateTime */ - @JsonProperty("dateTime") @Valid @ApiModelProperty(value = "") + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -298,9 +298,9 @@ public FormatTest uuid(UUID uuid) { * Get uuid * @return uuid */ - @JsonProperty("uuid") @Valid @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -318,9 +318,9 @@ public FormatTest password(String password) { * Get password * @return password */ - @JsonProperty("password") @NotNull @Size(min = 10, max = 64) @ApiModelProperty(required = true, value = "") + @JsonProperty("password") public String getPassword() { return password; } @@ -338,9 +338,9 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) { * Get bigDecimal * @return bigDecimal */ - @JsonProperty("BigDecimal") @Valid @ApiModelProperty(value = "") + @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { return bigDecimal; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index d2e2fa4ea223..aac0264cd7da 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -36,9 +36,9 @@ public HasOnlyReadOnly bar(String bar) { * Get bar * @return bar */ - @JsonProperty("bar") @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("bar") public String getBar() { return bar; } @@ -56,9 +56,9 @@ public HasOnlyReadOnly foo(String foo) { * Get foo * @return foo */ - @JsonProperty("foo") @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("foo") public String getFoo() { return foo; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MapTest.java index f70d3e0f791a..95535e510798 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MapTest.java @@ -88,9 +88,9 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapMapOfString * @return mapMapOfString */ - @JsonProperty("map_map_of_string") @Valid @ApiModelProperty(value = "") + @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { return mapMapOfString; } @@ -116,9 +116,9 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) * Get mapOfEnumString * @return mapOfEnumString */ - @JsonProperty("map_of_enum_string") @ApiModelProperty(value = "") + @JsonProperty("map_of_enum_string") public Map getMapOfEnumString() { return mapOfEnumString; } @@ -144,9 +144,9 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) { * Get directMap * @return directMap */ - @JsonProperty("direct_map") @ApiModelProperty(value = "") + @JsonProperty("direct_map") public Map getDirectMap() { return directMap; } @@ -172,9 +172,9 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) { * Get indirectMap * @return indirectMap */ - @JsonProperty("indirect_map") @ApiModelProperty(value = "") + @JsonProperty("indirect_map") public Map getIndirectMap() { return indirectMap; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 2638ea4c2b3b..5d1c46dfc0a5 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -44,9 +44,9 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { * Get uuid * @return uuid */ - @JsonProperty("uuid") @Valid @ApiModelProperty(value = "") + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -64,9 +64,9 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT * Get dateTime * @return dateTime */ - @JsonProperty("dateTime") @Valid @ApiModelProperty(value = "") + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -92,9 +92,9 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * Get map * @return map */ - @JsonProperty("map") @Valid @ApiModelProperty(value = "") + @JsonProperty("map") public Map getMap() { return map; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Model200Response.java index 2d8cbff35302..88fb0a01d340 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Model200Response.java @@ -37,9 +37,9 @@ public Model200Response name(Integer name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public Integer getName() { return name; } @@ -57,9 +57,9 @@ public Model200Response propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ - @JsonProperty("class") @ApiModelProperty(value = "") + @JsonProperty("class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelApiResponse.java index 6e87a00f0fea..dd87a3c1b394 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -38,9 +38,9 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ - @JsonProperty("code") @ApiModelProperty(value = "") + @JsonProperty("code") public Integer getCode() { return code; } @@ -58,9 +58,9 @@ public ModelApiResponse type(String type) { * Get type * @return type */ - @JsonProperty("type") @ApiModelProperty(value = "") + @JsonProperty("type") public String getType() { return type; } @@ -78,9 +78,9 @@ public ModelApiResponse message(String message) { * Get message * @return message */ - @JsonProperty("message") @ApiModelProperty(value = "") + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelList.java index 16e4dcfe630b..4705ec66df4c 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelList.java @@ -34,9 +34,9 @@ public ModelList _123list(String _123list) { * Get _123list * @return _123list */ - @JsonProperty("123-list") @ApiModelProperty(value = "") + @JsonProperty("123-list") public String get123list() { return _123list; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelReturn.java index 564fe0bf61fb..997950759deb 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelReturn.java @@ -35,9 +35,9 @@ public ModelReturn _return(Integer _return) { * Get _return * @return _return */ - @JsonProperty("return") @ApiModelProperty(value = "") + @JsonProperty("return") public Integer getReturn() { return _return; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Name.java index 85971ede0398..c902e05248d0 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Name.java @@ -39,9 +39,9 @@ public Name name(Integer name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("name") public Integer getName() { return name; } @@ -59,9 +59,9 @@ public Name snakeCase(Integer snakeCase) { * Get snakeCase * @return snakeCase */ - @JsonProperty("snake_case") @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("snake_case") public Integer getSnakeCase() { return snakeCase; } @@ -79,9 +79,9 @@ public Name property(String property) { * Get property * @return property */ - @JsonProperty("property") @ApiModelProperty(value = "") + @JsonProperty("property") public String getProperty() { return property; } @@ -99,9 +99,9 @@ public Name _123number(Integer _123number) { * Get _123number * @return _123number */ - @JsonProperty("123Number") @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("123Number") public Integer get123number() { return _123number; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/NumberOnly.java index cf7314fcb52d..7c96db2d2c52 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/NumberOnly.java @@ -33,9 +33,9 @@ public NumberOnly justNumber(BigDecimal justNumber) { * Get justNumber * @return justNumber */ - @JsonProperty("JustNumber") @Valid @ApiModelProperty(value = "") + @JsonProperty("JustNumber") public BigDecimal getJustNumber() { return justNumber; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Order.java index 2177faf7f781..4492c665a86d 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Order.java @@ -83,9 +83,9 @@ public Order id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -103,9 +103,9 @@ public Order petId(Long petId) { * Get petId * @return petId */ - @JsonProperty("petId") @ApiModelProperty(value = "") + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -123,9 +123,9 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ - @JsonProperty("quantity") @ApiModelProperty(value = "") + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -143,9 +143,9 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ - @JsonProperty("shipDate") @Valid @ApiModelProperty(value = "") + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -163,9 +163,9 @@ public Order status(StatusEnum status) { * Order Status * @return status */ - @JsonProperty("status") @ApiModelProperty(value = "Order Status") + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -183,9 +183,9 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ - @JsonProperty("complete") @ApiModelProperty(value = "") + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/OuterComposite.java index 2cb77a6e8a9d..10b8a8879a3a 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/OuterComposite.java @@ -37,9 +37,9 @@ public OuterComposite myNumber(BigDecimal myNumber) { * Get myNumber * @return myNumber */ - @JsonProperty("my_number") @Valid @ApiModelProperty(value = "") + @JsonProperty("my_number") public BigDecimal getMyNumber() { return myNumber; } @@ -57,9 +57,9 @@ public OuterComposite myString(String myString) { * Get myString * @return myString */ - @JsonProperty("my_string") @ApiModelProperty(value = "") + @JsonProperty("my_string") public String getMyString() { return myString; } @@ -77,9 +77,9 @@ public OuterComposite myBoolean(Boolean myBoolean) { * Get myBoolean * @return myBoolean */ - @JsonProperty("my_boolean") @ApiModelProperty(value = "") + @JsonProperty("my_boolean") public Boolean getMyBoolean() { return myBoolean; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java index aea4d64318e5..170e1eac3f23 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java @@ -89,9 +89,9 @@ public Pet id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -109,9 +109,9 @@ public Pet category(Category category) { * Get category * @return category */ - @JsonProperty("category") @Valid @ApiModelProperty(value = "") + @JsonProperty("category") public Category getCategory() { return category; } @@ -129,9 +129,9 @@ public Pet name(String name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") + @JsonProperty("name") public String getName() { return name; } @@ -157,9 +157,9 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ - @JsonProperty("photoUrls") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("photoUrls") public Set getPhotoUrls() { return photoUrls; } @@ -186,9 +186,9 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @JsonProperty("tags") @Valid @ApiModelProperty(value = "") + @JsonProperty("tags") public List getTags() { return tags; } @@ -206,9 +206,9 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ - @JsonProperty("status") @ApiModelProperty(value = "pet status in the store") + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ReadOnlyFirst.java index 94470d74ed59..2e16544e4cdc 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -34,9 +34,9 @@ public ReadOnlyFirst bar(String bar) { * Get bar * @return bar */ - @JsonProperty("bar") @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("bar") public String getBar() { return bar; } @@ -54,9 +54,9 @@ public ReadOnlyFirst baz(String baz) { * Get baz * @return baz */ - @JsonProperty("baz") @ApiModelProperty(value = "") + @JsonProperty("baz") public String getBaz() { return baz; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/SpecialModelName.java index 00beb2864cdd..5e78a83bb9c3 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/SpecialModelName.java @@ -34,9 +34,9 @@ public class SpecialModelName { * Get $specialPropertyName * @return $specialPropertyName */ - @JsonProperty("$special[property.name]") @ApiModelProperty(value = "") + @JsonProperty("$special[property.name]") public Long get$SpecialPropertyName() { return $specialPropertyName; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Tag.java index cedb8790bb63..ea0574787c28 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Tag.java @@ -34,9 +34,9 @@ public Tag id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -54,9 +54,9 @@ public Tag name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java index c41427d3d288..6d969e9ab3ae 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -44,9 +44,9 @@ public TypeHolderDefault stringItem(String stringItem) { * Get stringItem * @return stringItem */ - @JsonProperty("string_item") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -64,9 +64,9 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ - @JsonProperty("number_item") @NotNull @Valid @ApiModelProperty(required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -84,9 +84,9 @@ public TypeHolderDefault integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ - @JsonProperty("integer_item") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -104,9 +104,9 @@ public TypeHolderDefault boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ - @JsonProperty("bool_item") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -132,9 +132,9 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ - @JsonProperty("array_item") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java index 475f82dc3f76..ac9a8e0666d2 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -46,9 +46,9 @@ public TypeHolderExample stringItem(String stringItem) { * Get stringItem * @return stringItem */ - @JsonProperty("string_item") @NotNull @ApiModelProperty(example = "what", required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -66,9 +66,9 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ - @JsonProperty("number_item") @NotNull @Valid @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -86,9 +86,9 @@ public TypeHolderExample floatItem(Float floatItem) { * Get floatItem * @return floatItem */ - @JsonProperty("float_item") @NotNull @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("float_item") public Float getFloatItem() { return floatItem; } @@ -106,9 +106,9 @@ public TypeHolderExample integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ - @JsonProperty("integer_item") @NotNull @ApiModelProperty(example = "-2", required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -126,9 +126,9 @@ public TypeHolderExample boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ - @JsonProperty("bool_item") @NotNull @ApiModelProperty(example = "true", required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -154,9 +154,9 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ - @JsonProperty("array_item") @NotNull @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/User.java index ddf0023eb61f..f9546be0278f 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/User.java @@ -46,9 +46,9 @@ public User id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -66,9 +66,9 @@ public User username(String username) { * Get username * @return username */ - @JsonProperty("username") @ApiModelProperty(value = "") + @JsonProperty("username") public String getUsername() { return username; } @@ -86,9 +86,9 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ - @JsonProperty("firstName") @ApiModelProperty(value = "") + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -106,9 +106,9 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ - @JsonProperty("lastName") @ApiModelProperty(value = "") + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -126,9 +126,9 @@ public User email(String email) { * Get email * @return email */ - @JsonProperty("email") @ApiModelProperty(value = "") + @JsonProperty("email") public String getEmail() { return email; } @@ -146,9 +146,9 @@ public User password(String password) { * Get password * @return password */ - @JsonProperty("password") @ApiModelProperty(value = "") + @JsonProperty("password") public String getPassword() { return password; } @@ -166,9 +166,9 @@ public User phone(String phone) { * Get phone * @return phone */ - @JsonProperty("phone") @ApiModelProperty(value = "") + @JsonProperty("phone") public String getPhone() { return phone; } @@ -186,9 +186,9 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ - @JsonProperty("userStatus") @ApiModelProperty(value = "User Status") + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java index 8b6051157c9e..3bf05f513414 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java @@ -100,9 +100,9 @@ public XmlItem attributeString(String attributeString) { * Get attributeString * @return attributeString */ - @JsonProperty("attribute_string") @ApiModelProperty(example = "string", value = "") + @JsonProperty("attribute_string") public String getAttributeString() { return attributeString; } @@ -120,9 +120,9 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) { * Get attributeNumber * @return attributeNumber */ - @JsonProperty("attribute_number") @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("attribute_number") public BigDecimal getAttributeNumber() { return attributeNumber; } @@ -140,9 +140,9 @@ public XmlItem attributeInteger(Integer attributeInteger) { * Get attributeInteger * @return attributeInteger */ - @JsonProperty("attribute_integer") @ApiModelProperty(example = "-2", value = "") + @JsonProperty("attribute_integer") public Integer getAttributeInteger() { return attributeInteger; } @@ -160,9 +160,9 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) { * Get attributeBoolean * @return attributeBoolean */ - @JsonProperty("attribute_boolean") @ApiModelProperty(example = "true", value = "") + @JsonProperty("attribute_boolean") public Boolean getAttributeBoolean() { return attributeBoolean; } @@ -188,9 +188,9 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) { * Get wrappedArray * @return wrappedArray */ - @JsonProperty("wrapped_array") @ApiModelProperty(value = "") + @JsonProperty("wrapped_array") public List getWrappedArray() { return wrappedArray; } @@ -208,9 +208,9 @@ public XmlItem nameString(String nameString) { * Get nameString * @return nameString */ - @JsonProperty("name_string") @ApiModelProperty(example = "string", value = "") + @JsonProperty("name_string") public String getNameString() { return nameString; } @@ -228,9 +228,9 @@ public XmlItem nameNumber(BigDecimal nameNumber) { * Get nameNumber * @return nameNumber */ - @JsonProperty("name_number") @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("name_number") public BigDecimal getNameNumber() { return nameNumber; } @@ -248,9 +248,9 @@ public XmlItem nameInteger(Integer nameInteger) { * Get nameInteger * @return nameInteger */ - @JsonProperty("name_integer") @ApiModelProperty(example = "-2", value = "") + @JsonProperty("name_integer") public Integer getNameInteger() { return nameInteger; } @@ -268,9 +268,9 @@ public XmlItem nameBoolean(Boolean nameBoolean) { * Get nameBoolean * @return nameBoolean */ - @JsonProperty("name_boolean") @ApiModelProperty(example = "true", value = "") + @JsonProperty("name_boolean") public Boolean getNameBoolean() { return nameBoolean; } @@ -296,9 +296,9 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) { * Get nameArray * @return nameArray */ - @JsonProperty("name_array") @ApiModelProperty(value = "") + @JsonProperty("name_array") public List getNameArray() { return nameArray; } @@ -324,9 +324,9 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) { * Get nameWrappedArray * @return nameWrappedArray */ - @JsonProperty("name_wrapped_array") @ApiModelProperty(value = "") + @JsonProperty("name_wrapped_array") public List getNameWrappedArray() { return nameWrappedArray; } @@ -344,9 +344,9 @@ public XmlItem prefixString(String prefixString) { * Get prefixString * @return prefixString */ - @JsonProperty("prefix_string") @ApiModelProperty(example = "string", value = "") + @JsonProperty("prefix_string") public String getPrefixString() { return prefixString; } @@ -364,9 +364,9 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) { * Get prefixNumber * @return prefixNumber */ - @JsonProperty("prefix_number") @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("prefix_number") public BigDecimal getPrefixNumber() { return prefixNumber; } @@ -384,9 +384,9 @@ public XmlItem prefixInteger(Integer prefixInteger) { * Get prefixInteger * @return prefixInteger */ - @JsonProperty("prefix_integer") @ApiModelProperty(example = "-2", value = "") + @JsonProperty("prefix_integer") public Integer getPrefixInteger() { return prefixInteger; } @@ -404,9 +404,9 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) { * Get prefixBoolean * @return prefixBoolean */ - @JsonProperty("prefix_boolean") @ApiModelProperty(example = "true", value = "") + @JsonProperty("prefix_boolean") public Boolean getPrefixBoolean() { return prefixBoolean; } @@ -432,9 +432,9 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) { * Get prefixArray * @return prefixArray */ - @JsonProperty("prefix_array") @ApiModelProperty(value = "") + @JsonProperty("prefix_array") public List getPrefixArray() { return prefixArray; } @@ -460,9 +460,9 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) { * Get prefixWrappedArray * @return prefixWrappedArray */ - @JsonProperty("prefix_wrapped_array") @ApiModelProperty(value = "") + @JsonProperty("prefix_wrapped_array") public List getPrefixWrappedArray() { return prefixWrappedArray; } @@ -480,9 +480,9 @@ public XmlItem namespaceString(String namespaceString) { * Get namespaceString * @return namespaceString */ - @JsonProperty("namespace_string") @ApiModelProperty(example = "string", value = "") + @JsonProperty("namespace_string") public String getNamespaceString() { return namespaceString; } @@ -500,9 +500,9 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) { * Get namespaceNumber * @return namespaceNumber */ - @JsonProperty("namespace_number") @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("namespace_number") public BigDecimal getNamespaceNumber() { return namespaceNumber; } @@ -520,9 +520,9 @@ public XmlItem namespaceInteger(Integer namespaceInteger) { * Get namespaceInteger * @return namespaceInteger */ - @JsonProperty("namespace_integer") @ApiModelProperty(example = "-2", value = "") + @JsonProperty("namespace_integer") public Integer getNamespaceInteger() { return namespaceInteger; } @@ -540,9 +540,9 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) { * Get namespaceBoolean * @return namespaceBoolean */ - @JsonProperty("namespace_boolean") @ApiModelProperty(example = "true", value = "") + @JsonProperty("namespace_boolean") public Boolean getNamespaceBoolean() { return namespaceBoolean; } @@ -568,9 +568,9 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) { * Get namespaceArray * @return namespaceArray */ - @JsonProperty("namespace_array") @ApiModelProperty(value = "") + @JsonProperty("namespace_array") public List getNamespaceArray() { return namespaceArray; } @@ -596,9 +596,9 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) { * Get namespaceWrappedArray * @return namespaceWrappedArray */ - @JsonProperty("namespace_wrapped_array") @ApiModelProperty(value = "") + @JsonProperty("namespace_wrapped_array") public List getNamespaceWrappedArray() { return namespaceWrappedArray; } @@ -616,9 +616,9 @@ public XmlItem prefixNsString(String prefixNsString) { * Get prefixNsString * @return prefixNsString */ - @JsonProperty("prefix_ns_string") @ApiModelProperty(example = "string", value = "") + @JsonProperty("prefix_ns_string") public String getPrefixNsString() { return prefixNsString; } @@ -636,9 +636,9 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) { * Get prefixNsNumber * @return prefixNsNumber */ - @JsonProperty("prefix_ns_number") @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("prefix_ns_number") public BigDecimal getPrefixNsNumber() { return prefixNsNumber; } @@ -656,9 +656,9 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) { * Get prefixNsInteger * @return prefixNsInteger */ - @JsonProperty("prefix_ns_integer") @ApiModelProperty(example = "-2", value = "") + @JsonProperty("prefix_ns_integer") public Integer getPrefixNsInteger() { return prefixNsInteger; } @@ -676,9 +676,9 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) { * Get prefixNsBoolean * @return prefixNsBoolean */ - @JsonProperty("prefix_ns_boolean") @ApiModelProperty(example = "true", value = "") + @JsonProperty("prefix_ns_boolean") public Boolean getPrefixNsBoolean() { return prefixNsBoolean; } @@ -704,9 +704,9 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) { * Get prefixNsArray * @return prefixNsArray */ - @JsonProperty("prefix_ns_array") @ApiModelProperty(value = "") + @JsonProperty("prefix_ns_array") public List getPrefixNsArray() { return prefixNsArray; } @@ -732,9 +732,9 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) { * Get prefixNsWrappedArray * @return prefixNsWrappedArray */ - @JsonProperty("prefix_ns_wrapped_array") @ApiModelProperty(value = "") + @JsonProperty("prefix_ns_wrapped_array") public List getPrefixNsWrappedArray() { return prefixNsWrappedArray; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/resources/openapi.yaml index 2999e6f2f8d6..5fdcfc33eada 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/resources/openapi.yaml @@ -2111,7 +2111,6 @@ components: status: description: Updated status of the pet type: string - type: object uploadFile_request: properties: additionalMetadata: @@ -2121,7 +2120,6 @@ components: description: file to upload format: binary type: string - type: object testEnumParameters_request: properties: enum_form_string_array: @@ -2141,7 +2139,6 @@ components: - -efg - (xyz) type: string - type: object testEndpointParameters_request: properties: integer: @@ -2214,7 +2211,6 @@ components: - double - number - pattern_without_delimiter - type: object testJsonFormData_request: properties: param: @@ -2226,7 +2222,6 @@ components: required: - param - param2 - type: object uploadFileWithRequiredFile_request: properties: additionalMetadata: @@ -2238,7 +2233,6 @@ components: type: string required: - requiredFile - type: object Dog_allOf: properties: breed: diff --git a/samples/server/petstore/springboot-beanvalidation/.openapi-generator/FILES b/samples/server/petstore/springboot-beanvalidation/.openapi-generator/FILES index d61b6cf83bfd..ff6da0b88a7c 100644 --- a/samples/server/petstore/springboot-beanvalidation/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-beanvalidation/.openapi-generator/FILES @@ -15,7 +15,6 @@ src/main/java/org/openapitools/api/StoreApi.java src/main/java/org/openapitools/api/StoreApiController.java src/main/java/org/openapitools/api/UserApi.java src/main/java/org/openapitools/api/UserApiController.java -src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/configuration/SpringFoxConfiguration.java src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java diff --git a/samples/server/petstore/springboot-beanvalidation/.openapi-generator/VERSION b/samples/server/petstore/springboot-beanvalidation/.openapi-generator/VERSION index d6b4ec4aa783..ed829dbcddec 100644 --- a/samples/server/petstore/springboot-beanvalidation/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-beanvalidation/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0-SNAPSHOT \ No newline at end of file +6.2.1-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java index b45fcc5dc16c..9ecd403de93c 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApiController.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApiController.java index c2db7ca5a815..65c9de6908c2 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApiController.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApiController.java @@ -28,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class AnotherFakeApiController implements AnotherFakeApi { private final NativeWebRequest request; 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 1220ac16e008..4b87b2def473 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApiController.java index 5ae5d5fed985..b30f53bb595c 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApiController.java @@ -38,7 +38,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeApiController implements FakeApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index d54c2670f8e2..decd021376d6 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java index 65b695629d43..05196793d4c2 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java @@ -28,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeClassnameTestApiController implements FakeClassnameTestApi { private final NativeWebRequest request; 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 60ccea3635bc..6247af5faa7b 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApiController.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApiController.java index ea6c56e02c11..0b88e5980bf1 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApiController.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApiController.java @@ -30,7 +30,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class PetApiController implements PetApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java index 1afb547b40ee..f4319f650f50 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApiController.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApiController.java index 1292dc0b721d..f8c784ff3838 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApiController.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApiController.java @@ -29,7 +29,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class StoreApiController implements StoreApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java index 981e3a95cbe6..e458b4a0b8bf 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApiController.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApiController.java index ca00184d2a56..894bf6db762e 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApiController.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApiController.java @@ -30,7 +30,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class UserApiController implements UserApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index cb51920a8c28..686fafb2faaf 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -35,9 +35,9 @@ public AdditionalPropertiesAnyType name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 1c66a636116f..a2c3df24a2df 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -36,9 +36,9 @@ public AdditionalPropertiesArray name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 1dcc607639bf..82fcada6f56a 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -35,9 +35,9 @@ public AdditionalPropertiesBoolean name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 74250eb564ad..7b720b30d83a 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -73,9 +73,9 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt * Get mapString * @return mapString */ - @JsonProperty("map_string") @ApiModelProperty(value = "") + @JsonProperty("map_string") public Map getMapString() { return mapString; } @@ -101,9 +101,9 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * Get mapNumber * @return mapNumber */ - @JsonProperty("map_number") @Valid @ApiModelProperty(value = "") + @JsonProperty("map_number") public Map getMapNumber() { return mapNumber; } @@ -129,9 +129,9 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege * Get mapInteger * @return mapInteger */ - @JsonProperty("map_integer") @ApiModelProperty(value = "") + @JsonProperty("map_integer") public Map getMapInteger() { return mapInteger; } @@ -157,9 +157,9 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea * Get mapBoolean * @return mapBoolean */ - @JsonProperty("map_boolean") @ApiModelProperty(value = "") + @JsonProperty("map_boolean") public Map getMapBoolean() { return mapBoolean; } @@ -185,9 +185,9 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { return mapArrayInteger; } @@ -213,9 +213,9 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * Get mapArrayAnytype * @return mapArrayAnytype */ - @JsonProperty("map_array_anytype") @Valid @ApiModelProperty(value = "") + @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { return mapArrayAnytype; } @@ -241,9 +241,9 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { return mapMapString; } @@ -269,9 +269,9 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { return mapMapAnytype; } @@ -289,9 +289,9 @@ public AdditionalPropertiesClass anytype1(Object anytype1) { * Get anytype1 * @return anytype1 */ - @JsonProperty("anytype_1") @ApiModelProperty(value = "") + @JsonProperty("anytype_1") public Object getAnytype1() { return anytype1; } @@ -309,9 +309,9 @@ public AdditionalPropertiesClass anytype2(Object anytype2) { * Get anytype2 * @return anytype2 */ - @JsonProperty("anytype_2") @ApiModelProperty(value = "") + @JsonProperty("anytype_2") public Object getAnytype2() { return anytype2; } @@ -329,9 +329,9 @@ public AdditionalPropertiesClass anytype3(Object anytype3) { * Get anytype3 * @return anytype3 */ - @JsonProperty("anytype_3") @ApiModelProperty(value = "") + @JsonProperty("anytype_3") public Object getAnytype3() { return anytype3; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index ce8b8d62436c..ea2ec5365edc 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -35,9 +35,9 @@ public AdditionalPropertiesInteger name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index dec791e0a273..4ca4b5a2f509 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -36,9 +36,9 @@ public AdditionalPropertiesNumber name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 546d0ab9216f..7b9d8ef0b0b2 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -35,9 +35,9 @@ public AdditionalPropertiesObject name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index c1f95cf62e81..fdc4baa9de7b 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -35,9 +35,9 @@ public AdditionalPropertiesString name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Animal.java index e880f829164c..dfb303255b3b 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Animal.java @@ -52,9 +52,9 @@ public Animal className(String className) { * Get className * @return className */ - @JsonProperty("className") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("className") public String getClassName() { return className; } @@ -72,9 +72,9 @@ public Animal color(String color) { * Get color * @return color */ - @JsonProperty("color") @ApiModelProperty(value = "") + @JsonProperty("color") public String getColor() { return color; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 46ab3b631960..42b8443e9be2 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -45,9 +45,9 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * Get arrayArrayNumber * @return arrayArrayNumber */ - @JsonProperty("ArrayArrayNumber") @Valid @ApiModelProperty(value = "") + @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index cb5358905469..f60290a4d8ad 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -45,9 +45,9 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ - @JsonProperty("ArrayNumber") @Valid @ApiModelProperty(value = "") + @JsonProperty("ArrayNumber") public List getArrayNumber() { return arrayNumber; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayTest.java index 55cc431ecde6..8bb3f76ca666 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayTest.java @@ -51,9 +51,9 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) { * Get arrayOfString * @return arrayOfString */ - @JsonProperty("array_of_string") @ApiModelProperty(value = "") + @JsonProperty("array_of_string") public List getArrayOfString() { return arrayOfString; } @@ -79,9 +79,9 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ - @JsonProperty("array_array_of_integer") @Valid @ApiModelProperty(value = "") + @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; } @@ -107,9 +107,9 @@ public ArrayTest addArrayArrayOfModelItem(List arrayArrayOfModelI * Get arrayArrayOfModel * @return arrayArrayOfModel */ - @JsonProperty("array_array_of_model") @Valid @ApiModelProperty(value = "") + @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/BigCat.java index 70bbb0b93532..16372fb10406 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/BigCat.java @@ -78,9 +78,9 @@ public BigCat kind(KindEnum kind) { * Get kind * @return kind */ - @JsonProperty("kind") @ApiModelProperty(value = "") + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/BigCatAllOf.java index 1a86665050e6..59ab1d8d2bf8 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/BigCatAllOf.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/BigCatAllOf.java @@ -75,9 +75,9 @@ public BigCatAllOf kind(KindEnum kind) { * Get kind * @return kind */ - @JsonProperty("kind") @ApiModelProperty(value = "") + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Capitalization.java index e0fdbe78bae2..feb0d643c5e5 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Capitalization.java @@ -43,9 +43,9 @@ public Capitalization smallCamel(String smallCamel) { * Get smallCamel * @return smallCamel */ - @JsonProperty("smallCamel") @ApiModelProperty(value = "") + @JsonProperty("smallCamel") public String getSmallCamel() { return smallCamel; } @@ -63,9 +63,9 @@ public Capitalization capitalCamel(String capitalCamel) { * Get capitalCamel * @return capitalCamel */ - @JsonProperty("CapitalCamel") @ApiModelProperty(value = "") + @JsonProperty("CapitalCamel") public String getCapitalCamel() { return capitalCamel; } @@ -83,9 +83,9 @@ public Capitalization smallSnake(String smallSnake) { * Get smallSnake * @return smallSnake */ - @JsonProperty("small_Snake") @ApiModelProperty(value = "") + @JsonProperty("small_Snake") public String getSmallSnake() { return smallSnake; } @@ -103,9 +103,9 @@ public Capitalization capitalSnake(String capitalSnake) { * Get capitalSnake * @return capitalSnake */ - @JsonProperty("Capital_Snake") @ApiModelProperty(value = "") + @JsonProperty("Capital_Snake") public String getCapitalSnake() { return capitalSnake; } @@ -123,9 +123,9 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) { * Get scAETHFlowPoints * @return scAETHFlowPoints */ - @JsonProperty("SCA_ETH_Flow_Points") @ApiModelProperty(value = "") + @JsonProperty("SCA_ETH_Flow_Points") public String getScAETHFlowPoints() { return scAETHFlowPoints; } @@ -143,9 +143,9 @@ public Capitalization ATT_NAME(String ATT_NAME) { * Name of the pet * @return ATT_NAME */ - @JsonProperty("ATT_NAME") @ApiModelProperty(value = "Name of the pet ") + @JsonProperty("ATT_NAME") public String getATTNAME() { return ATT_NAME; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Cat.java index 958fcb2298e0..04fd58e2e14a 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Cat.java @@ -47,9 +47,9 @@ public Cat declawed(Boolean declawed) { * Get declawed * @return declawed */ - @JsonProperty("declawed") @ApiModelProperty(value = "") + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/CatAllOf.java index 63de2ad8818e..85c6885ae000 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/CatAllOf.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/CatAllOf.java @@ -35,9 +35,9 @@ public CatAllOf declawed(Boolean declawed) { * Get declawed * @return declawed */ - @JsonProperty("declawed") @ApiModelProperty(value = "") + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Category.java index b63268b2c8ce..3b813dcea538 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Category.java @@ -35,9 +35,9 @@ public Category id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -55,9 +55,9 @@ public Category name(String name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ClassModel.java index 976f0b01d071..2c511abe3ecb 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ClassModel.java @@ -34,9 +34,9 @@ public ClassModel propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ - @JsonProperty("_class") @ApiModelProperty(value = "") + @JsonProperty("_class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Client.java index a3c4731f3339..a6bfdf58db7f 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Client.java @@ -33,9 +33,9 @@ public Client client(String client) { * Get client * @return client */ - @JsonProperty("client") @ApiModelProperty(value = "") + @JsonProperty("client") public String getClient() { return client; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Dog.java index 593562fabb42..a75ee6095e33 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Dog.java @@ -38,9 +38,9 @@ public Dog breed(String breed) { * Get breed * @return breed */ - @JsonProperty("breed") @ApiModelProperty(value = "") + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/DogAllOf.java index 7ddb24717737..5784d207b4d2 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/DogAllOf.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/DogAllOf.java @@ -35,9 +35,9 @@ public DogAllOf breed(String breed) { * Get breed * @return breed */ - @JsonProperty("breed") @ApiModelProperty(value = "") + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumArrays.java index 04e850b1cf17..43a28057b120 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumArrays.java @@ -109,9 +109,9 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) { * Get justSymbol * @return justSymbol */ - @JsonProperty("just_symbol") @ApiModelProperty(value = "") + @JsonProperty("just_symbol") public JustSymbolEnum getJustSymbol() { return justSymbol; } @@ -137,9 +137,9 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) { * Get arrayEnum * @return arrayEnum */ - @JsonProperty("array_enum") @ApiModelProperty(value = "") + @JsonProperty("array_enum") public List getArrayEnum() { return arrayEnum; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumTest.java index 49747f67dccf..3f7af66d4ce7 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumTest.java @@ -189,9 +189,9 @@ public EnumTest enumString(EnumStringEnum enumString) { * Get enumString * @return enumString */ - @JsonProperty("enum_string") @ApiModelProperty(value = "") + @JsonProperty("enum_string") public EnumStringEnum getEnumString() { return enumString; } @@ -209,9 +209,9 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) { * Get enumStringRequired * @return enumStringRequired */ - @JsonProperty("enum_string_required") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("enum_string_required") public EnumStringRequiredEnum getEnumStringRequired() { return enumStringRequired; } @@ -229,9 +229,9 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) { * Get enumInteger * @return enumInteger */ - @JsonProperty("enum_integer") @ApiModelProperty(value = "") + @JsonProperty("enum_integer") public EnumIntegerEnum getEnumInteger() { return enumInteger; } @@ -249,9 +249,9 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) { * Get enumNumber * @return enumNumber */ - @JsonProperty("enum_number") @ApiModelProperty(value = "") + @JsonProperty("enum_number") public EnumNumberEnum getEnumNumber() { return enumNumber; } @@ -269,9 +269,9 @@ public EnumTest outerEnum(OuterEnum outerEnum) { * Get outerEnum * @return outerEnum */ - @JsonProperty("outerEnum") @Valid @ApiModelProperty(value = "") + @JsonProperty("outerEnum") public OuterEnum getOuterEnum() { return outerEnum; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/File.java index 43c44fd344bb..fedeea1c6389 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/File.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/File.java @@ -34,9 +34,9 @@ public File sourceURI(String sourceURI) { * Test capitalization * @return sourceURI */ - @JsonProperty("sourceURI") @ApiModelProperty(value = "Test capitalization") + @JsonProperty("sourceURI") public String getSourceURI() { return sourceURI; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FileSchemaTestClass.java index d7815943b774..81fc87926e00 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -39,9 +39,9 @@ public FileSchemaTestClass file(File file) { * Get file * @return file */ - @JsonProperty("file") @Valid @ApiModelProperty(value = "") + @JsonProperty("file") public File getFile() { return file; } @@ -67,9 +67,9 @@ public FileSchemaTestClass addFilesItem(File filesItem) { * Get files * @return files */ - @JsonProperty("files") @Valid @ApiModelProperty(value = "") + @JsonProperty("files") public List getFiles() { return files; } 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 ffd18f0ce221..e8697b47182b 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 @@ -71,9 +71,9 @@ public FormatTest integer(Integer integer) { * maximum: 100 * @return integer */ - @JsonProperty("integer") @Min(10) @Max(100) @ApiModelProperty(value = "") + @JsonProperty("integer") public Integer getInteger() { return integer; } @@ -93,9 +93,9 @@ public FormatTest int32(Integer int32) { * maximum: 200 * @return int32 */ - @JsonProperty("int32") @Min(20) @Max(200) @ApiModelProperty(value = "") + @JsonProperty("int32") public Integer getInt32() { return int32; } @@ -113,9 +113,9 @@ public FormatTest int64(Long int64) { * Get int64 * @return int64 */ - @JsonProperty("int64") @ApiModelProperty(value = "") + @JsonProperty("int64") public Long getInt64() { return int64; } @@ -135,9 +135,9 @@ public FormatTest number(BigDecimal number) { * maximum: 543.2 * @return number */ - @JsonProperty("number") @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") @ApiModelProperty(required = true, value = "") + @JsonProperty("number") public BigDecimal getNumber() { return number; } @@ -157,9 +157,9 @@ public FormatTest _float(Float _float) { * maximum: 987.6 * @return _float */ - @JsonProperty("float") @DecimalMin("54.3") @DecimalMax("987.6") @ApiModelProperty(value = "") + @JsonProperty("float") public Float getFloat() { return _float; } @@ -179,9 +179,9 @@ public FormatTest _double(Double _double) { * maximum: 123.4 * @return _double */ - @JsonProperty("double") @DecimalMin("67.8") @DecimalMax("123.4") @ApiModelProperty(value = "") + @JsonProperty("double") public Double getDouble() { return _double; } @@ -199,9 +199,9 @@ public FormatTest string(String string) { * Get string * @return string */ - @JsonProperty("string") @Pattern(regexp = "/[a-z]/i") @ApiModelProperty(value = "") + @JsonProperty("string") public String getString() { return string; } @@ -219,9 +219,9 @@ public FormatTest _byte(byte[] _byte) { * Get _byte * @return _byte */ - @JsonProperty("byte") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("byte") public byte[] getByte() { return _byte; } @@ -239,9 +239,9 @@ public FormatTest binary(org.springframework.core.io.Resource binary) { * Get binary * @return binary */ - @JsonProperty("binary") @Valid @ApiModelProperty(value = "") + @JsonProperty("binary") public org.springframework.core.io.Resource getBinary() { return binary; } @@ -259,9 +259,9 @@ public FormatTest date(LocalDate date) { * Get date * @return date */ - @JsonProperty("date") @NotNull @Valid @ApiModelProperty(required = true, value = "") + @JsonProperty("date") public LocalDate getDate() { return date; } @@ -279,9 +279,9 @@ public FormatTest dateTime(OffsetDateTime dateTime) { * Get dateTime * @return dateTime */ - @JsonProperty("dateTime") @Valid @ApiModelProperty(value = "") + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -299,9 +299,9 @@ public FormatTest uuid(UUID uuid) { * Get uuid * @return uuid */ - @JsonProperty("uuid") @Valid @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -319,9 +319,9 @@ public FormatTest password(String password) { * Get password * @return password */ - @JsonProperty("password") @NotNull @Size(min = 10, max = 64) @ApiModelProperty(required = true, value = "") + @JsonProperty("password") public String getPassword() { return password; } @@ -339,9 +339,9 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) { * Get bigDecimal * @return bigDecimal */ - @JsonProperty("BigDecimal") @Valid @ApiModelProperty(value = "") + @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { return bigDecimal; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index 948ed9a0731d..21a424459798 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -37,9 +37,9 @@ public HasOnlyReadOnly bar(String bar) { * Get bar * @return bar */ - @JsonProperty("bar") @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("bar") public String getBar() { return bar; } @@ -57,9 +57,9 @@ public HasOnlyReadOnly foo(String foo) { * Get foo * @return foo */ - @JsonProperty("foo") @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("foo") public String getFoo() { return foo; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MapTest.java index 94d4ae9a9d56..76c6bee7adcb 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MapTest.java @@ -89,9 +89,9 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapMapOfString * @return mapMapOfString */ - @JsonProperty("map_map_of_string") @Valid @ApiModelProperty(value = "") + @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { return mapMapOfString; } @@ -117,9 +117,9 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) * Get mapOfEnumString * @return mapOfEnumString */ - @JsonProperty("map_of_enum_string") @ApiModelProperty(value = "") + @JsonProperty("map_of_enum_string") public Map getMapOfEnumString() { return mapOfEnumString; } @@ -145,9 +145,9 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) { * Get directMap * @return directMap */ - @JsonProperty("direct_map") @ApiModelProperty(value = "") + @JsonProperty("direct_map") public Map getDirectMap() { return directMap; } @@ -173,9 +173,9 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) { * Get indirectMap * @return indirectMap */ - @JsonProperty("indirect_map") @ApiModelProperty(value = "") + @JsonProperty("indirect_map") public Map getIndirectMap() { return indirectMap; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 89a2475d82fb..f9e2230eba97 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -45,9 +45,9 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { * Get uuid * @return uuid */ - @JsonProperty("uuid") @Valid @ApiModelProperty(value = "") + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -65,9 +65,9 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT * Get dateTime * @return dateTime */ - @JsonProperty("dateTime") @Valid @ApiModelProperty(value = "") + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -93,9 +93,9 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * Get map * @return map */ - @JsonProperty("map") @Valid @ApiModelProperty(value = "") + @JsonProperty("map") public Map getMap() { return map; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Model200Response.java index 220b6493f31a..193231f85457 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Model200Response.java @@ -38,9 +38,9 @@ public Model200Response name(Integer name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public Integer getName() { return name; } @@ -58,9 +58,9 @@ public Model200Response propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ - @JsonProperty("class") @ApiModelProperty(value = "") + @JsonProperty("class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelApiResponse.java index 29f3f43cf20e..693e1669879c 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -39,9 +39,9 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ - @JsonProperty("code") @ApiModelProperty(value = "") + @JsonProperty("code") public Integer getCode() { return code; } @@ -59,9 +59,9 @@ public ModelApiResponse type(String type) { * Get type * @return type */ - @JsonProperty("type") @ApiModelProperty(value = "") + @JsonProperty("type") public String getType() { return type; } @@ -79,9 +79,9 @@ public ModelApiResponse message(String message) { * Get message * @return message */ - @JsonProperty("message") @ApiModelProperty(value = "") + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelList.java index a374fe83d52a..7853f3d408a0 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelList.java @@ -35,9 +35,9 @@ public ModelList _123list(String _123list) { * Get _123list * @return _123list */ - @JsonProperty("123-list") @ApiModelProperty(value = "") + @JsonProperty("123-list") public String get123list() { return _123list; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelReturn.java index d8fc618d9dfb..b6f106cea222 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelReturn.java @@ -36,9 +36,9 @@ public ModelReturn _return(Integer _return) { * Get _return * @return _return */ - @JsonProperty("return") @ApiModelProperty(value = "") + @JsonProperty("return") public Integer getReturn() { return _return; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Name.java index 054901b488d6..32403fe65891 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Name.java @@ -40,9 +40,9 @@ public Name name(Integer name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("name") public Integer getName() { return name; } @@ -60,9 +60,9 @@ public Name snakeCase(Integer snakeCase) { * Get snakeCase * @return snakeCase */ - @JsonProperty("snake_case") @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("snake_case") public Integer getSnakeCase() { return snakeCase; } @@ -80,9 +80,9 @@ public Name property(String property) { * Get property * @return property */ - @JsonProperty("property") @ApiModelProperty(value = "") + @JsonProperty("property") public String getProperty() { return property; } @@ -100,9 +100,9 @@ public Name _123number(Integer _123number) { * Get _123number * @return _123number */ - @JsonProperty("123Number") @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("123Number") public Integer get123number() { return _123number; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/NumberOnly.java index 8f2f2b19b191..1e3f9e15421d 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/NumberOnly.java @@ -34,9 +34,9 @@ public NumberOnly justNumber(BigDecimal justNumber) { * Get justNumber * @return justNumber */ - @JsonProperty("JustNumber") @Valid @ApiModelProperty(value = "") + @JsonProperty("JustNumber") public BigDecimal getJustNumber() { return justNumber; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Order.java index feac4d2cad8d..b24c70c07808 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Order.java @@ -84,9 +84,9 @@ public Order id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -104,9 +104,9 @@ public Order petId(Long petId) { * Get petId * @return petId */ - @JsonProperty("petId") @ApiModelProperty(value = "") + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -124,9 +124,9 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ - @JsonProperty("quantity") @ApiModelProperty(value = "") + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -144,9 +144,9 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ - @JsonProperty("shipDate") @Valid @ApiModelProperty(value = "") + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -164,9 +164,9 @@ public Order status(StatusEnum status) { * Order Status * @return status */ - @JsonProperty("status") @ApiModelProperty(value = "Order Status") + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -184,9 +184,9 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ - @JsonProperty("complete") @ApiModelProperty(value = "") + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/OuterComposite.java index 00cce99097d7..ade2b9150190 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/OuterComposite.java @@ -38,9 +38,9 @@ public OuterComposite myNumber(BigDecimal myNumber) { * Get myNumber * @return myNumber */ - @JsonProperty("my_number") @Valid @ApiModelProperty(value = "") + @JsonProperty("my_number") public BigDecimal getMyNumber() { return myNumber; } @@ -58,9 +58,9 @@ public OuterComposite myString(String myString) { * Get myString * @return myString */ - @JsonProperty("my_string") @ApiModelProperty(value = "") + @JsonProperty("my_string") public String getMyString() { return myString; } @@ -78,9 +78,9 @@ public OuterComposite myBoolean(Boolean myBoolean) { * Get myBoolean * @return myBoolean */ - @JsonProperty("my_boolean") @ApiModelProperty(value = "") + @JsonProperty("my_boolean") public Boolean getMyBoolean() { return myBoolean; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Pet.java index e39c22373324..b9358e2b1e87 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Pet.java @@ -90,9 +90,9 @@ public Pet id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -110,9 +110,9 @@ public Pet category(Category category) { * Get category * @return category */ - @JsonProperty("category") @Valid @ApiModelProperty(value = "") + @JsonProperty("category") public Category getCategory() { return category; } @@ -130,9 +130,9 @@ public Pet name(String name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") + @JsonProperty("name") public String getName() { return name; } @@ -155,9 +155,9 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ - @JsonProperty("photoUrls") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("photoUrls") public Set getPhotoUrls() { return photoUrls; } @@ -184,9 +184,9 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @JsonProperty("tags") @Valid @ApiModelProperty(value = "") + @JsonProperty("tags") public List getTags() { return tags; } @@ -204,9 +204,9 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ - @JsonProperty("status") @ApiModelProperty(value = "pet status in the store") + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ReadOnlyFirst.java index d02b8c8cfd53..3eb0ebe069c1 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -35,9 +35,9 @@ public ReadOnlyFirst bar(String bar) { * Get bar * @return bar */ - @JsonProperty("bar") @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("bar") public String getBar() { return bar; } @@ -55,9 +55,9 @@ public ReadOnlyFirst baz(String baz) { * Get baz * @return baz */ - @JsonProperty("baz") @ApiModelProperty(value = "") + @JsonProperty("baz") public String getBaz() { return baz; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/SpecialModelName.java index 8f176362e027..668035becd14 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/SpecialModelName.java @@ -35,9 +35,9 @@ public class SpecialModelName { * Get $specialPropertyName * @return $specialPropertyName */ - @JsonProperty("$special[property.name]") @ApiModelProperty(value = "") + @JsonProperty("$special[property.name]") public Long get$SpecialPropertyName() { return $specialPropertyName; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Tag.java index f7797bef2f19..527e777278e2 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Tag.java @@ -35,9 +35,9 @@ public Tag id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -55,9 +55,9 @@ public Tag name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderDefault.java index 506efbf431c1..41ba1c5bf1f3 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -45,9 +45,9 @@ public TypeHolderDefault stringItem(String stringItem) { * Get stringItem * @return stringItem */ - @JsonProperty("string_item") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -65,9 +65,9 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ - @JsonProperty("number_item") @NotNull @Valid @ApiModelProperty(required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -85,9 +85,9 @@ public TypeHolderDefault integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ - @JsonProperty("integer_item") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -105,9 +105,9 @@ public TypeHolderDefault boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ - @JsonProperty("bool_item") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -130,9 +130,9 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ - @JsonProperty("array_item") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderExample.java index 806c0c90fa18..8e1a76f88fdc 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -47,9 +47,9 @@ public TypeHolderExample stringItem(String stringItem) { * Get stringItem * @return stringItem */ - @JsonProperty("string_item") @NotNull @ApiModelProperty(example = "what", required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -67,9 +67,9 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ - @JsonProperty("number_item") @NotNull @Valid @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -87,9 +87,9 @@ public TypeHolderExample floatItem(Float floatItem) { * Get floatItem * @return floatItem */ - @JsonProperty("float_item") @NotNull @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("float_item") public Float getFloatItem() { return floatItem; } @@ -107,9 +107,9 @@ public TypeHolderExample integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ - @JsonProperty("integer_item") @NotNull @ApiModelProperty(example = "-2", required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -127,9 +127,9 @@ public TypeHolderExample boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ - @JsonProperty("bool_item") @NotNull @ApiModelProperty(example = "true", required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -152,9 +152,9 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ - @JsonProperty("array_item") @NotNull @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/User.java index f42832389ffe..36d29ba307d0 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/User.java @@ -47,9 +47,9 @@ public User id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -67,9 +67,9 @@ public User username(String username) { * Get username * @return username */ - @JsonProperty("username") @ApiModelProperty(value = "") + @JsonProperty("username") public String getUsername() { return username; } @@ -87,9 +87,9 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ - @JsonProperty("firstName") @ApiModelProperty(value = "") + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -107,9 +107,9 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ - @JsonProperty("lastName") @ApiModelProperty(value = "") + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -127,9 +127,9 @@ public User email(String email) { * Get email * @return email */ - @JsonProperty("email") @ApiModelProperty(value = "") + @JsonProperty("email") public String getEmail() { return email; } @@ -147,9 +147,9 @@ public User password(String password) { * Get password * @return password */ - @JsonProperty("password") @ApiModelProperty(value = "") + @JsonProperty("password") public String getPassword() { return password; } @@ -167,9 +167,9 @@ public User phone(String phone) { * Get phone * @return phone */ - @JsonProperty("phone") @ApiModelProperty(value = "") + @JsonProperty("phone") public String getPhone() { return phone; } @@ -187,9 +187,9 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ - @JsonProperty("userStatus") @ApiModelProperty(value = "User Status") + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/XmlItem.java index c795b4b85e6d..3a8d108bdbce 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/XmlItem.java @@ -101,9 +101,9 @@ public XmlItem attributeString(String attributeString) { * Get attributeString * @return attributeString */ - @JsonProperty("attribute_string") @ApiModelProperty(example = "string", value = "") + @JsonProperty("attribute_string") public String getAttributeString() { return attributeString; } @@ -121,9 +121,9 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) { * Get attributeNumber * @return attributeNumber */ - @JsonProperty("attribute_number") @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("attribute_number") public BigDecimal getAttributeNumber() { return attributeNumber; } @@ -141,9 +141,9 @@ public XmlItem attributeInteger(Integer attributeInteger) { * Get attributeInteger * @return attributeInteger */ - @JsonProperty("attribute_integer") @ApiModelProperty(example = "-2", value = "") + @JsonProperty("attribute_integer") public Integer getAttributeInteger() { return attributeInteger; } @@ -161,9 +161,9 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) { * Get attributeBoolean * @return attributeBoolean */ - @JsonProperty("attribute_boolean") @ApiModelProperty(example = "true", value = "") + @JsonProperty("attribute_boolean") public Boolean getAttributeBoolean() { return attributeBoolean; } @@ -189,9 +189,9 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) { * Get wrappedArray * @return wrappedArray */ - @JsonProperty("wrapped_array") @ApiModelProperty(value = "") + @JsonProperty("wrapped_array") public List getWrappedArray() { return wrappedArray; } @@ -209,9 +209,9 @@ public XmlItem nameString(String nameString) { * Get nameString * @return nameString */ - @JsonProperty("name_string") @ApiModelProperty(example = "string", value = "") + @JsonProperty("name_string") public String getNameString() { return nameString; } @@ -229,9 +229,9 @@ public XmlItem nameNumber(BigDecimal nameNumber) { * Get nameNumber * @return nameNumber */ - @JsonProperty("name_number") @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("name_number") public BigDecimal getNameNumber() { return nameNumber; } @@ -249,9 +249,9 @@ public XmlItem nameInteger(Integer nameInteger) { * Get nameInteger * @return nameInteger */ - @JsonProperty("name_integer") @ApiModelProperty(example = "-2", value = "") + @JsonProperty("name_integer") public Integer getNameInteger() { return nameInteger; } @@ -269,9 +269,9 @@ public XmlItem nameBoolean(Boolean nameBoolean) { * Get nameBoolean * @return nameBoolean */ - @JsonProperty("name_boolean") @ApiModelProperty(example = "true", value = "") + @JsonProperty("name_boolean") public Boolean getNameBoolean() { return nameBoolean; } @@ -297,9 +297,9 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) { * Get nameArray * @return nameArray */ - @JsonProperty("name_array") @ApiModelProperty(value = "") + @JsonProperty("name_array") public List getNameArray() { return nameArray; } @@ -325,9 +325,9 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) { * Get nameWrappedArray * @return nameWrappedArray */ - @JsonProperty("name_wrapped_array") @ApiModelProperty(value = "") + @JsonProperty("name_wrapped_array") public List getNameWrappedArray() { return nameWrappedArray; } @@ -345,9 +345,9 @@ public XmlItem prefixString(String prefixString) { * Get prefixString * @return prefixString */ - @JsonProperty("prefix_string") @ApiModelProperty(example = "string", value = "") + @JsonProperty("prefix_string") public String getPrefixString() { return prefixString; } @@ -365,9 +365,9 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) { * Get prefixNumber * @return prefixNumber */ - @JsonProperty("prefix_number") @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("prefix_number") public BigDecimal getPrefixNumber() { return prefixNumber; } @@ -385,9 +385,9 @@ public XmlItem prefixInteger(Integer prefixInteger) { * Get prefixInteger * @return prefixInteger */ - @JsonProperty("prefix_integer") @ApiModelProperty(example = "-2", value = "") + @JsonProperty("prefix_integer") public Integer getPrefixInteger() { return prefixInteger; } @@ -405,9 +405,9 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) { * Get prefixBoolean * @return prefixBoolean */ - @JsonProperty("prefix_boolean") @ApiModelProperty(example = "true", value = "") + @JsonProperty("prefix_boolean") public Boolean getPrefixBoolean() { return prefixBoolean; } @@ -433,9 +433,9 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) { * Get prefixArray * @return prefixArray */ - @JsonProperty("prefix_array") @ApiModelProperty(value = "") + @JsonProperty("prefix_array") public List getPrefixArray() { return prefixArray; } @@ -461,9 +461,9 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) { * Get prefixWrappedArray * @return prefixWrappedArray */ - @JsonProperty("prefix_wrapped_array") @ApiModelProperty(value = "") + @JsonProperty("prefix_wrapped_array") public List getPrefixWrappedArray() { return prefixWrappedArray; } @@ -481,9 +481,9 @@ public XmlItem namespaceString(String namespaceString) { * Get namespaceString * @return namespaceString */ - @JsonProperty("namespace_string") @ApiModelProperty(example = "string", value = "") + @JsonProperty("namespace_string") public String getNamespaceString() { return namespaceString; } @@ -501,9 +501,9 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) { * Get namespaceNumber * @return namespaceNumber */ - @JsonProperty("namespace_number") @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("namespace_number") public BigDecimal getNamespaceNumber() { return namespaceNumber; } @@ -521,9 +521,9 @@ public XmlItem namespaceInteger(Integer namespaceInteger) { * Get namespaceInteger * @return namespaceInteger */ - @JsonProperty("namespace_integer") @ApiModelProperty(example = "-2", value = "") + @JsonProperty("namespace_integer") public Integer getNamespaceInteger() { return namespaceInteger; } @@ -541,9 +541,9 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) { * Get namespaceBoolean * @return namespaceBoolean */ - @JsonProperty("namespace_boolean") @ApiModelProperty(example = "true", value = "") + @JsonProperty("namespace_boolean") public Boolean getNamespaceBoolean() { return namespaceBoolean; } @@ -569,9 +569,9 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) { * Get namespaceArray * @return namespaceArray */ - @JsonProperty("namespace_array") @ApiModelProperty(value = "") + @JsonProperty("namespace_array") public List getNamespaceArray() { return namespaceArray; } @@ -597,9 +597,9 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) { * Get namespaceWrappedArray * @return namespaceWrappedArray */ - @JsonProperty("namespace_wrapped_array") @ApiModelProperty(value = "") + @JsonProperty("namespace_wrapped_array") public List getNamespaceWrappedArray() { return namespaceWrappedArray; } @@ -617,9 +617,9 @@ public XmlItem prefixNsString(String prefixNsString) { * Get prefixNsString * @return prefixNsString */ - @JsonProperty("prefix_ns_string") @ApiModelProperty(example = "string", value = "") + @JsonProperty("prefix_ns_string") public String getPrefixNsString() { return prefixNsString; } @@ -637,9 +637,9 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) { * Get prefixNsNumber * @return prefixNsNumber */ - @JsonProperty("prefix_ns_number") @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("prefix_ns_number") public BigDecimal getPrefixNsNumber() { return prefixNsNumber; } @@ -657,9 +657,9 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) { * Get prefixNsInteger * @return prefixNsInteger */ - @JsonProperty("prefix_ns_integer") @ApiModelProperty(example = "-2", value = "") + @JsonProperty("prefix_ns_integer") public Integer getPrefixNsInteger() { return prefixNsInteger; } @@ -677,9 +677,9 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) { * Get prefixNsBoolean * @return prefixNsBoolean */ - @JsonProperty("prefix_ns_boolean") @ApiModelProperty(example = "true", value = "") + @JsonProperty("prefix_ns_boolean") public Boolean getPrefixNsBoolean() { return prefixNsBoolean; } @@ -705,9 +705,9 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) { * Get prefixNsArray * @return prefixNsArray */ - @JsonProperty("prefix_ns_array") @ApiModelProperty(value = "") + @JsonProperty("prefix_ns_array") public List getPrefixNsArray() { return prefixNsArray; } @@ -733,9 +733,9 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) { * Get prefixNsWrappedArray * @return prefixNsWrappedArray */ - @JsonProperty("prefix_ns_wrapped_array") @ApiModelProperty(value = "") + @JsonProperty("prefix_ns_wrapped_array") public List getPrefixNsWrappedArray() { return prefixNsWrappedArray; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-beanvalidation/src/main/resources/openapi.yaml index 2999e6f2f8d6..5fdcfc33eada 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-beanvalidation/src/main/resources/openapi.yaml @@ -2111,7 +2111,6 @@ components: status: description: Updated status of the pet type: string - type: object uploadFile_request: properties: additionalMetadata: @@ -2121,7 +2120,6 @@ components: description: file to upload format: binary type: string - type: object testEnumParameters_request: properties: enum_form_string_array: @@ -2141,7 +2139,6 @@ components: - -efg - (xyz) type: string - type: object testEndpointParameters_request: properties: integer: @@ -2214,7 +2211,6 @@ components: - double - number - pattern_without_delimiter - type: object testJsonFormData_request: properties: param: @@ -2226,7 +2222,6 @@ components: required: - param - param2 - type: object uploadFileWithRequiredFile_request: properties: additionalMetadata: @@ -2238,7 +2233,6 @@ components: type: string required: - requiredFile - type: object Dog_allOf: properties: breed: diff --git a/samples/server/petstore/springboot-delegate-j8/.openapi-generator/FILES b/samples/server/petstore/springboot-delegate-j8/.openapi-generator/FILES index 07f63a0e8be2..84b7f1df792d 100644 --- a/samples/server/petstore/springboot-delegate-j8/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-delegate-j8/.openapi-generator/FILES @@ -21,7 +21,6 @@ src/main/java/org/openapitools/api/StoreApiDelegate.java src/main/java/org/openapitools/api/UserApi.java src/main/java/org/openapitools/api/UserApiController.java src/main/java/org/openapitools/api/UserApiDelegate.java -src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/configuration/SpringFoxConfiguration.java src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java diff --git a/samples/server/petstore/springboot-delegate-j8/.openapi-generator/VERSION b/samples/server/petstore/springboot-delegate-j8/.openapi-generator/VERSION index d6b4ec4aa783..ed829dbcddec 100644 --- a/samples/server/petstore/springboot-delegate-j8/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-delegate-j8/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0-SNAPSHOT \ No newline at end of file +6.2.1-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java index ffa28f493727..e364fcafe96a 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApiController.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApiController.java index e27e2fc20ea9..7c3f20492479 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApiController.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApiController.java @@ -27,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class AnotherFakeApiController implements AnotherFakeApi { private final AnotherFakeApiDelegate delegate; 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 261a033dd80d..8099dd8fb43b 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiController.java index 726b17779f18..8e624ba5fb59 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiController.java @@ -37,7 +37,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeApiController implements FakeApi { private final FakeApiDelegate delegate; diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index ecc2a625ddfb..b58eee9db9f4 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java index 21e28fe8b213..48a276daf130 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java @@ -27,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeClassnameTestApiController implements FakeClassnameTestApi { private final FakeClassnameTestApiDelegate delegate; 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 16b3566374e5..0d3907293827 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApiController.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApiController.java index 5ef3de965ff8..e27c4c3b49d6 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApiController.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApiController.java @@ -29,7 +29,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class PetApiController implements PetApi { private final PetApiDelegate delegate; diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java index c9e8abe50bf6..8a1f4ea555b9 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApiController.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApiController.java index e9e29a41b4f9..8c3b33a99af6 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApiController.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApiController.java @@ -28,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class StoreApiController implements StoreApi { private final StoreApiDelegate delegate; diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java index e960ec9acd6b..9d54717caa97 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApiController.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApiController.java index 1b48d4a9444b..58511a07291c 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApiController.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApiController.java @@ -29,7 +29,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class UserApiController implements UserApi { private final UserApiDelegate delegate; diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index cb51920a8c28..686fafb2faaf 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -35,9 +35,9 @@ public AdditionalPropertiesAnyType name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 1c66a636116f..a2c3df24a2df 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -36,9 +36,9 @@ public AdditionalPropertiesArray name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 1dcc607639bf..82fcada6f56a 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -35,9 +35,9 @@ public AdditionalPropertiesBoolean name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 74250eb564ad..7b720b30d83a 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -73,9 +73,9 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt * Get mapString * @return mapString */ - @JsonProperty("map_string") @ApiModelProperty(value = "") + @JsonProperty("map_string") public Map getMapString() { return mapString; } @@ -101,9 +101,9 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * Get mapNumber * @return mapNumber */ - @JsonProperty("map_number") @Valid @ApiModelProperty(value = "") + @JsonProperty("map_number") public Map getMapNumber() { return mapNumber; } @@ -129,9 +129,9 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege * Get mapInteger * @return mapInteger */ - @JsonProperty("map_integer") @ApiModelProperty(value = "") + @JsonProperty("map_integer") public Map getMapInteger() { return mapInteger; } @@ -157,9 +157,9 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea * Get mapBoolean * @return mapBoolean */ - @JsonProperty("map_boolean") @ApiModelProperty(value = "") + @JsonProperty("map_boolean") public Map getMapBoolean() { return mapBoolean; } @@ -185,9 +185,9 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { return mapArrayInteger; } @@ -213,9 +213,9 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * Get mapArrayAnytype * @return mapArrayAnytype */ - @JsonProperty("map_array_anytype") @Valid @ApiModelProperty(value = "") + @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { return mapArrayAnytype; } @@ -241,9 +241,9 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { return mapMapString; } @@ -269,9 +269,9 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { return mapMapAnytype; } @@ -289,9 +289,9 @@ public AdditionalPropertiesClass anytype1(Object anytype1) { * Get anytype1 * @return anytype1 */ - @JsonProperty("anytype_1") @ApiModelProperty(value = "") + @JsonProperty("anytype_1") public Object getAnytype1() { return anytype1; } @@ -309,9 +309,9 @@ public AdditionalPropertiesClass anytype2(Object anytype2) { * Get anytype2 * @return anytype2 */ - @JsonProperty("anytype_2") @ApiModelProperty(value = "") + @JsonProperty("anytype_2") public Object getAnytype2() { return anytype2; } @@ -329,9 +329,9 @@ public AdditionalPropertiesClass anytype3(Object anytype3) { * Get anytype3 * @return anytype3 */ - @JsonProperty("anytype_3") @ApiModelProperty(value = "") + @JsonProperty("anytype_3") public Object getAnytype3() { return anytype3; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index ce8b8d62436c..ea2ec5365edc 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -35,9 +35,9 @@ public AdditionalPropertiesInteger name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index dec791e0a273..4ca4b5a2f509 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -36,9 +36,9 @@ public AdditionalPropertiesNumber name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 546d0ab9216f..7b9d8ef0b0b2 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -35,9 +35,9 @@ public AdditionalPropertiesObject name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index c1f95cf62e81..fdc4baa9de7b 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -35,9 +35,9 @@ public AdditionalPropertiesString name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Animal.java index e880f829164c..dfb303255b3b 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Animal.java @@ -52,9 +52,9 @@ public Animal className(String className) { * Get className * @return className */ - @JsonProperty("className") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("className") public String getClassName() { return className; } @@ -72,9 +72,9 @@ public Animal color(String color) { * Get color * @return color */ - @JsonProperty("color") @ApiModelProperty(value = "") + @JsonProperty("color") public String getColor() { return color; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 46ab3b631960..42b8443e9be2 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -45,9 +45,9 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * Get arrayArrayNumber * @return arrayArrayNumber */ - @JsonProperty("ArrayArrayNumber") @Valid @ApiModelProperty(value = "") + @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index cb5358905469..f60290a4d8ad 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -45,9 +45,9 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ - @JsonProperty("ArrayNumber") @Valid @ApiModelProperty(value = "") + @JsonProperty("ArrayNumber") public List getArrayNumber() { return arrayNumber; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayTest.java index 55cc431ecde6..8bb3f76ca666 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayTest.java @@ -51,9 +51,9 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) { * Get arrayOfString * @return arrayOfString */ - @JsonProperty("array_of_string") @ApiModelProperty(value = "") + @JsonProperty("array_of_string") public List getArrayOfString() { return arrayOfString; } @@ -79,9 +79,9 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ - @JsonProperty("array_array_of_integer") @Valid @ApiModelProperty(value = "") + @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; } @@ -107,9 +107,9 @@ public ArrayTest addArrayArrayOfModelItem(List arrayArrayOfModelI * Get arrayArrayOfModel * @return arrayArrayOfModel */ - @JsonProperty("array_array_of_model") @Valid @ApiModelProperty(value = "") + @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/BigCat.java index 70bbb0b93532..16372fb10406 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/BigCat.java @@ -78,9 +78,9 @@ public BigCat kind(KindEnum kind) { * Get kind * @return kind */ - @JsonProperty("kind") @ApiModelProperty(value = "") + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/BigCatAllOf.java index 1a86665050e6..59ab1d8d2bf8 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/BigCatAllOf.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/BigCatAllOf.java @@ -75,9 +75,9 @@ public BigCatAllOf kind(KindEnum kind) { * Get kind * @return kind */ - @JsonProperty("kind") @ApiModelProperty(value = "") + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Capitalization.java index e0fdbe78bae2..feb0d643c5e5 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Capitalization.java @@ -43,9 +43,9 @@ public Capitalization smallCamel(String smallCamel) { * Get smallCamel * @return smallCamel */ - @JsonProperty("smallCamel") @ApiModelProperty(value = "") + @JsonProperty("smallCamel") public String getSmallCamel() { return smallCamel; } @@ -63,9 +63,9 @@ public Capitalization capitalCamel(String capitalCamel) { * Get capitalCamel * @return capitalCamel */ - @JsonProperty("CapitalCamel") @ApiModelProperty(value = "") + @JsonProperty("CapitalCamel") public String getCapitalCamel() { return capitalCamel; } @@ -83,9 +83,9 @@ public Capitalization smallSnake(String smallSnake) { * Get smallSnake * @return smallSnake */ - @JsonProperty("small_Snake") @ApiModelProperty(value = "") + @JsonProperty("small_Snake") public String getSmallSnake() { return smallSnake; } @@ -103,9 +103,9 @@ public Capitalization capitalSnake(String capitalSnake) { * Get capitalSnake * @return capitalSnake */ - @JsonProperty("Capital_Snake") @ApiModelProperty(value = "") + @JsonProperty("Capital_Snake") public String getCapitalSnake() { return capitalSnake; } @@ -123,9 +123,9 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) { * Get scAETHFlowPoints * @return scAETHFlowPoints */ - @JsonProperty("SCA_ETH_Flow_Points") @ApiModelProperty(value = "") + @JsonProperty("SCA_ETH_Flow_Points") public String getScAETHFlowPoints() { return scAETHFlowPoints; } @@ -143,9 +143,9 @@ public Capitalization ATT_NAME(String ATT_NAME) { * Name of the pet * @return ATT_NAME */ - @JsonProperty("ATT_NAME") @ApiModelProperty(value = "Name of the pet ") + @JsonProperty("ATT_NAME") public String getATTNAME() { return ATT_NAME; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Cat.java index 958fcb2298e0..04fd58e2e14a 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Cat.java @@ -47,9 +47,9 @@ public Cat declawed(Boolean declawed) { * Get declawed * @return declawed */ - @JsonProperty("declawed") @ApiModelProperty(value = "") + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/CatAllOf.java index 63de2ad8818e..85c6885ae000 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/CatAllOf.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/CatAllOf.java @@ -35,9 +35,9 @@ public CatAllOf declawed(Boolean declawed) { * Get declawed * @return declawed */ - @JsonProperty("declawed") @ApiModelProperty(value = "") + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Category.java index b63268b2c8ce..3b813dcea538 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Category.java @@ -35,9 +35,9 @@ public Category id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -55,9 +55,9 @@ public Category name(String name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ClassModel.java index 976f0b01d071..2c511abe3ecb 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ClassModel.java @@ -34,9 +34,9 @@ public ClassModel propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ - @JsonProperty("_class") @ApiModelProperty(value = "") + @JsonProperty("_class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Client.java index a3c4731f3339..a6bfdf58db7f 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Client.java @@ -33,9 +33,9 @@ public Client client(String client) { * Get client * @return client */ - @JsonProperty("client") @ApiModelProperty(value = "") + @JsonProperty("client") public String getClient() { return client; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Dog.java index 593562fabb42..a75ee6095e33 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Dog.java @@ -38,9 +38,9 @@ public Dog breed(String breed) { * Get breed * @return breed */ - @JsonProperty("breed") @ApiModelProperty(value = "") + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/DogAllOf.java index 7ddb24717737..5784d207b4d2 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/DogAllOf.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/DogAllOf.java @@ -35,9 +35,9 @@ public DogAllOf breed(String breed) { * Get breed * @return breed */ - @JsonProperty("breed") @ApiModelProperty(value = "") + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumArrays.java index 04e850b1cf17..43a28057b120 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumArrays.java @@ -109,9 +109,9 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) { * Get justSymbol * @return justSymbol */ - @JsonProperty("just_symbol") @ApiModelProperty(value = "") + @JsonProperty("just_symbol") public JustSymbolEnum getJustSymbol() { return justSymbol; } @@ -137,9 +137,9 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) { * Get arrayEnum * @return arrayEnum */ - @JsonProperty("array_enum") @ApiModelProperty(value = "") + @JsonProperty("array_enum") public List getArrayEnum() { return arrayEnum; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumTest.java index 49747f67dccf..3f7af66d4ce7 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumTest.java @@ -189,9 +189,9 @@ public EnumTest enumString(EnumStringEnum enumString) { * Get enumString * @return enumString */ - @JsonProperty("enum_string") @ApiModelProperty(value = "") + @JsonProperty("enum_string") public EnumStringEnum getEnumString() { return enumString; } @@ -209,9 +209,9 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) { * Get enumStringRequired * @return enumStringRequired */ - @JsonProperty("enum_string_required") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("enum_string_required") public EnumStringRequiredEnum getEnumStringRequired() { return enumStringRequired; } @@ -229,9 +229,9 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) { * Get enumInteger * @return enumInteger */ - @JsonProperty("enum_integer") @ApiModelProperty(value = "") + @JsonProperty("enum_integer") public EnumIntegerEnum getEnumInteger() { return enumInteger; } @@ -249,9 +249,9 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) { * Get enumNumber * @return enumNumber */ - @JsonProperty("enum_number") @ApiModelProperty(value = "") + @JsonProperty("enum_number") public EnumNumberEnum getEnumNumber() { return enumNumber; } @@ -269,9 +269,9 @@ public EnumTest outerEnum(OuterEnum outerEnum) { * Get outerEnum * @return outerEnum */ - @JsonProperty("outerEnum") @Valid @ApiModelProperty(value = "") + @JsonProperty("outerEnum") public OuterEnum getOuterEnum() { return outerEnum; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/File.java index 43c44fd344bb..fedeea1c6389 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/File.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/File.java @@ -34,9 +34,9 @@ public File sourceURI(String sourceURI) { * Test capitalization * @return sourceURI */ - @JsonProperty("sourceURI") @ApiModelProperty(value = "Test capitalization") + @JsonProperty("sourceURI") public String getSourceURI() { return sourceURI; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java index d7815943b774..81fc87926e00 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -39,9 +39,9 @@ public FileSchemaTestClass file(File file) { * Get file * @return file */ - @JsonProperty("file") @Valid @ApiModelProperty(value = "") + @JsonProperty("file") public File getFile() { return file; } @@ -67,9 +67,9 @@ public FileSchemaTestClass addFilesItem(File filesItem) { * Get files * @return files */ - @JsonProperty("files") @Valid @ApiModelProperty(value = "") + @JsonProperty("files") public List getFiles() { return files; } 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 ffd18f0ce221..e8697b47182b 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 @@ -71,9 +71,9 @@ public FormatTest integer(Integer integer) { * maximum: 100 * @return integer */ - @JsonProperty("integer") @Min(10) @Max(100) @ApiModelProperty(value = "") + @JsonProperty("integer") public Integer getInteger() { return integer; } @@ -93,9 +93,9 @@ public FormatTest int32(Integer int32) { * maximum: 200 * @return int32 */ - @JsonProperty("int32") @Min(20) @Max(200) @ApiModelProperty(value = "") + @JsonProperty("int32") public Integer getInt32() { return int32; } @@ -113,9 +113,9 @@ public FormatTest int64(Long int64) { * Get int64 * @return int64 */ - @JsonProperty("int64") @ApiModelProperty(value = "") + @JsonProperty("int64") public Long getInt64() { return int64; } @@ -135,9 +135,9 @@ public FormatTest number(BigDecimal number) { * maximum: 543.2 * @return number */ - @JsonProperty("number") @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") @ApiModelProperty(required = true, value = "") + @JsonProperty("number") public BigDecimal getNumber() { return number; } @@ -157,9 +157,9 @@ public FormatTest _float(Float _float) { * maximum: 987.6 * @return _float */ - @JsonProperty("float") @DecimalMin("54.3") @DecimalMax("987.6") @ApiModelProperty(value = "") + @JsonProperty("float") public Float getFloat() { return _float; } @@ -179,9 +179,9 @@ public FormatTest _double(Double _double) { * maximum: 123.4 * @return _double */ - @JsonProperty("double") @DecimalMin("67.8") @DecimalMax("123.4") @ApiModelProperty(value = "") + @JsonProperty("double") public Double getDouble() { return _double; } @@ -199,9 +199,9 @@ public FormatTest string(String string) { * Get string * @return string */ - @JsonProperty("string") @Pattern(regexp = "/[a-z]/i") @ApiModelProperty(value = "") + @JsonProperty("string") public String getString() { return string; } @@ -219,9 +219,9 @@ public FormatTest _byte(byte[] _byte) { * Get _byte * @return _byte */ - @JsonProperty("byte") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("byte") public byte[] getByte() { return _byte; } @@ -239,9 +239,9 @@ public FormatTest binary(org.springframework.core.io.Resource binary) { * Get binary * @return binary */ - @JsonProperty("binary") @Valid @ApiModelProperty(value = "") + @JsonProperty("binary") public org.springframework.core.io.Resource getBinary() { return binary; } @@ -259,9 +259,9 @@ public FormatTest date(LocalDate date) { * Get date * @return date */ - @JsonProperty("date") @NotNull @Valid @ApiModelProperty(required = true, value = "") + @JsonProperty("date") public LocalDate getDate() { return date; } @@ -279,9 +279,9 @@ public FormatTest dateTime(OffsetDateTime dateTime) { * Get dateTime * @return dateTime */ - @JsonProperty("dateTime") @Valid @ApiModelProperty(value = "") + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -299,9 +299,9 @@ public FormatTest uuid(UUID uuid) { * Get uuid * @return uuid */ - @JsonProperty("uuid") @Valid @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -319,9 +319,9 @@ public FormatTest password(String password) { * Get password * @return password */ - @JsonProperty("password") @NotNull @Size(min = 10, max = 64) @ApiModelProperty(required = true, value = "") + @JsonProperty("password") public String getPassword() { return password; } @@ -339,9 +339,9 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) { * Get bigDecimal * @return bigDecimal */ - @JsonProperty("BigDecimal") @Valid @ApiModelProperty(value = "") + @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { return bigDecimal; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index 948ed9a0731d..21a424459798 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -37,9 +37,9 @@ public HasOnlyReadOnly bar(String bar) { * Get bar * @return bar */ - @JsonProperty("bar") @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("bar") public String getBar() { return bar; } @@ -57,9 +57,9 @@ public HasOnlyReadOnly foo(String foo) { * Get foo * @return foo */ - @JsonProperty("foo") @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("foo") public String getFoo() { return foo; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MapTest.java index 94d4ae9a9d56..76c6bee7adcb 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MapTest.java @@ -89,9 +89,9 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapMapOfString * @return mapMapOfString */ - @JsonProperty("map_map_of_string") @Valid @ApiModelProperty(value = "") + @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { return mapMapOfString; } @@ -117,9 +117,9 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) * Get mapOfEnumString * @return mapOfEnumString */ - @JsonProperty("map_of_enum_string") @ApiModelProperty(value = "") + @JsonProperty("map_of_enum_string") public Map getMapOfEnumString() { return mapOfEnumString; } @@ -145,9 +145,9 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) { * Get directMap * @return directMap */ - @JsonProperty("direct_map") @ApiModelProperty(value = "") + @JsonProperty("direct_map") public Map getDirectMap() { return directMap; } @@ -173,9 +173,9 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) { * Get indirectMap * @return indirectMap */ - @JsonProperty("indirect_map") @ApiModelProperty(value = "") + @JsonProperty("indirect_map") public Map getIndirectMap() { return indirectMap; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 89a2475d82fb..f9e2230eba97 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -45,9 +45,9 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { * Get uuid * @return uuid */ - @JsonProperty("uuid") @Valid @ApiModelProperty(value = "") + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -65,9 +65,9 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT * Get dateTime * @return dateTime */ - @JsonProperty("dateTime") @Valid @ApiModelProperty(value = "") + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -93,9 +93,9 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * Get map * @return map */ - @JsonProperty("map") @Valid @ApiModelProperty(value = "") + @JsonProperty("map") public Map getMap() { return map; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Model200Response.java index 220b6493f31a..193231f85457 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Model200Response.java @@ -38,9 +38,9 @@ public Model200Response name(Integer name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public Integer getName() { return name; } @@ -58,9 +58,9 @@ public Model200Response propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ - @JsonProperty("class") @ApiModelProperty(value = "") + @JsonProperty("class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelApiResponse.java index 29f3f43cf20e..693e1669879c 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -39,9 +39,9 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ - @JsonProperty("code") @ApiModelProperty(value = "") + @JsonProperty("code") public Integer getCode() { return code; } @@ -59,9 +59,9 @@ public ModelApiResponse type(String type) { * Get type * @return type */ - @JsonProperty("type") @ApiModelProperty(value = "") + @JsonProperty("type") public String getType() { return type; } @@ -79,9 +79,9 @@ public ModelApiResponse message(String message) { * Get message * @return message */ - @JsonProperty("message") @ApiModelProperty(value = "") + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelList.java index a374fe83d52a..7853f3d408a0 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelList.java @@ -35,9 +35,9 @@ public ModelList _123list(String _123list) { * Get _123list * @return _123list */ - @JsonProperty("123-list") @ApiModelProperty(value = "") + @JsonProperty("123-list") public String get123list() { return _123list; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelReturn.java index d8fc618d9dfb..b6f106cea222 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelReturn.java @@ -36,9 +36,9 @@ public ModelReturn _return(Integer _return) { * Get _return * @return _return */ - @JsonProperty("return") @ApiModelProperty(value = "") + @JsonProperty("return") public Integer getReturn() { return _return; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Name.java index 054901b488d6..32403fe65891 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Name.java @@ -40,9 +40,9 @@ public Name name(Integer name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("name") public Integer getName() { return name; } @@ -60,9 +60,9 @@ public Name snakeCase(Integer snakeCase) { * Get snakeCase * @return snakeCase */ - @JsonProperty("snake_case") @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("snake_case") public Integer getSnakeCase() { return snakeCase; } @@ -80,9 +80,9 @@ public Name property(String property) { * Get property * @return property */ - @JsonProperty("property") @ApiModelProperty(value = "") + @JsonProperty("property") public String getProperty() { return property; } @@ -100,9 +100,9 @@ public Name _123number(Integer _123number) { * Get _123number * @return _123number */ - @JsonProperty("123Number") @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("123Number") public Integer get123number() { return _123number; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/NumberOnly.java index 8f2f2b19b191..1e3f9e15421d 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/NumberOnly.java @@ -34,9 +34,9 @@ public NumberOnly justNumber(BigDecimal justNumber) { * Get justNumber * @return justNumber */ - @JsonProperty("JustNumber") @Valid @ApiModelProperty(value = "") + @JsonProperty("JustNumber") public BigDecimal getJustNumber() { return justNumber; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Order.java index feac4d2cad8d..b24c70c07808 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Order.java @@ -84,9 +84,9 @@ public Order id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -104,9 +104,9 @@ public Order petId(Long petId) { * Get petId * @return petId */ - @JsonProperty("petId") @ApiModelProperty(value = "") + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -124,9 +124,9 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ - @JsonProperty("quantity") @ApiModelProperty(value = "") + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -144,9 +144,9 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ - @JsonProperty("shipDate") @Valid @ApiModelProperty(value = "") + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -164,9 +164,9 @@ public Order status(StatusEnum status) { * Order Status * @return status */ - @JsonProperty("status") @ApiModelProperty(value = "Order Status") + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -184,9 +184,9 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ - @JsonProperty("complete") @ApiModelProperty(value = "") + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/OuterComposite.java index 00cce99097d7..ade2b9150190 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/OuterComposite.java @@ -38,9 +38,9 @@ public OuterComposite myNumber(BigDecimal myNumber) { * Get myNumber * @return myNumber */ - @JsonProperty("my_number") @Valid @ApiModelProperty(value = "") + @JsonProperty("my_number") public BigDecimal getMyNumber() { return myNumber; } @@ -58,9 +58,9 @@ public OuterComposite myString(String myString) { * Get myString * @return myString */ - @JsonProperty("my_string") @ApiModelProperty(value = "") + @JsonProperty("my_string") public String getMyString() { return myString; } @@ -78,9 +78,9 @@ public OuterComposite myBoolean(Boolean myBoolean) { * Get myBoolean * @return myBoolean */ - @JsonProperty("my_boolean") @ApiModelProperty(value = "") + @JsonProperty("my_boolean") public Boolean getMyBoolean() { return myBoolean; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Pet.java index e39c22373324..b9358e2b1e87 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Pet.java @@ -90,9 +90,9 @@ public Pet id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -110,9 +110,9 @@ public Pet category(Category category) { * Get category * @return category */ - @JsonProperty("category") @Valid @ApiModelProperty(value = "") + @JsonProperty("category") public Category getCategory() { return category; } @@ -130,9 +130,9 @@ public Pet name(String name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") + @JsonProperty("name") public String getName() { return name; } @@ -155,9 +155,9 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ - @JsonProperty("photoUrls") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("photoUrls") public Set getPhotoUrls() { return photoUrls; } @@ -184,9 +184,9 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @JsonProperty("tags") @Valid @ApiModelProperty(value = "") + @JsonProperty("tags") public List getTags() { return tags; } @@ -204,9 +204,9 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ - @JsonProperty("status") @ApiModelProperty(value = "pet status in the store") + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java index d02b8c8cfd53..3eb0ebe069c1 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -35,9 +35,9 @@ public ReadOnlyFirst bar(String bar) { * Get bar * @return bar */ - @JsonProperty("bar") @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("bar") public String getBar() { return bar; } @@ -55,9 +55,9 @@ public ReadOnlyFirst baz(String baz) { * Get baz * @return baz */ - @JsonProperty("baz") @ApiModelProperty(value = "") + @JsonProperty("baz") public String getBaz() { return baz; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/SpecialModelName.java index 8f176362e027..668035becd14 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/SpecialModelName.java @@ -35,9 +35,9 @@ public class SpecialModelName { * Get $specialPropertyName * @return $specialPropertyName */ - @JsonProperty("$special[property.name]") @ApiModelProperty(value = "") + @JsonProperty("$special[property.name]") public Long get$SpecialPropertyName() { return $specialPropertyName; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Tag.java index f7797bef2f19..527e777278e2 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Tag.java @@ -35,9 +35,9 @@ public Tag id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -55,9 +55,9 @@ public Tag name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java index 506efbf431c1..41ba1c5bf1f3 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -45,9 +45,9 @@ public TypeHolderDefault stringItem(String stringItem) { * Get stringItem * @return stringItem */ - @JsonProperty("string_item") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -65,9 +65,9 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ - @JsonProperty("number_item") @NotNull @Valid @ApiModelProperty(required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -85,9 +85,9 @@ public TypeHolderDefault integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ - @JsonProperty("integer_item") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -105,9 +105,9 @@ public TypeHolderDefault boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ - @JsonProperty("bool_item") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -130,9 +130,9 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ - @JsonProperty("array_item") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderExample.java index 806c0c90fa18..8e1a76f88fdc 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -47,9 +47,9 @@ public TypeHolderExample stringItem(String stringItem) { * Get stringItem * @return stringItem */ - @JsonProperty("string_item") @NotNull @ApiModelProperty(example = "what", required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -67,9 +67,9 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ - @JsonProperty("number_item") @NotNull @Valid @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -87,9 +87,9 @@ public TypeHolderExample floatItem(Float floatItem) { * Get floatItem * @return floatItem */ - @JsonProperty("float_item") @NotNull @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("float_item") public Float getFloatItem() { return floatItem; } @@ -107,9 +107,9 @@ public TypeHolderExample integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ - @JsonProperty("integer_item") @NotNull @ApiModelProperty(example = "-2", required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -127,9 +127,9 @@ public TypeHolderExample boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ - @JsonProperty("bool_item") @NotNull @ApiModelProperty(example = "true", required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -152,9 +152,9 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ - @JsonProperty("array_item") @NotNull @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/User.java index f42832389ffe..36d29ba307d0 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/User.java @@ -47,9 +47,9 @@ public User id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -67,9 +67,9 @@ public User username(String username) { * Get username * @return username */ - @JsonProperty("username") @ApiModelProperty(value = "") + @JsonProperty("username") public String getUsername() { return username; } @@ -87,9 +87,9 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ - @JsonProperty("firstName") @ApiModelProperty(value = "") + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -107,9 +107,9 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ - @JsonProperty("lastName") @ApiModelProperty(value = "") + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -127,9 +127,9 @@ public User email(String email) { * Get email * @return email */ - @JsonProperty("email") @ApiModelProperty(value = "") + @JsonProperty("email") public String getEmail() { return email; } @@ -147,9 +147,9 @@ public User password(String password) { * Get password * @return password */ - @JsonProperty("password") @ApiModelProperty(value = "") + @JsonProperty("password") public String getPassword() { return password; } @@ -167,9 +167,9 @@ public User phone(String phone) { * Get phone * @return phone */ - @JsonProperty("phone") @ApiModelProperty(value = "") + @JsonProperty("phone") public String getPhone() { return phone; } @@ -187,9 +187,9 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ - @JsonProperty("userStatus") @ApiModelProperty(value = "User Status") + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/XmlItem.java index c795b4b85e6d..3a8d108bdbce 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/XmlItem.java @@ -101,9 +101,9 @@ public XmlItem attributeString(String attributeString) { * Get attributeString * @return attributeString */ - @JsonProperty("attribute_string") @ApiModelProperty(example = "string", value = "") + @JsonProperty("attribute_string") public String getAttributeString() { return attributeString; } @@ -121,9 +121,9 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) { * Get attributeNumber * @return attributeNumber */ - @JsonProperty("attribute_number") @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("attribute_number") public BigDecimal getAttributeNumber() { return attributeNumber; } @@ -141,9 +141,9 @@ public XmlItem attributeInteger(Integer attributeInteger) { * Get attributeInteger * @return attributeInteger */ - @JsonProperty("attribute_integer") @ApiModelProperty(example = "-2", value = "") + @JsonProperty("attribute_integer") public Integer getAttributeInteger() { return attributeInteger; } @@ -161,9 +161,9 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) { * Get attributeBoolean * @return attributeBoolean */ - @JsonProperty("attribute_boolean") @ApiModelProperty(example = "true", value = "") + @JsonProperty("attribute_boolean") public Boolean getAttributeBoolean() { return attributeBoolean; } @@ -189,9 +189,9 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) { * Get wrappedArray * @return wrappedArray */ - @JsonProperty("wrapped_array") @ApiModelProperty(value = "") + @JsonProperty("wrapped_array") public List getWrappedArray() { return wrappedArray; } @@ -209,9 +209,9 @@ public XmlItem nameString(String nameString) { * Get nameString * @return nameString */ - @JsonProperty("name_string") @ApiModelProperty(example = "string", value = "") + @JsonProperty("name_string") public String getNameString() { return nameString; } @@ -229,9 +229,9 @@ public XmlItem nameNumber(BigDecimal nameNumber) { * Get nameNumber * @return nameNumber */ - @JsonProperty("name_number") @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("name_number") public BigDecimal getNameNumber() { return nameNumber; } @@ -249,9 +249,9 @@ public XmlItem nameInteger(Integer nameInteger) { * Get nameInteger * @return nameInteger */ - @JsonProperty("name_integer") @ApiModelProperty(example = "-2", value = "") + @JsonProperty("name_integer") public Integer getNameInteger() { return nameInteger; } @@ -269,9 +269,9 @@ public XmlItem nameBoolean(Boolean nameBoolean) { * Get nameBoolean * @return nameBoolean */ - @JsonProperty("name_boolean") @ApiModelProperty(example = "true", value = "") + @JsonProperty("name_boolean") public Boolean getNameBoolean() { return nameBoolean; } @@ -297,9 +297,9 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) { * Get nameArray * @return nameArray */ - @JsonProperty("name_array") @ApiModelProperty(value = "") + @JsonProperty("name_array") public List getNameArray() { return nameArray; } @@ -325,9 +325,9 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) { * Get nameWrappedArray * @return nameWrappedArray */ - @JsonProperty("name_wrapped_array") @ApiModelProperty(value = "") + @JsonProperty("name_wrapped_array") public List getNameWrappedArray() { return nameWrappedArray; } @@ -345,9 +345,9 @@ public XmlItem prefixString(String prefixString) { * Get prefixString * @return prefixString */ - @JsonProperty("prefix_string") @ApiModelProperty(example = "string", value = "") + @JsonProperty("prefix_string") public String getPrefixString() { return prefixString; } @@ -365,9 +365,9 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) { * Get prefixNumber * @return prefixNumber */ - @JsonProperty("prefix_number") @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("prefix_number") public BigDecimal getPrefixNumber() { return prefixNumber; } @@ -385,9 +385,9 @@ public XmlItem prefixInteger(Integer prefixInteger) { * Get prefixInteger * @return prefixInteger */ - @JsonProperty("prefix_integer") @ApiModelProperty(example = "-2", value = "") + @JsonProperty("prefix_integer") public Integer getPrefixInteger() { return prefixInteger; } @@ -405,9 +405,9 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) { * Get prefixBoolean * @return prefixBoolean */ - @JsonProperty("prefix_boolean") @ApiModelProperty(example = "true", value = "") + @JsonProperty("prefix_boolean") public Boolean getPrefixBoolean() { return prefixBoolean; } @@ -433,9 +433,9 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) { * Get prefixArray * @return prefixArray */ - @JsonProperty("prefix_array") @ApiModelProperty(value = "") + @JsonProperty("prefix_array") public List getPrefixArray() { return prefixArray; } @@ -461,9 +461,9 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) { * Get prefixWrappedArray * @return prefixWrappedArray */ - @JsonProperty("prefix_wrapped_array") @ApiModelProperty(value = "") + @JsonProperty("prefix_wrapped_array") public List getPrefixWrappedArray() { return prefixWrappedArray; } @@ -481,9 +481,9 @@ public XmlItem namespaceString(String namespaceString) { * Get namespaceString * @return namespaceString */ - @JsonProperty("namespace_string") @ApiModelProperty(example = "string", value = "") + @JsonProperty("namespace_string") public String getNamespaceString() { return namespaceString; } @@ -501,9 +501,9 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) { * Get namespaceNumber * @return namespaceNumber */ - @JsonProperty("namespace_number") @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("namespace_number") public BigDecimal getNamespaceNumber() { return namespaceNumber; } @@ -521,9 +521,9 @@ public XmlItem namespaceInteger(Integer namespaceInteger) { * Get namespaceInteger * @return namespaceInteger */ - @JsonProperty("namespace_integer") @ApiModelProperty(example = "-2", value = "") + @JsonProperty("namespace_integer") public Integer getNamespaceInteger() { return namespaceInteger; } @@ -541,9 +541,9 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) { * Get namespaceBoolean * @return namespaceBoolean */ - @JsonProperty("namespace_boolean") @ApiModelProperty(example = "true", value = "") + @JsonProperty("namespace_boolean") public Boolean getNamespaceBoolean() { return namespaceBoolean; } @@ -569,9 +569,9 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) { * Get namespaceArray * @return namespaceArray */ - @JsonProperty("namespace_array") @ApiModelProperty(value = "") + @JsonProperty("namespace_array") public List getNamespaceArray() { return namespaceArray; } @@ -597,9 +597,9 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) { * Get namespaceWrappedArray * @return namespaceWrappedArray */ - @JsonProperty("namespace_wrapped_array") @ApiModelProperty(value = "") + @JsonProperty("namespace_wrapped_array") public List getNamespaceWrappedArray() { return namespaceWrappedArray; } @@ -617,9 +617,9 @@ public XmlItem prefixNsString(String prefixNsString) { * Get prefixNsString * @return prefixNsString */ - @JsonProperty("prefix_ns_string") @ApiModelProperty(example = "string", value = "") + @JsonProperty("prefix_ns_string") public String getPrefixNsString() { return prefixNsString; } @@ -637,9 +637,9 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) { * Get prefixNsNumber * @return prefixNsNumber */ - @JsonProperty("prefix_ns_number") @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("prefix_ns_number") public BigDecimal getPrefixNsNumber() { return prefixNsNumber; } @@ -657,9 +657,9 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) { * Get prefixNsInteger * @return prefixNsInteger */ - @JsonProperty("prefix_ns_integer") @ApiModelProperty(example = "-2", value = "") + @JsonProperty("prefix_ns_integer") public Integer getPrefixNsInteger() { return prefixNsInteger; } @@ -677,9 +677,9 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) { * Get prefixNsBoolean * @return prefixNsBoolean */ - @JsonProperty("prefix_ns_boolean") @ApiModelProperty(example = "true", value = "") + @JsonProperty("prefix_ns_boolean") public Boolean getPrefixNsBoolean() { return prefixNsBoolean; } @@ -705,9 +705,9 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) { * Get prefixNsArray * @return prefixNsArray */ - @JsonProperty("prefix_ns_array") @ApiModelProperty(value = "") + @JsonProperty("prefix_ns_array") public List getPrefixNsArray() { return prefixNsArray; } @@ -733,9 +733,9 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) { * Get prefixNsWrappedArray * @return prefixNsWrappedArray */ - @JsonProperty("prefix_ns_wrapped_array") @ApiModelProperty(value = "") + @JsonProperty("prefix_ns_wrapped_array") public List getPrefixNsWrappedArray() { return prefixNsWrappedArray; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-delegate-j8/src/main/resources/openapi.yaml index 2999e6f2f8d6..5fdcfc33eada 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-delegate-j8/src/main/resources/openapi.yaml @@ -2111,7 +2111,6 @@ components: status: description: Updated status of the pet type: string - type: object uploadFile_request: properties: additionalMetadata: @@ -2121,7 +2120,6 @@ components: description: file to upload format: binary type: string - type: object testEnumParameters_request: properties: enum_form_string_array: @@ -2141,7 +2139,6 @@ components: - -efg - (xyz) type: string - type: object testEndpointParameters_request: properties: integer: @@ -2214,7 +2211,6 @@ components: - double - number - pattern_without_delimiter - type: object testJsonFormData_request: properties: param: @@ -2226,7 +2222,6 @@ components: required: - param - param2 - type: object uploadFileWithRequiredFile_request: properties: additionalMetadata: @@ -2238,7 +2233,6 @@ components: type: string required: - requiredFile - type: object Dog_allOf: properties: breed: diff --git a/samples/server/petstore/springboot-delegate/.openapi-generator/FILES b/samples/server/petstore/springboot-delegate/.openapi-generator/FILES index 07f63a0e8be2..84b7f1df792d 100644 --- a/samples/server/petstore/springboot-delegate/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-delegate/.openapi-generator/FILES @@ -21,7 +21,6 @@ src/main/java/org/openapitools/api/StoreApiDelegate.java src/main/java/org/openapitools/api/UserApi.java src/main/java/org/openapitools/api/UserApiController.java src/main/java/org/openapitools/api/UserApiDelegate.java -src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/configuration/SpringFoxConfiguration.java src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java diff --git a/samples/server/petstore/springboot-delegate/.openapi-generator/VERSION b/samples/server/petstore/springboot-delegate/.openapi-generator/VERSION index d6b4ec4aa783..ed829dbcddec 100644 --- a/samples/server/petstore/springboot-delegate/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-delegate/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0-SNAPSHOT \ No newline at end of file +6.2.1-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java index ffa28f493727..e364fcafe96a 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApiController.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApiController.java index e27e2fc20ea9..7c3f20492479 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApiController.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApiController.java @@ -27,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class AnotherFakeApiController implements AnotherFakeApi { private final AnotherFakeApiDelegate delegate; 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 261a033dd80d..8099dd8fb43b 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java index 726b17779f18..8e624ba5fb59 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java @@ -37,7 +37,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeApiController implements FakeApi { private final FakeApiDelegate delegate; diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index ecc2a625ddfb..b58eee9db9f4 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java index 21e28fe8b213..48a276daf130 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java @@ -27,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeClassnameTestApiController implements FakeClassnameTestApi { private final FakeClassnameTestApiDelegate delegate; 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 16b3566374e5..0d3907293827 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiController.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiController.java index 5ef3de965ff8..e27c4c3b49d6 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiController.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiController.java @@ -29,7 +29,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class PetApiController implements PetApi { private final PetApiDelegate delegate; diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java index c9e8abe50bf6..8a1f4ea555b9 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiController.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiController.java index e9e29a41b4f9..8c3b33a99af6 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiController.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiController.java @@ -28,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class StoreApiController implements StoreApi { private final StoreApiDelegate delegate; diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java index e960ec9acd6b..9d54717caa97 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApiController.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApiController.java index 1b48d4a9444b..58511a07291c 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApiController.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApiController.java @@ -29,7 +29,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class UserApiController implements UserApi { private final UserApiDelegate delegate; diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index cb51920a8c28..686fafb2faaf 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -35,9 +35,9 @@ public AdditionalPropertiesAnyType name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 1c66a636116f..a2c3df24a2df 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -36,9 +36,9 @@ public AdditionalPropertiesArray name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 1dcc607639bf..82fcada6f56a 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -35,9 +35,9 @@ public AdditionalPropertiesBoolean name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 74250eb564ad..7b720b30d83a 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -73,9 +73,9 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt * Get mapString * @return mapString */ - @JsonProperty("map_string") @ApiModelProperty(value = "") + @JsonProperty("map_string") public Map getMapString() { return mapString; } @@ -101,9 +101,9 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * Get mapNumber * @return mapNumber */ - @JsonProperty("map_number") @Valid @ApiModelProperty(value = "") + @JsonProperty("map_number") public Map getMapNumber() { return mapNumber; } @@ -129,9 +129,9 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege * Get mapInteger * @return mapInteger */ - @JsonProperty("map_integer") @ApiModelProperty(value = "") + @JsonProperty("map_integer") public Map getMapInteger() { return mapInteger; } @@ -157,9 +157,9 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea * Get mapBoolean * @return mapBoolean */ - @JsonProperty("map_boolean") @ApiModelProperty(value = "") + @JsonProperty("map_boolean") public Map getMapBoolean() { return mapBoolean; } @@ -185,9 +185,9 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { return mapArrayInteger; } @@ -213,9 +213,9 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * Get mapArrayAnytype * @return mapArrayAnytype */ - @JsonProperty("map_array_anytype") @Valid @ApiModelProperty(value = "") + @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { return mapArrayAnytype; } @@ -241,9 +241,9 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { return mapMapString; } @@ -269,9 +269,9 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { return mapMapAnytype; } @@ -289,9 +289,9 @@ public AdditionalPropertiesClass anytype1(Object anytype1) { * Get anytype1 * @return anytype1 */ - @JsonProperty("anytype_1") @ApiModelProperty(value = "") + @JsonProperty("anytype_1") public Object getAnytype1() { return anytype1; } @@ -309,9 +309,9 @@ public AdditionalPropertiesClass anytype2(Object anytype2) { * Get anytype2 * @return anytype2 */ - @JsonProperty("anytype_2") @ApiModelProperty(value = "") + @JsonProperty("anytype_2") public Object getAnytype2() { return anytype2; } @@ -329,9 +329,9 @@ public AdditionalPropertiesClass anytype3(Object anytype3) { * Get anytype3 * @return anytype3 */ - @JsonProperty("anytype_3") @ApiModelProperty(value = "") + @JsonProperty("anytype_3") public Object getAnytype3() { return anytype3; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index ce8b8d62436c..ea2ec5365edc 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -35,9 +35,9 @@ public AdditionalPropertiesInteger name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index dec791e0a273..4ca4b5a2f509 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -36,9 +36,9 @@ public AdditionalPropertiesNumber name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 546d0ab9216f..7b9d8ef0b0b2 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -35,9 +35,9 @@ public AdditionalPropertiesObject name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index c1f95cf62e81..fdc4baa9de7b 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -35,9 +35,9 @@ public AdditionalPropertiesString name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java index e880f829164c..dfb303255b3b 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java @@ -52,9 +52,9 @@ public Animal className(String className) { * Get className * @return className */ - @JsonProperty("className") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("className") public String getClassName() { return className; } @@ -72,9 +72,9 @@ public Animal color(String color) { * Get color * @return color */ - @JsonProperty("color") @ApiModelProperty(value = "") + @JsonProperty("color") public String getColor() { return color; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 46ab3b631960..42b8443e9be2 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -45,9 +45,9 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * Get arrayArrayNumber * @return arrayArrayNumber */ - @JsonProperty("ArrayArrayNumber") @Valid @ApiModelProperty(value = "") + @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index cb5358905469..f60290a4d8ad 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -45,9 +45,9 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ - @JsonProperty("ArrayNumber") @Valid @ApiModelProperty(value = "") + @JsonProperty("ArrayNumber") public List getArrayNumber() { return arrayNumber; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java index 55cc431ecde6..8bb3f76ca666 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java @@ -51,9 +51,9 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) { * Get arrayOfString * @return arrayOfString */ - @JsonProperty("array_of_string") @ApiModelProperty(value = "") + @JsonProperty("array_of_string") public List getArrayOfString() { return arrayOfString; } @@ -79,9 +79,9 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ - @JsonProperty("array_array_of_integer") @Valid @ApiModelProperty(value = "") + @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; } @@ -107,9 +107,9 @@ public ArrayTest addArrayArrayOfModelItem(List arrayArrayOfModelI * Get arrayArrayOfModel * @return arrayArrayOfModel */ - @JsonProperty("array_array_of_model") @Valid @ApiModelProperty(value = "") + @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java index 70bbb0b93532..16372fb10406 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java @@ -78,9 +78,9 @@ public BigCat kind(KindEnum kind) { * Get kind * @return kind */ - @JsonProperty("kind") @ApiModelProperty(value = "") + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCatAllOf.java index 1a86665050e6..59ab1d8d2bf8 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCatAllOf.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCatAllOf.java @@ -75,9 +75,9 @@ public BigCatAllOf kind(KindEnum kind) { * Get kind * @return kind */ - @JsonProperty("kind") @ApiModelProperty(value = "") + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Capitalization.java index e0fdbe78bae2..feb0d643c5e5 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Capitalization.java @@ -43,9 +43,9 @@ public Capitalization smallCamel(String smallCamel) { * Get smallCamel * @return smallCamel */ - @JsonProperty("smallCamel") @ApiModelProperty(value = "") + @JsonProperty("smallCamel") public String getSmallCamel() { return smallCamel; } @@ -63,9 +63,9 @@ public Capitalization capitalCamel(String capitalCamel) { * Get capitalCamel * @return capitalCamel */ - @JsonProperty("CapitalCamel") @ApiModelProperty(value = "") + @JsonProperty("CapitalCamel") public String getCapitalCamel() { return capitalCamel; } @@ -83,9 +83,9 @@ public Capitalization smallSnake(String smallSnake) { * Get smallSnake * @return smallSnake */ - @JsonProperty("small_Snake") @ApiModelProperty(value = "") + @JsonProperty("small_Snake") public String getSmallSnake() { return smallSnake; } @@ -103,9 +103,9 @@ public Capitalization capitalSnake(String capitalSnake) { * Get capitalSnake * @return capitalSnake */ - @JsonProperty("Capital_Snake") @ApiModelProperty(value = "") + @JsonProperty("Capital_Snake") public String getCapitalSnake() { return capitalSnake; } @@ -123,9 +123,9 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) { * Get scAETHFlowPoints * @return scAETHFlowPoints */ - @JsonProperty("SCA_ETH_Flow_Points") @ApiModelProperty(value = "") + @JsonProperty("SCA_ETH_Flow_Points") public String getScAETHFlowPoints() { return scAETHFlowPoints; } @@ -143,9 +143,9 @@ public Capitalization ATT_NAME(String ATT_NAME) { * Name of the pet * @return ATT_NAME */ - @JsonProperty("ATT_NAME") @ApiModelProperty(value = "Name of the pet ") + @JsonProperty("ATT_NAME") public String getATTNAME() { return ATT_NAME; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java index 958fcb2298e0..04fd58e2e14a 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java @@ -47,9 +47,9 @@ public Cat declawed(Boolean declawed) { * Get declawed * @return declawed */ - @JsonProperty("declawed") @ApiModelProperty(value = "") + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/CatAllOf.java index 63de2ad8818e..85c6885ae000 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/CatAllOf.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/CatAllOf.java @@ -35,9 +35,9 @@ public CatAllOf declawed(Boolean declawed) { * Get declawed * @return declawed */ - @JsonProperty("declawed") @ApiModelProperty(value = "") + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java index b63268b2c8ce..3b813dcea538 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java @@ -35,9 +35,9 @@ public Category id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -55,9 +55,9 @@ public Category name(String name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ClassModel.java index 976f0b01d071..2c511abe3ecb 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ClassModel.java @@ -34,9 +34,9 @@ public ClassModel propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ - @JsonProperty("_class") @ApiModelProperty(value = "") + @JsonProperty("_class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Client.java index a3c4731f3339..a6bfdf58db7f 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Client.java @@ -33,9 +33,9 @@ public Client client(String client) { * Get client * @return client */ - @JsonProperty("client") @ApiModelProperty(value = "") + @JsonProperty("client") public String getClient() { return client; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Dog.java index 593562fabb42..a75ee6095e33 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Dog.java @@ -38,9 +38,9 @@ public Dog breed(String breed) { * Get breed * @return breed */ - @JsonProperty("breed") @ApiModelProperty(value = "") + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/DogAllOf.java index 7ddb24717737..5784d207b4d2 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/DogAllOf.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/DogAllOf.java @@ -35,9 +35,9 @@ public DogAllOf breed(String breed) { * Get breed * @return breed */ - @JsonProperty("breed") @ApiModelProperty(value = "") + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java index 04e850b1cf17..43a28057b120 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java @@ -109,9 +109,9 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) { * Get justSymbol * @return justSymbol */ - @JsonProperty("just_symbol") @ApiModelProperty(value = "") + @JsonProperty("just_symbol") public JustSymbolEnum getJustSymbol() { return justSymbol; } @@ -137,9 +137,9 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) { * Get arrayEnum * @return arrayEnum */ - @JsonProperty("array_enum") @ApiModelProperty(value = "") + @JsonProperty("array_enum") public List getArrayEnum() { return arrayEnum; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java index 49747f67dccf..3f7af66d4ce7 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java @@ -189,9 +189,9 @@ public EnumTest enumString(EnumStringEnum enumString) { * Get enumString * @return enumString */ - @JsonProperty("enum_string") @ApiModelProperty(value = "") + @JsonProperty("enum_string") public EnumStringEnum getEnumString() { return enumString; } @@ -209,9 +209,9 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) { * Get enumStringRequired * @return enumStringRequired */ - @JsonProperty("enum_string_required") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("enum_string_required") public EnumStringRequiredEnum getEnumStringRequired() { return enumStringRequired; } @@ -229,9 +229,9 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) { * Get enumInteger * @return enumInteger */ - @JsonProperty("enum_integer") @ApiModelProperty(value = "") + @JsonProperty("enum_integer") public EnumIntegerEnum getEnumInteger() { return enumInteger; } @@ -249,9 +249,9 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) { * Get enumNumber * @return enumNumber */ - @JsonProperty("enum_number") @ApiModelProperty(value = "") + @JsonProperty("enum_number") public EnumNumberEnum getEnumNumber() { return enumNumber; } @@ -269,9 +269,9 @@ public EnumTest outerEnum(OuterEnum outerEnum) { * Get outerEnum * @return outerEnum */ - @JsonProperty("outerEnum") @Valid @ApiModelProperty(value = "") + @JsonProperty("outerEnum") public OuterEnum getOuterEnum() { return outerEnum; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/File.java index 43c44fd344bb..fedeea1c6389 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/File.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/File.java @@ -34,9 +34,9 @@ public File sourceURI(String sourceURI) { * Test capitalization * @return sourceURI */ - @JsonProperty("sourceURI") @ApiModelProperty(value = "Test capitalization") + @JsonProperty("sourceURI") public String getSourceURI() { return sourceURI; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java index d7815943b774..81fc87926e00 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -39,9 +39,9 @@ public FileSchemaTestClass file(File file) { * Get file * @return file */ - @JsonProperty("file") @Valid @ApiModelProperty(value = "") + @JsonProperty("file") public File getFile() { return file; } @@ -67,9 +67,9 @@ public FileSchemaTestClass addFilesItem(File filesItem) { * Get files * @return files */ - @JsonProperty("files") @Valid @ApiModelProperty(value = "") + @JsonProperty("files") public List getFiles() { return files; } 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 ffd18f0ce221..e8697b47182b 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 @@ -71,9 +71,9 @@ public FormatTest integer(Integer integer) { * maximum: 100 * @return integer */ - @JsonProperty("integer") @Min(10) @Max(100) @ApiModelProperty(value = "") + @JsonProperty("integer") public Integer getInteger() { return integer; } @@ -93,9 +93,9 @@ public FormatTest int32(Integer int32) { * maximum: 200 * @return int32 */ - @JsonProperty("int32") @Min(20) @Max(200) @ApiModelProperty(value = "") + @JsonProperty("int32") public Integer getInt32() { return int32; } @@ -113,9 +113,9 @@ public FormatTest int64(Long int64) { * Get int64 * @return int64 */ - @JsonProperty("int64") @ApiModelProperty(value = "") + @JsonProperty("int64") public Long getInt64() { return int64; } @@ -135,9 +135,9 @@ public FormatTest number(BigDecimal number) { * maximum: 543.2 * @return number */ - @JsonProperty("number") @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") @ApiModelProperty(required = true, value = "") + @JsonProperty("number") public BigDecimal getNumber() { return number; } @@ -157,9 +157,9 @@ public FormatTest _float(Float _float) { * maximum: 987.6 * @return _float */ - @JsonProperty("float") @DecimalMin("54.3") @DecimalMax("987.6") @ApiModelProperty(value = "") + @JsonProperty("float") public Float getFloat() { return _float; } @@ -179,9 +179,9 @@ public FormatTest _double(Double _double) { * maximum: 123.4 * @return _double */ - @JsonProperty("double") @DecimalMin("67.8") @DecimalMax("123.4") @ApiModelProperty(value = "") + @JsonProperty("double") public Double getDouble() { return _double; } @@ -199,9 +199,9 @@ public FormatTest string(String string) { * Get string * @return string */ - @JsonProperty("string") @Pattern(regexp = "/[a-z]/i") @ApiModelProperty(value = "") + @JsonProperty("string") public String getString() { return string; } @@ -219,9 +219,9 @@ public FormatTest _byte(byte[] _byte) { * Get _byte * @return _byte */ - @JsonProperty("byte") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("byte") public byte[] getByte() { return _byte; } @@ -239,9 +239,9 @@ public FormatTest binary(org.springframework.core.io.Resource binary) { * Get binary * @return binary */ - @JsonProperty("binary") @Valid @ApiModelProperty(value = "") + @JsonProperty("binary") public org.springframework.core.io.Resource getBinary() { return binary; } @@ -259,9 +259,9 @@ public FormatTest date(LocalDate date) { * Get date * @return date */ - @JsonProperty("date") @NotNull @Valid @ApiModelProperty(required = true, value = "") + @JsonProperty("date") public LocalDate getDate() { return date; } @@ -279,9 +279,9 @@ public FormatTest dateTime(OffsetDateTime dateTime) { * Get dateTime * @return dateTime */ - @JsonProperty("dateTime") @Valid @ApiModelProperty(value = "") + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -299,9 +299,9 @@ public FormatTest uuid(UUID uuid) { * Get uuid * @return uuid */ - @JsonProperty("uuid") @Valid @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -319,9 +319,9 @@ public FormatTest password(String password) { * Get password * @return password */ - @JsonProperty("password") @NotNull @Size(min = 10, max = 64) @ApiModelProperty(required = true, value = "") + @JsonProperty("password") public String getPassword() { return password; } @@ -339,9 +339,9 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) { * Get bigDecimal * @return bigDecimal */ - @JsonProperty("BigDecimal") @Valid @ApiModelProperty(value = "") + @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { return bigDecimal; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index 948ed9a0731d..21a424459798 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -37,9 +37,9 @@ public HasOnlyReadOnly bar(String bar) { * Get bar * @return bar */ - @JsonProperty("bar") @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("bar") public String getBar() { return bar; } @@ -57,9 +57,9 @@ public HasOnlyReadOnly foo(String foo) { * Get foo * @return foo */ - @JsonProperty("foo") @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("foo") public String getFoo() { return foo; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java index 94d4ae9a9d56..76c6bee7adcb 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java @@ -89,9 +89,9 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapMapOfString * @return mapMapOfString */ - @JsonProperty("map_map_of_string") @Valid @ApiModelProperty(value = "") + @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { return mapMapOfString; } @@ -117,9 +117,9 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) * Get mapOfEnumString * @return mapOfEnumString */ - @JsonProperty("map_of_enum_string") @ApiModelProperty(value = "") + @JsonProperty("map_of_enum_string") public Map getMapOfEnumString() { return mapOfEnumString; } @@ -145,9 +145,9 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) { * Get directMap * @return directMap */ - @JsonProperty("direct_map") @ApiModelProperty(value = "") + @JsonProperty("direct_map") public Map getDirectMap() { return directMap; } @@ -173,9 +173,9 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) { * Get indirectMap * @return indirectMap */ - @JsonProperty("indirect_map") @ApiModelProperty(value = "") + @JsonProperty("indirect_map") public Map getIndirectMap() { return indirectMap; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 89a2475d82fb..f9e2230eba97 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -45,9 +45,9 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { * Get uuid * @return uuid */ - @JsonProperty("uuid") @Valid @ApiModelProperty(value = "") + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -65,9 +65,9 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT * Get dateTime * @return dateTime */ - @JsonProperty("dateTime") @Valid @ApiModelProperty(value = "") + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -93,9 +93,9 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * Get map * @return map */ - @JsonProperty("map") @Valid @ApiModelProperty(value = "") + @JsonProperty("map") public Map getMap() { return map; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Model200Response.java index 220b6493f31a..193231f85457 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Model200Response.java @@ -38,9 +38,9 @@ public Model200Response name(Integer name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public Integer getName() { return name; } @@ -58,9 +58,9 @@ public Model200Response propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ - @JsonProperty("class") @ApiModelProperty(value = "") + @JsonProperty("class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelApiResponse.java index 29f3f43cf20e..693e1669879c 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -39,9 +39,9 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ - @JsonProperty("code") @ApiModelProperty(value = "") + @JsonProperty("code") public Integer getCode() { return code; } @@ -59,9 +59,9 @@ public ModelApiResponse type(String type) { * Get type * @return type */ - @JsonProperty("type") @ApiModelProperty(value = "") + @JsonProperty("type") public String getType() { return type; } @@ -79,9 +79,9 @@ public ModelApiResponse message(String message) { * Get message * @return message */ - @JsonProperty("message") @ApiModelProperty(value = "") + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelList.java index a374fe83d52a..7853f3d408a0 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelList.java @@ -35,9 +35,9 @@ public ModelList _123list(String _123list) { * Get _123list * @return _123list */ - @JsonProperty("123-list") @ApiModelProperty(value = "") + @JsonProperty("123-list") public String get123list() { return _123list; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelReturn.java index d8fc618d9dfb..b6f106cea222 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelReturn.java @@ -36,9 +36,9 @@ public ModelReturn _return(Integer _return) { * Get _return * @return _return */ - @JsonProperty("return") @ApiModelProperty(value = "") + @JsonProperty("return") public Integer getReturn() { return _return; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Name.java index 054901b488d6..32403fe65891 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Name.java @@ -40,9 +40,9 @@ public Name name(Integer name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("name") public Integer getName() { return name; } @@ -60,9 +60,9 @@ public Name snakeCase(Integer snakeCase) { * Get snakeCase * @return snakeCase */ - @JsonProperty("snake_case") @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("snake_case") public Integer getSnakeCase() { return snakeCase; } @@ -80,9 +80,9 @@ public Name property(String property) { * Get property * @return property */ - @JsonProperty("property") @ApiModelProperty(value = "") + @JsonProperty("property") public String getProperty() { return property; } @@ -100,9 +100,9 @@ public Name _123number(Integer _123number) { * Get _123number * @return _123number */ - @JsonProperty("123Number") @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("123Number") public Integer get123number() { return _123number; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NumberOnly.java index 8f2f2b19b191..1e3f9e15421d 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NumberOnly.java @@ -34,9 +34,9 @@ public NumberOnly justNumber(BigDecimal justNumber) { * Get justNumber * @return justNumber */ - @JsonProperty("JustNumber") @Valid @ApiModelProperty(value = "") + @JsonProperty("JustNumber") public BigDecimal getJustNumber() { return justNumber; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Order.java index feac4d2cad8d..b24c70c07808 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Order.java @@ -84,9 +84,9 @@ public Order id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -104,9 +104,9 @@ public Order petId(Long petId) { * Get petId * @return petId */ - @JsonProperty("petId") @ApiModelProperty(value = "") + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -124,9 +124,9 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ - @JsonProperty("quantity") @ApiModelProperty(value = "") + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -144,9 +144,9 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ - @JsonProperty("shipDate") @Valid @ApiModelProperty(value = "") + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -164,9 +164,9 @@ public Order status(StatusEnum status) { * Order Status * @return status */ - @JsonProperty("status") @ApiModelProperty(value = "Order Status") + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -184,9 +184,9 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ - @JsonProperty("complete") @ApiModelProperty(value = "") + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/OuterComposite.java index 00cce99097d7..ade2b9150190 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/OuterComposite.java @@ -38,9 +38,9 @@ public OuterComposite myNumber(BigDecimal myNumber) { * Get myNumber * @return myNumber */ - @JsonProperty("my_number") @Valid @ApiModelProperty(value = "") + @JsonProperty("my_number") public BigDecimal getMyNumber() { return myNumber; } @@ -58,9 +58,9 @@ public OuterComposite myString(String myString) { * Get myString * @return myString */ - @JsonProperty("my_string") @ApiModelProperty(value = "") + @JsonProperty("my_string") public String getMyString() { return myString; } @@ -78,9 +78,9 @@ public OuterComposite myBoolean(Boolean myBoolean) { * Get myBoolean * @return myBoolean */ - @JsonProperty("my_boolean") @ApiModelProperty(value = "") + @JsonProperty("my_boolean") public Boolean getMyBoolean() { return myBoolean; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java index e39c22373324..b9358e2b1e87 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java @@ -90,9 +90,9 @@ public Pet id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -110,9 +110,9 @@ public Pet category(Category category) { * Get category * @return category */ - @JsonProperty("category") @Valid @ApiModelProperty(value = "") + @JsonProperty("category") public Category getCategory() { return category; } @@ -130,9 +130,9 @@ public Pet name(String name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") + @JsonProperty("name") public String getName() { return name; } @@ -155,9 +155,9 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ - @JsonProperty("photoUrls") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("photoUrls") public Set getPhotoUrls() { return photoUrls; } @@ -184,9 +184,9 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @JsonProperty("tags") @Valid @ApiModelProperty(value = "") + @JsonProperty("tags") public List getTags() { return tags; } @@ -204,9 +204,9 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ - @JsonProperty("status") @ApiModelProperty(value = "pet status in the store") + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java index d02b8c8cfd53..3eb0ebe069c1 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -35,9 +35,9 @@ public ReadOnlyFirst bar(String bar) { * Get bar * @return bar */ - @JsonProperty("bar") @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("bar") public String getBar() { return bar; } @@ -55,9 +55,9 @@ public ReadOnlyFirst baz(String baz) { * Get baz * @return baz */ - @JsonProperty("baz") @ApiModelProperty(value = "") + @JsonProperty("baz") public String getBaz() { return baz; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java index 8f176362e027..668035becd14 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java @@ -35,9 +35,9 @@ public class SpecialModelName { * Get $specialPropertyName * @return $specialPropertyName */ - @JsonProperty("$special[property.name]") @ApiModelProperty(value = "") + @JsonProperty("$special[property.name]") public Long get$SpecialPropertyName() { return $specialPropertyName; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Tag.java index f7797bef2f19..527e777278e2 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Tag.java @@ -35,9 +35,9 @@ public Tag id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -55,9 +55,9 @@ public Tag name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java index 506efbf431c1..41ba1c5bf1f3 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -45,9 +45,9 @@ public TypeHolderDefault stringItem(String stringItem) { * Get stringItem * @return stringItem */ - @JsonProperty("string_item") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -65,9 +65,9 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ - @JsonProperty("number_item") @NotNull @Valid @ApiModelProperty(required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -85,9 +85,9 @@ public TypeHolderDefault integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ - @JsonProperty("integer_item") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -105,9 +105,9 @@ public TypeHolderDefault boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ - @JsonProperty("bool_item") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -130,9 +130,9 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ - @JsonProperty("array_item") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java index 806c0c90fa18..8e1a76f88fdc 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -47,9 +47,9 @@ public TypeHolderExample stringItem(String stringItem) { * Get stringItem * @return stringItem */ - @JsonProperty("string_item") @NotNull @ApiModelProperty(example = "what", required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -67,9 +67,9 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ - @JsonProperty("number_item") @NotNull @Valid @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -87,9 +87,9 @@ public TypeHolderExample floatItem(Float floatItem) { * Get floatItem * @return floatItem */ - @JsonProperty("float_item") @NotNull @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("float_item") public Float getFloatItem() { return floatItem; } @@ -107,9 +107,9 @@ public TypeHolderExample integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ - @JsonProperty("integer_item") @NotNull @ApiModelProperty(example = "-2", required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -127,9 +127,9 @@ public TypeHolderExample boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ - @JsonProperty("bool_item") @NotNull @ApiModelProperty(example = "true", required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -152,9 +152,9 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ - @JsonProperty("array_item") @NotNull @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/User.java index f42832389ffe..36d29ba307d0 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/User.java @@ -47,9 +47,9 @@ public User id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -67,9 +67,9 @@ public User username(String username) { * Get username * @return username */ - @JsonProperty("username") @ApiModelProperty(value = "") + @JsonProperty("username") public String getUsername() { return username; } @@ -87,9 +87,9 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ - @JsonProperty("firstName") @ApiModelProperty(value = "") + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -107,9 +107,9 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ - @JsonProperty("lastName") @ApiModelProperty(value = "") + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -127,9 +127,9 @@ public User email(String email) { * Get email * @return email */ - @JsonProperty("email") @ApiModelProperty(value = "") + @JsonProperty("email") public String getEmail() { return email; } @@ -147,9 +147,9 @@ public User password(String password) { * Get password * @return password */ - @JsonProperty("password") @ApiModelProperty(value = "") + @JsonProperty("password") public String getPassword() { return password; } @@ -167,9 +167,9 @@ public User phone(String phone) { * Get phone * @return phone */ - @JsonProperty("phone") @ApiModelProperty(value = "") + @JsonProperty("phone") public String getPhone() { return phone; } @@ -187,9 +187,9 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ - @JsonProperty("userStatus") @ApiModelProperty(value = "User Status") + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java index c795b4b85e6d..3a8d108bdbce 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java @@ -101,9 +101,9 @@ public XmlItem attributeString(String attributeString) { * Get attributeString * @return attributeString */ - @JsonProperty("attribute_string") @ApiModelProperty(example = "string", value = "") + @JsonProperty("attribute_string") public String getAttributeString() { return attributeString; } @@ -121,9 +121,9 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) { * Get attributeNumber * @return attributeNumber */ - @JsonProperty("attribute_number") @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("attribute_number") public BigDecimal getAttributeNumber() { return attributeNumber; } @@ -141,9 +141,9 @@ public XmlItem attributeInteger(Integer attributeInteger) { * Get attributeInteger * @return attributeInteger */ - @JsonProperty("attribute_integer") @ApiModelProperty(example = "-2", value = "") + @JsonProperty("attribute_integer") public Integer getAttributeInteger() { return attributeInteger; } @@ -161,9 +161,9 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) { * Get attributeBoolean * @return attributeBoolean */ - @JsonProperty("attribute_boolean") @ApiModelProperty(example = "true", value = "") + @JsonProperty("attribute_boolean") public Boolean getAttributeBoolean() { return attributeBoolean; } @@ -189,9 +189,9 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) { * Get wrappedArray * @return wrappedArray */ - @JsonProperty("wrapped_array") @ApiModelProperty(value = "") + @JsonProperty("wrapped_array") public List getWrappedArray() { return wrappedArray; } @@ -209,9 +209,9 @@ public XmlItem nameString(String nameString) { * Get nameString * @return nameString */ - @JsonProperty("name_string") @ApiModelProperty(example = "string", value = "") + @JsonProperty("name_string") public String getNameString() { return nameString; } @@ -229,9 +229,9 @@ public XmlItem nameNumber(BigDecimal nameNumber) { * Get nameNumber * @return nameNumber */ - @JsonProperty("name_number") @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("name_number") public BigDecimal getNameNumber() { return nameNumber; } @@ -249,9 +249,9 @@ public XmlItem nameInteger(Integer nameInteger) { * Get nameInteger * @return nameInteger */ - @JsonProperty("name_integer") @ApiModelProperty(example = "-2", value = "") + @JsonProperty("name_integer") public Integer getNameInteger() { return nameInteger; } @@ -269,9 +269,9 @@ public XmlItem nameBoolean(Boolean nameBoolean) { * Get nameBoolean * @return nameBoolean */ - @JsonProperty("name_boolean") @ApiModelProperty(example = "true", value = "") + @JsonProperty("name_boolean") public Boolean getNameBoolean() { return nameBoolean; } @@ -297,9 +297,9 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) { * Get nameArray * @return nameArray */ - @JsonProperty("name_array") @ApiModelProperty(value = "") + @JsonProperty("name_array") public List getNameArray() { return nameArray; } @@ -325,9 +325,9 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) { * Get nameWrappedArray * @return nameWrappedArray */ - @JsonProperty("name_wrapped_array") @ApiModelProperty(value = "") + @JsonProperty("name_wrapped_array") public List getNameWrappedArray() { return nameWrappedArray; } @@ -345,9 +345,9 @@ public XmlItem prefixString(String prefixString) { * Get prefixString * @return prefixString */ - @JsonProperty("prefix_string") @ApiModelProperty(example = "string", value = "") + @JsonProperty("prefix_string") public String getPrefixString() { return prefixString; } @@ -365,9 +365,9 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) { * Get prefixNumber * @return prefixNumber */ - @JsonProperty("prefix_number") @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("prefix_number") public BigDecimal getPrefixNumber() { return prefixNumber; } @@ -385,9 +385,9 @@ public XmlItem prefixInteger(Integer prefixInteger) { * Get prefixInteger * @return prefixInteger */ - @JsonProperty("prefix_integer") @ApiModelProperty(example = "-2", value = "") + @JsonProperty("prefix_integer") public Integer getPrefixInteger() { return prefixInteger; } @@ -405,9 +405,9 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) { * Get prefixBoolean * @return prefixBoolean */ - @JsonProperty("prefix_boolean") @ApiModelProperty(example = "true", value = "") + @JsonProperty("prefix_boolean") public Boolean getPrefixBoolean() { return prefixBoolean; } @@ -433,9 +433,9 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) { * Get prefixArray * @return prefixArray */ - @JsonProperty("prefix_array") @ApiModelProperty(value = "") + @JsonProperty("prefix_array") public List getPrefixArray() { return prefixArray; } @@ -461,9 +461,9 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) { * Get prefixWrappedArray * @return prefixWrappedArray */ - @JsonProperty("prefix_wrapped_array") @ApiModelProperty(value = "") + @JsonProperty("prefix_wrapped_array") public List getPrefixWrappedArray() { return prefixWrappedArray; } @@ -481,9 +481,9 @@ public XmlItem namespaceString(String namespaceString) { * Get namespaceString * @return namespaceString */ - @JsonProperty("namespace_string") @ApiModelProperty(example = "string", value = "") + @JsonProperty("namespace_string") public String getNamespaceString() { return namespaceString; } @@ -501,9 +501,9 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) { * Get namespaceNumber * @return namespaceNumber */ - @JsonProperty("namespace_number") @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("namespace_number") public BigDecimal getNamespaceNumber() { return namespaceNumber; } @@ -521,9 +521,9 @@ public XmlItem namespaceInteger(Integer namespaceInteger) { * Get namespaceInteger * @return namespaceInteger */ - @JsonProperty("namespace_integer") @ApiModelProperty(example = "-2", value = "") + @JsonProperty("namespace_integer") public Integer getNamespaceInteger() { return namespaceInteger; } @@ -541,9 +541,9 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) { * Get namespaceBoolean * @return namespaceBoolean */ - @JsonProperty("namespace_boolean") @ApiModelProperty(example = "true", value = "") + @JsonProperty("namespace_boolean") public Boolean getNamespaceBoolean() { return namespaceBoolean; } @@ -569,9 +569,9 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) { * Get namespaceArray * @return namespaceArray */ - @JsonProperty("namespace_array") @ApiModelProperty(value = "") + @JsonProperty("namespace_array") public List getNamespaceArray() { return namespaceArray; } @@ -597,9 +597,9 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) { * Get namespaceWrappedArray * @return namespaceWrappedArray */ - @JsonProperty("namespace_wrapped_array") @ApiModelProperty(value = "") + @JsonProperty("namespace_wrapped_array") public List getNamespaceWrappedArray() { return namespaceWrappedArray; } @@ -617,9 +617,9 @@ public XmlItem prefixNsString(String prefixNsString) { * Get prefixNsString * @return prefixNsString */ - @JsonProperty("prefix_ns_string") @ApiModelProperty(example = "string", value = "") + @JsonProperty("prefix_ns_string") public String getPrefixNsString() { return prefixNsString; } @@ -637,9 +637,9 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) { * Get prefixNsNumber * @return prefixNsNumber */ - @JsonProperty("prefix_ns_number") @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("prefix_ns_number") public BigDecimal getPrefixNsNumber() { return prefixNsNumber; } @@ -657,9 +657,9 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) { * Get prefixNsInteger * @return prefixNsInteger */ - @JsonProperty("prefix_ns_integer") @ApiModelProperty(example = "-2", value = "") + @JsonProperty("prefix_ns_integer") public Integer getPrefixNsInteger() { return prefixNsInteger; } @@ -677,9 +677,9 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) { * Get prefixNsBoolean * @return prefixNsBoolean */ - @JsonProperty("prefix_ns_boolean") @ApiModelProperty(example = "true", value = "") + @JsonProperty("prefix_ns_boolean") public Boolean getPrefixNsBoolean() { return prefixNsBoolean; } @@ -705,9 +705,9 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) { * Get prefixNsArray * @return prefixNsArray */ - @JsonProperty("prefix_ns_array") @ApiModelProperty(value = "") + @JsonProperty("prefix_ns_array") public List getPrefixNsArray() { return prefixNsArray; } @@ -733,9 +733,9 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) { * Get prefixNsWrappedArray * @return prefixNsWrappedArray */ - @JsonProperty("prefix_ns_wrapped_array") @ApiModelProperty(value = "") + @JsonProperty("prefix_ns_wrapped_array") public List getPrefixNsWrappedArray() { return prefixNsWrappedArray; } diff --git a/samples/server/petstore/springboot-delegate/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-delegate/src/main/resources/openapi.yaml index 2999e6f2f8d6..5fdcfc33eada 100644 --- a/samples/server/petstore/springboot-delegate/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-delegate/src/main/resources/openapi.yaml @@ -2111,7 +2111,6 @@ components: status: description: Updated status of the pet type: string - type: object uploadFile_request: properties: additionalMetadata: @@ -2121,7 +2120,6 @@ components: description: file to upload format: binary type: string - type: object testEnumParameters_request: properties: enum_form_string_array: @@ -2141,7 +2139,6 @@ components: - -efg - (xyz) type: string - type: object testEndpointParameters_request: properties: integer: @@ -2214,7 +2211,6 @@ components: - double - number - pattern_without_delimiter - type: object testJsonFormData_request: properties: param: @@ -2226,7 +2222,6 @@ components: required: - param - param2 - type: object uploadFileWithRequiredFile_request: properties: additionalMetadata: @@ -2238,7 +2233,6 @@ components: type: string required: - requiredFile - type: object Dog_allOf: properties: breed: diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/.openapi-generator/VERSION b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/.openapi-generator/VERSION index d6b4ec4aa783..ed829dbcddec 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0-SNAPSHOT \ No newline at end of file +6.2.1-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/PetApi.java index 9b66d42d3563..e4eec4c16809 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/PetApiController.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/PetApiController.java index b8fa3720a211..7713fe93c419 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/PetApiController.java +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/PetApiController.java @@ -29,7 +29,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class PetApiController implements PetApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/StoreApi.java index 3044b699b0d0..e149518ef0c5 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/StoreApiController.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/StoreApiController.java index 1292dc0b721d..f8c784ff3838 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/StoreApiController.java +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/StoreApiController.java @@ -29,7 +29,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class StoreApiController implements StoreApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/UserApi.java index 66fab2a5f573..ebf5be7009ed 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/UserApiController.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/UserApiController.java index ca00184d2a56..894bf6db762e 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/UserApiController.java +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/UserApiController.java @@ -30,7 +30,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class UserApiController implements UserApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Category.java index 870578890cac..d48f33e470be 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Category.java @@ -33,8 +33,8 @@ public Category id(Long id) { * Get id * @return id */ - @JsonProperty("id") + @JsonProperty("id") public Long getId() { return id; } @@ -52,8 +52,8 @@ public Category name(String name) { * Get name * @return name */ - @JsonProperty("name") @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/ModelApiResponse.java index 6fb2e932dade..5376fa62cc31 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -37,8 +37,8 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ - @JsonProperty("code") + @JsonProperty("code") public Integer getCode() { return code; } @@ -56,8 +56,8 @@ public ModelApiResponse type(String type) { * Get type * @return type */ - @JsonProperty("type") + @JsonProperty("type") public String getType() { return type; } @@ -75,8 +75,8 @@ public ModelApiResponse message(String message) { * Get message * @return message */ - @JsonProperty("message") + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Order.java index 55aefcfb7441..ad7ddb217362 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Order.java @@ -82,8 +82,8 @@ public Order id(Long id) { * Get id * @return id */ - @JsonProperty("id") + @JsonProperty("id") public Long getId() { return id; } @@ -101,8 +101,8 @@ public Order petId(Long petId) { * Get petId * @return petId */ - @JsonProperty("petId") + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -120,8 +120,8 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ - @JsonProperty("quantity") + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -139,8 +139,8 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ - @JsonProperty("shipDate") @Valid + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -158,8 +158,8 @@ public Order status(StatusEnum status) { * Order Status * @return status */ - @JsonProperty("status") + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -177,8 +177,8 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ - @JsonProperty("complete") + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Pet.java index 0180283859c6..cb9f33371fd1 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Pet.java @@ -85,8 +85,8 @@ public Pet id(Long id) { * Get id * @return id */ - @JsonProperty("id") + @JsonProperty("id") public Long getId() { return id; } @@ -104,8 +104,8 @@ public Pet category(Category category) { * Get category * @return category */ - @JsonProperty("category") @Valid + @JsonProperty("category") public Category getCategory() { return category; } @@ -123,8 +123,8 @@ public Pet name(String name) { * Get name * @return name */ - @JsonProperty("name") @NotNull + @JsonProperty("name") public String getName() { return name; } @@ -147,8 +147,8 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ - @JsonProperty("photoUrls") @NotNull + @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; } @@ -174,8 +174,8 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @JsonProperty("tags") @Valid + @JsonProperty("tags") public List getTags() { return tags; } @@ -193,8 +193,8 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ - @JsonProperty("status") + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Tag.java index 430014eecc26..ae8b17e77928 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Tag.java @@ -33,8 +33,8 @@ public Tag id(Long id) { * Get id * @return id */ - @JsonProperty("id") + @JsonProperty("id") public Long getId() { return id; } @@ -52,8 +52,8 @@ public Tag name(String name) { * Get name * @return name */ - @JsonProperty("name") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/User.java index 6e3daf33b33c..f825d42b636b 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/User.java @@ -45,8 +45,8 @@ public User id(Long id) { * Get id * @return id */ - @JsonProperty("id") + @JsonProperty("id") public Long getId() { return id; } @@ -64,8 +64,8 @@ public User username(String username) { * Get username * @return username */ - @JsonProperty("username") + @JsonProperty("username") public String getUsername() { return username; } @@ -83,8 +83,8 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ - @JsonProperty("firstName") + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -102,8 +102,8 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ - @JsonProperty("lastName") + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -121,8 +121,8 @@ public User email(String email) { * Get email * @return email */ - @JsonProperty("email") + @JsonProperty("email") public String getEmail() { return email; } @@ -140,8 +140,8 @@ public User password(String password) { * Get password * @return password */ - @JsonProperty("password") + @JsonProperty("password") public String getPassword() { return password; } @@ -159,8 +159,8 @@ public User phone(String phone) { * Get phone * @return phone */ - @JsonProperty("phone") + @JsonProperty("phone") public String getPhone() { return phone; } @@ -178,8 +178,8 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ - @JsonProperty("userStatus") + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/FILES b/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/FILES index 3c2e959bec02..32fdc6a9409b 100644 --- a/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/FILES @@ -15,7 +15,6 @@ src/main/java/org/openapitools/api/StoreApi.java src/main/java/org/openapitools/api/StoreApiController.java src/main/java/org/openapitools/api/UserApi.java src/main/java/org/openapitools/api/UserApiController.java -src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/configuration/SpringFoxConfiguration.java src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java diff --git a/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/VERSION b/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/VERSION index d6b4ec4aa783..ed829dbcddec 100644 --- a/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0-SNAPSHOT \ No newline at end of file +6.2.1-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java index b45fcc5dc16c..9ecd403de93c 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApiController.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApiController.java index c2db7ca5a815..65c9de6908c2 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApiController.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApiController.java @@ -28,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class AnotherFakeApiController implements AnotherFakeApi { private final NativeWebRequest request; 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 88b13d87041c..f1ab3d650027 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApiController.java index 5ae5d5fed985..b30f53bb595c 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApiController.java @@ -38,7 +38,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeApiController implements FakeApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index d54c2670f8e2..decd021376d6 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java index 65b695629d43..05196793d4c2 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java @@ -28,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeClassnameTestApiController implements FakeClassnameTestApi { private final NativeWebRequest request; 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 c79ba12a30f2..263f21f2397b 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApiController.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApiController.java index ea6c56e02c11..0b88e5980bf1 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApiController.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApiController.java @@ -30,7 +30,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class PetApiController implements PetApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java index 1afb547b40ee..f4319f650f50 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApiController.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApiController.java index 1292dc0b721d..f8c784ff3838 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApiController.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApiController.java @@ -29,7 +29,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class StoreApiController implements StoreApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java index 981e3a95cbe6..e458b4a0b8bf 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApiController.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApiController.java index ca00184d2a56..894bf6db762e 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApiController.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApiController.java @@ -30,7 +30,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class UserApiController implements UserApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index cb51920a8c28..686fafb2faaf 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -35,9 +35,9 @@ public AdditionalPropertiesAnyType name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 1c66a636116f..a2c3df24a2df 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -36,9 +36,9 @@ public AdditionalPropertiesArray name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 1dcc607639bf..82fcada6f56a 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -35,9 +35,9 @@ public AdditionalPropertiesBoolean name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 74250eb564ad..7b720b30d83a 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -73,9 +73,9 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt * Get mapString * @return mapString */ - @JsonProperty("map_string") @ApiModelProperty(value = "") + @JsonProperty("map_string") public Map getMapString() { return mapString; } @@ -101,9 +101,9 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * Get mapNumber * @return mapNumber */ - @JsonProperty("map_number") @Valid @ApiModelProperty(value = "") + @JsonProperty("map_number") public Map getMapNumber() { return mapNumber; } @@ -129,9 +129,9 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege * Get mapInteger * @return mapInteger */ - @JsonProperty("map_integer") @ApiModelProperty(value = "") + @JsonProperty("map_integer") public Map getMapInteger() { return mapInteger; } @@ -157,9 +157,9 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea * Get mapBoolean * @return mapBoolean */ - @JsonProperty("map_boolean") @ApiModelProperty(value = "") + @JsonProperty("map_boolean") public Map getMapBoolean() { return mapBoolean; } @@ -185,9 +185,9 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { return mapArrayInteger; } @@ -213,9 +213,9 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * Get mapArrayAnytype * @return mapArrayAnytype */ - @JsonProperty("map_array_anytype") @Valid @ApiModelProperty(value = "") + @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { return mapArrayAnytype; } @@ -241,9 +241,9 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { return mapMapString; } @@ -269,9 +269,9 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { return mapMapAnytype; } @@ -289,9 +289,9 @@ public AdditionalPropertiesClass anytype1(Object anytype1) { * Get anytype1 * @return anytype1 */ - @JsonProperty("anytype_1") @ApiModelProperty(value = "") + @JsonProperty("anytype_1") public Object getAnytype1() { return anytype1; } @@ -309,9 +309,9 @@ public AdditionalPropertiesClass anytype2(Object anytype2) { * Get anytype2 * @return anytype2 */ - @JsonProperty("anytype_2") @ApiModelProperty(value = "") + @JsonProperty("anytype_2") public Object getAnytype2() { return anytype2; } @@ -329,9 +329,9 @@ public AdditionalPropertiesClass anytype3(Object anytype3) { * Get anytype3 * @return anytype3 */ - @JsonProperty("anytype_3") @ApiModelProperty(value = "") + @JsonProperty("anytype_3") public Object getAnytype3() { return anytype3; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index ce8b8d62436c..ea2ec5365edc 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -35,9 +35,9 @@ public AdditionalPropertiesInteger name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index dec791e0a273..4ca4b5a2f509 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -36,9 +36,9 @@ public AdditionalPropertiesNumber name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 546d0ab9216f..7b9d8ef0b0b2 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -35,9 +35,9 @@ public AdditionalPropertiesObject name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index c1f95cf62e81..fdc4baa9de7b 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -35,9 +35,9 @@ public AdditionalPropertiesString name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java index e880f829164c..dfb303255b3b 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java @@ -52,9 +52,9 @@ public Animal className(String className) { * Get className * @return className */ - @JsonProperty("className") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("className") public String getClassName() { return className; } @@ -72,9 +72,9 @@ public Animal color(String color) { * Get color * @return color */ - @JsonProperty("color") @ApiModelProperty(value = "") + @JsonProperty("color") public String getColor() { return color; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 46ab3b631960..42b8443e9be2 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -45,9 +45,9 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * Get arrayArrayNumber * @return arrayArrayNumber */ - @JsonProperty("ArrayArrayNumber") @Valid @ApiModelProperty(value = "") + @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index cb5358905469..f60290a4d8ad 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -45,9 +45,9 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ - @JsonProperty("ArrayNumber") @Valid @ApiModelProperty(value = "") + @JsonProperty("ArrayNumber") public List getArrayNumber() { return arrayNumber; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java index 55cc431ecde6..8bb3f76ca666 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java @@ -51,9 +51,9 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) { * Get arrayOfString * @return arrayOfString */ - @JsonProperty("array_of_string") @ApiModelProperty(value = "") + @JsonProperty("array_of_string") public List getArrayOfString() { return arrayOfString; } @@ -79,9 +79,9 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ - @JsonProperty("array_array_of_integer") @Valid @ApiModelProperty(value = "") + @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; } @@ -107,9 +107,9 @@ public ArrayTest addArrayArrayOfModelItem(List arrayArrayOfModelI * Get arrayArrayOfModel * @return arrayArrayOfModel */ - @JsonProperty("array_array_of_model") @Valid @ApiModelProperty(value = "") + @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java index 70bbb0b93532..16372fb10406 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java @@ -78,9 +78,9 @@ public BigCat kind(KindEnum kind) { * Get kind * @return kind */ - @JsonProperty("kind") @ApiModelProperty(value = "") + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCatAllOf.java index 1a86665050e6..59ab1d8d2bf8 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCatAllOf.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCatAllOf.java @@ -75,9 +75,9 @@ public BigCatAllOf kind(KindEnum kind) { * Get kind * @return kind */ - @JsonProperty("kind") @ApiModelProperty(value = "") + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Capitalization.java index e0fdbe78bae2..feb0d643c5e5 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Capitalization.java @@ -43,9 +43,9 @@ public Capitalization smallCamel(String smallCamel) { * Get smallCamel * @return smallCamel */ - @JsonProperty("smallCamel") @ApiModelProperty(value = "") + @JsonProperty("smallCamel") public String getSmallCamel() { return smallCamel; } @@ -63,9 +63,9 @@ public Capitalization capitalCamel(String capitalCamel) { * Get capitalCamel * @return capitalCamel */ - @JsonProperty("CapitalCamel") @ApiModelProperty(value = "") + @JsonProperty("CapitalCamel") public String getCapitalCamel() { return capitalCamel; } @@ -83,9 +83,9 @@ public Capitalization smallSnake(String smallSnake) { * Get smallSnake * @return smallSnake */ - @JsonProperty("small_Snake") @ApiModelProperty(value = "") + @JsonProperty("small_Snake") public String getSmallSnake() { return smallSnake; } @@ -103,9 +103,9 @@ public Capitalization capitalSnake(String capitalSnake) { * Get capitalSnake * @return capitalSnake */ - @JsonProperty("Capital_Snake") @ApiModelProperty(value = "") + @JsonProperty("Capital_Snake") public String getCapitalSnake() { return capitalSnake; } @@ -123,9 +123,9 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) { * Get scAETHFlowPoints * @return scAETHFlowPoints */ - @JsonProperty("SCA_ETH_Flow_Points") @ApiModelProperty(value = "") + @JsonProperty("SCA_ETH_Flow_Points") public String getScAETHFlowPoints() { return scAETHFlowPoints; } @@ -143,9 +143,9 @@ public Capitalization ATT_NAME(String ATT_NAME) { * Name of the pet * @return ATT_NAME */ - @JsonProperty("ATT_NAME") @ApiModelProperty(value = "Name of the pet ") + @JsonProperty("ATT_NAME") public String getATTNAME() { return ATT_NAME; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java index 958fcb2298e0..04fd58e2e14a 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java @@ -47,9 +47,9 @@ public Cat declawed(Boolean declawed) { * Get declawed * @return declawed */ - @JsonProperty("declawed") @ApiModelProperty(value = "") + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/CatAllOf.java index 63de2ad8818e..85c6885ae000 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/CatAllOf.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/CatAllOf.java @@ -35,9 +35,9 @@ public CatAllOf declawed(Boolean declawed) { * Get declawed * @return declawed */ - @JsonProperty("declawed") @ApiModelProperty(value = "") + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Category.java index b63268b2c8ce..3b813dcea538 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Category.java @@ -35,9 +35,9 @@ public Category id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -55,9 +55,9 @@ public Category name(String name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ClassModel.java index 976f0b01d071..2c511abe3ecb 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ClassModel.java @@ -34,9 +34,9 @@ public ClassModel propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ - @JsonProperty("_class") @ApiModelProperty(value = "") + @JsonProperty("_class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Client.java index a3c4731f3339..a6bfdf58db7f 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Client.java @@ -33,9 +33,9 @@ public Client client(String client) { * Get client * @return client */ - @JsonProperty("client") @ApiModelProperty(value = "") + @JsonProperty("client") public String getClient() { return client; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Dog.java index 593562fabb42..a75ee6095e33 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Dog.java @@ -38,9 +38,9 @@ public Dog breed(String breed) { * Get breed * @return breed */ - @JsonProperty("breed") @ApiModelProperty(value = "") + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/DogAllOf.java index 7ddb24717737..5784d207b4d2 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/DogAllOf.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/DogAllOf.java @@ -35,9 +35,9 @@ public DogAllOf breed(String breed) { * Get breed * @return breed */ - @JsonProperty("breed") @ApiModelProperty(value = "") + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java index 04e850b1cf17..43a28057b120 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java @@ -109,9 +109,9 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) { * Get justSymbol * @return justSymbol */ - @JsonProperty("just_symbol") @ApiModelProperty(value = "") + @JsonProperty("just_symbol") public JustSymbolEnum getJustSymbol() { return justSymbol; } @@ -137,9 +137,9 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) { * Get arrayEnum * @return arrayEnum */ - @JsonProperty("array_enum") @ApiModelProperty(value = "") + @JsonProperty("array_enum") public List getArrayEnum() { return arrayEnum; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java index 49747f67dccf..3f7af66d4ce7 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java @@ -189,9 +189,9 @@ public EnumTest enumString(EnumStringEnum enumString) { * Get enumString * @return enumString */ - @JsonProperty("enum_string") @ApiModelProperty(value = "") + @JsonProperty("enum_string") public EnumStringEnum getEnumString() { return enumString; } @@ -209,9 +209,9 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) { * Get enumStringRequired * @return enumStringRequired */ - @JsonProperty("enum_string_required") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("enum_string_required") public EnumStringRequiredEnum getEnumStringRequired() { return enumStringRequired; } @@ -229,9 +229,9 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) { * Get enumInteger * @return enumInteger */ - @JsonProperty("enum_integer") @ApiModelProperty(value = "") + @JsonProperty("enum_integer") public EnumIntegerEnum getEnumInteger() { return enumInteger; } @@ -249,9 +249,9 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) { * Get enumNumber * @return enumNumber */ - @JsonProperty("enum_number") @ApiModelProperty(value = "") + @JsonProperty("enum_number") public EnumNumberEnum getEnumNumber() { return enumNumber; } @@ -269,9 +269,9 @@ public EnumTest outerEnum(OuterEnum outerEnum) { * Get outerEnum * @return outerEnum */ - @JsonProperty("outerEnum") @Valid @ApiModelProperty(value = "") + @JsonProperty("outerEnum") public OuterEnum getOuterEnum() { return outerEnum; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/File.java index 43c44fd344bb..fedeea1c6389 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/File.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/File.java @@ -34,9 +34,9 @@ public File sourceURI(String sourceURI) { * Test capitalization * @return sourceURI */ - @JsonProperty("sourceURI") @ApiModelProperty(value = "Test capitalization") + @JsonProperty("sourceURI") public String getSourceURI() { return sourceURI; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java index d7815943b774..81fc87926e00 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -39,9 +39,9 @@ public FileSchemaTestClass file(File file) { * Get file * @return file */ - @JsonProperty("file") @Valid @ApiModelProperty(value = "") + @JsonProperty("file") public File getFile() { return file; } @@ -67,9 +67,9 @@ public FileSchemaTestClass addFilesItem(File filesItem) { * Get files * @return files */ - @JsonProperty("files") @Valid @ApiModelProperty(value = "") + @JsonProperty("files") public List getFiles() { return files; } 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 ffd18f0ce221..e8697b47182b 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 @@ -71,9 +71,9 @@ public FormatTest integer(Integer integer) { * maximum: 100 * @return integer */ - @JsonProperty("integer") @Min(10) @Max(100) @ApiModelProperty(value = "") + @JsonProperty("integer") public Integer getInteger() { return integer; } @@ -93,9 +93,9 @@ public FormatTest int32(Integer int32) { * maximum: 200 * @return int32 */ - @JsonProperty("int32") @Min(20) @Max(200) @ApiModelProperty(value = "") + @JsonProperty("int32") public Integer getInt32() { return int32; } @@ -113,9 +113,9 @@ public FormatTest int64(Long int64) { * Get int64 * @return int64 */ - @JsonProperty("int64") @ApiModelProperty(value = "") + @JsonProperty("int64") public Long getInt64() { return int64; } @@ -135,9 +135,9 @@ public FormatTest number(BigDecimal number) { * maximum: 543.2 * @return number */ - @JsonProperty("number") @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") @ApiModelProperty(required = true, value = "") + @JsonProperty("number") public BigDecimal getNumber() { return number; } @@ -157,9 +157,9 @@ public FormatTest _float(Float _float) { * maximum: 987.6 * @return _float */ - @JsonProperty("float") @DecimalMin("54.3") @DecimalMax("987.6") @ApiModelProperty(value = "") + @JsonProperty("float") public Float getFloat() { return _float; } @@ -179,9 +179,9 @@ public FormatTest _double(Double _double) { * maximum: 123.4 * @return _double */ - @JsonProperty("double") @DecimalMin("67.8") @DecimalMax("123.4") @ApiModelProperty(value = "") + @JsonProperty("double") public Double getDouble() { return _double; } @@ -199,9 +199,9 @@ public FormatTest string(String string) { * Get string * @return string */ - @JsonProperty("string") @Pattern(regexp = "/[a-z]/i") @ApiModelProperty(value = "") + @JsonProperty("string") public String getString() { return string; } @@ -219,9 +219,9 @@ public FormatTest _byte(byte[] _byte) { * Get _byte * @return _byte */ - @JsonProperty("byte") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("byte") public byte[] getByte() { return _byte; } @@ -239,9 +239,9 @@ public FormatTest binary(org.springframework.core.io.Resource binary) { * Get binary * @return binary */ - @JsonProperty("binary") @Valid @ApiModelProperty(value = "") + @JsonProperty("binary") public org.springframework.core.io.Resource getBinary() { return binary; } @@ -259,9 +259,9 @@ public FormatTest date(LocalDate date) { * Get date * @return date */ - @JsonProperty("date") @NotNull @Valid @ApiModelProperty(required = true, value = "") + @JsonProperty("date") public LocalDate getDate() { return date; } @@ -279,9 +279,9 @@ public FormatTest dateTime(OffsetDateTime dateTime) { * Get dateTime * @return dateTime */ - @JsonProperty("dateTime") @Valid @ApiModelProperty(value = "") + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -299,9 +299,9 @@ public FormatTest uuid(UUID uuid) { * Get uuid * @return uuid */ - @JsonProperty("uuid") @Valid @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -319,9 +319,9 @@ public FormatTest password(String password) { * Get password * @return password */ - @JsonProperty("password") @NotNull @Size(min = 10, max = 64) @ApiModelProperty(required = true, value = "") + @JsonProperty("password") public String getPassword() { return password; } @@ -339,9 +339,9 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) { * Get bigDecimal * @return bigDecimal */ - @JsonProperty("BigDecimal") @Valid @ApiModelProperty(value = "") + @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { return bigDecimal; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index 948ed9a0731d..21a424459798 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -37,9 +37,9 @@ public HasOnlyReadOnly bar(String bar) { * Get bar * @return bar */ - @JsonProperty("bar") @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("bar") public String getBar() { return bar; } @@ -57,9 +57,9 @@ public HasOnlyReadOnly foo(String foo) { * Get foo * @return foo */ - @JsonProperty("foo") @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("foo") public String getFoo() { return foo; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java index 94d4ae9a9d56..76c6bee7adcb 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java @@ -89,9 +89,9 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapMapOfString * @return mapMapOfString */ - @JsonProperty("map_map_of_string") @Valid @ApiModelProperty(value = "") + @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { return mapMapOfString; } @@ -117,9 +117,9 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) * Get mapOfEnumString * @return mapOfEnumString */ - @JsonProperty("map_of_enum_string") @ApiModelProperty(value = "") + @JsonProperty("map_of_enum_string") public Map getMapOfEnumString() { return mapOfEnumString; } @@ -145,9 +145,9 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) { * Get directMap * @return directMap */ - @JsonProperty("direct_map") @ApiModelProperty(value = "") + @JsonProperty("direct_map") public Map getDirectMap() { return directMap; } @@ -173,9 +173,9 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) { * Get indirectMap * @return indirectMap */ - @JsonProperty("indirect_map") @ApiModelProperty(value = "") + @JsonProperty("indirect_map") public Map getIndirectMap() { return indirectMap; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 89a2475d82fb..f9e2230eba97 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -45,9 +45,9 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { * Get uuid * @return uuid */ - @JsonProperty("uuid") @Valid @ApiModelProperty(value = "") + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -65,9 +65,9 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT * Get dateTime * @return dateTime */ - @JsonProperty("dateTime") @Valid @ApiModelProperty(value = "") + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -93,9 +93,9 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * Get map * @return map */ - @JsonProperty("map") @Valid @ApiModelProperty(value = "") + @JsonProperty("map") public Map getMap() { return map; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Model200Response.java index 220b6493f31a..193231f85457 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Model200Response.java @@ -38,9 +38,9 @@ public Model200Response name(Integer name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public Integer getName() { return name; } @@ -58,9 +58,9 @@ public Model200Response propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ - @JsonProperty("class") @ApiModelProperty(value = "") + @JsonProperty("class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelApiResponse.java index 29f3f43cf20e..693e1669879c 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -39,9 +39,9 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ - @JsonProperty("code") @ApiModelProperty(value = "") + @JsonProperty("code") public Integer getCode() { return code; } @@ -59,9 +59,9 @@ public ModelApiResponse type(String type) { * Get type * @return type */ - @JsonProperty("type") @ApiModelProperty(value = "") + @JsonProperty("type") public String getType() { return type; } @@ -79,9 +79,9 @@ public ModelApiResponse message(String message) { * Get message * @return message */ - @JsonProperty("message") @ApiModelProperty(value = "") + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelList.java index a374fe83d52a..7853f3d408a0 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelList.java @@ -35,9 +35,9 @@ public ModelList _123list(String _123list) { * Get _123list * @return _123list */ - @JsonProperty("123-list") @ApiModelProperty(value = "") + @JsonProperty("123-list") public String get123list() { return _123list; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelReturn.java index d8fc618d9dfb..b6f106cea222 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelReturn.java @@ -36,9 +36,9 @@ public ModelReturn _return(Integer _return) { * Get _return * @return _return */ - @JsonProperty("return") @ApiModelProperty(value = "") + @JsonProperty("return") public Integer getReturn() { return _return; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Name.java index 054901b488d6..32403fe65891 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Name.java @@ -40,9 +40,9 @@ public Name name(Integer name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("name") public Integer getName() { return name; } @@ -60,9 +60,9 @@ public Name snakeCase(Integer snakeCase) { * Get snakeCase * @return snakeCase */ - @JsonProperty("snake_case") @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("snake_case") public Integer getSnakeCase() { return snakeCase; } @@ -80,9 +80,9 @@ public Name property(String property) { * Get property * @return property */ - @JsonProperty("property") @ApiModelProperty(value = "") + @JsonProperty("property") public String getProperty() { return property; } @@ -100,9 +100,9 @@ public Name _123number(Integer _123number) { * Get _123number * @return _123number */ - @JsonProperty("123Number") @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("123Number") public Integer get123number() { return _123number; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NumberOnly.java index 8f2f2b19b191..1e3f9e15421d 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NumberOnly.java @@ -34,9 +34,9 @@ public NumberOnly justNumber(BigDecimal justNumber) { * Get justNumber * @return justNumber */ - @JsonProperty("JustNumber") @Valid @ApiModelProperty(value = "") + @JsonProperty("JustNumber") public BigDecimal getJustNumber() { return justNumber; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Order.java index feac4d2cad8d..b24c70c07808 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Order.java @@ -84,9 +84,9 @@ public Order id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -104,9 +104,9 @@ public Order petId(Long petId) { * Get petId * @return petId */ - @JsonProperty("petId") @ApiModelProperty(value = "") + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -124,9 +124,9 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ - @JsonProperty("quantity") @ApiModelProperty(value = "") + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -144,9 +144,9 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ - @JsonProperty("shipDate") @Valid @ApiModelProperty(value = "") + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -164,9 +164,9 @@ public Order status(StatusEnum status) { * Order Status * @return status */ - @JsonProperty("status") @ApiModelProperty(value = "Order Status") + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -184,9 +184,9 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ - @JsonProperty("complete") @ApiModelProperty(value = "") + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/OuterComposite.java index 00cce99097d7..ade2b9150190 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/OuterComposite.java @@ -38,9 +38,9 @@ public OuterComposite myNumber(BigDecimal myNumber) { * Get myNumber * @return myNumber */ - @JsonProperty("my_number") @Valid @ApiModelProperty(value = "") + @JsonProperty("my_number") public BigDecimal getMyNumber() { return myNumber; } @@ -58,9 +58,9 @@ public OuterComposite myString(String myString) { * Get myString * @return myString */ - @JsonProperty("my_string") @ApiModelProperty(value = "") + @JsonProperty("my_string") public String getMyString() { return myString; } @@ -78,9 +78,9 @@ public OuterComposite myBoolean(Boolean myBoolean) { * Get myBoolean * @return myBoolean */ - @JsonProperty("my_boolean") @ApiModelProperty(value = "") + @JsonProperty("my_boolean") public Boolean getMyBoolean() { return myBoolean; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java index e39c22373324..b9358e2b1e87 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java @@ -90,9 +90,9 @@ public Pet id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -110,9 +110,9 @@ public Pet category(Category category) { * Get category * @return category */ - @JsonProperty("category") @Valid @ApiModelProperty(value = "") + @JsonProperty("category") public Category getCategory() { return category; } @@ -130,9 +130,9 @@ public Pet name(String name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") + @JsonProperty("name") public String getName() { return name; } @@ -155,9 +155,9 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ - @JsonProperty("photoUrls") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("photoUrls") public Set getPhotoUrls() { return photoUrls; } @@ -184,9 +184,9 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @JsonProperty("tags") @Valid @ApiModelProperty(value = "") + @JsonProperty("tags") public List getTags() { return tags; } @@ -204,9 +204,9 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ - @JsonProperty("status") @ApiModelProperty(value = "pet status in the store") + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java index d02b8c8cfd53..3eb0ebe069c1 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -35,9 +35,9 @@ public ReadOnlyFirst bar(String bar) { * Get bar * @return bar */ - @JsonProperty("bar") @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("bar") public String getBar() { return bar; } @@ -55,9 +55,9 @@ public ReadOnlyFirst baz(String baz) { * Get baz * @return baz */ - @JsonProperty("baz") @ApiModelProperty(value = "") + @JsonProperty("baz") public String getBaz() { return baz; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java index 8f176362e027..668035becd14 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java @@ -35,9 +35,9 @@ public class SpecialModelName { * Get $specialPropertyName * @return $specialPropertyName */ - @JsonProperty("$special[property.name]") @ApiModelProperty(value = "") + @JsonProperty("$special[property.name]") public Long get$SpecialPropertyName() { return $specialPropertyName; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Tag.java index f7797bef2f19..527e777278e2 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Tag.java @@ -35,9 +35,9 @@ public Tag id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -55,9 +55,9 @@ public Tag name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java index 506efbf431c1..41ba1c5bf1f3 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -45,9 +45,9 @@ public TypeHolderDefault stringItem(String stringItem) { * Get stringItem * @return stringItem */ - @JsonProperty("string_item") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -65,9 +65,9 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ - @JsonProperty("number_item") @NotNull @Valid @ApiModelProperty(required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -85,9 +85,9 @@ public TypeHolderDefault integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ - @JsonProperty("integer_item") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -105,9 +105,9 @@ public TypeHolderDefault boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ - @JsonProperty("bool_item") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -130,9 +130,9 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ - @JsonProperty("array_item") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java index 806c0c90fa18..8e1a76f88fdc 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -47,9 +47,9 @@ public TypeHolderExample stringItem(String stringItem) { * Get stringItem * @return stringItem */ - @JsonProperty("string_item") @NotNull @ApiModelProperty(example = "what", required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -67,9 +67,9 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ - @JsonProperty("number_item") @NotNull @Valid @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -87,9 +87,9 @@ public TypeHolderExample floatItem(Float floatItem) { * Get floatItem * @return floatItem */ - @JsonProperty("float_item") @NotNull @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("float_item") public Float getFloatItem() { return floatItem; } @@ -107,9 +107,9 @@ public TypeHolderExample integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ - @JsonProperty("integer_item") @NotNull @ApiModelProperty(example = "-2", required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -127,9 +127,9 @@ public TypeHolderExample boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ - @JsonProperty("bool_item") @NotNull @ApiModelProperty(example = "true", required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -152,9 +152,9 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ - @JsonProperty("array_item") @NotNull @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/User.java index f42832389ffe..36d29ba307d0 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/User.java @@ -47,9 +47,9 @@ public User id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -67,9 +67,9 @@ public User username(String username) { * Get username * @return username */ - @JsonProperty("username") @ApiModelProperty(value = "") + @JsonProperty("username") public String getUsername() { return username; } @@ -87,9 +87,9 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ - @JsonProperty("firstName") @ApiModelProperty(value = "") + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -107,9 +107,9 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ - @JsonProperty("lastName") @ApiModelProperty(value = "") + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -127,9 +127,9 @@ public User email(String email) { * Get email * @return email */ - @JsonProperty("email") @ApiModelProperty(value = "") + @JsonProperty("email") public String getEmail() { return email; } @@ -147,9 +147,9 @@ public User password(String password) { * Get password * @return password */ - @JsonProperty("password") @ApiModelProperty(value = "") + @JsonProperty("password") public String getPassword() { return password; } @@ -167,9 +167,9 @@ public User phone(String phone) { * Get phone * @return phone */ - @JsonProperty("phone") @ApiModelProperty(value = "") + @JsonProperty("phone") public String getPhone() { return phone; } @@ -187,9 +187,9 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ - @JsonProperty("userStatus") @ApiModelProperty(value = "User Status") + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java index c795b4b85e6d..3a8d108bdbce 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java @@ -101,9 +101,9 @@ public XmlItem attributeString(String attributeString) { * Get attributeString * @return attributeString */ - @JsonProperty("attribute_string") @ApiModelProperty(example = "string", value = "") + @JsonProperty("attribute_string") public String getAttributeString() { return attributeString; } @@ -121,9 +121,9 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) { * Get attributeNumber * @return attributeNumber */ - @JsonProperty("attribute_number") @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("attribute_number") public BigDecimal getAttributeNumber() { return attributeNumber; } @@ -141,9 +141,9 @@ public XmlItem attributeInteger(Integer attributeInteger) { * Get attributeInteger * @return attributeInteger */ - @JsonProperty("attribute_integer") @ApiModelProperty(example = "-2", value = "") + @JsonProperty("attribute_integer") public Integer getAttributeInteger() { return attributeInteger; } @@ -161,9 +161,9 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) { * Get attributeBoolean * @return attributeBoolean */ - @JsonProperty("attribute_boolean") @ApiModelProperty(example = "true", value = "") + @JsonProperty("attribute_boolean") public Boolean getAttributeBoolean() { return attributeBoolean; } @@ -189,9 +189,9 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) { * Get wrappedArray * @return wrappedArray */ - @JsonProperty("wrapped_array") @ApiModelProperty(value = "") + @JsonProperty("wrapped_array") public List getWrappedArray() { return wrappedArray; } @@ -209,9 +209,9 @@ public XmlItem nameString(String nameString) { * Get nameString * @return nameString */ - @JsonProperty("name_string") @ApiModelProperty(example = "string", value = "") + @JsonProperty("name_string") public String getNameString() { return nameString; } @@ -229,9 +229,9 @@ public XmlItem nameNumber(BigDecimal nameNumber) { * Get nameNumber * @return nameNumber */ - @JsonProperty("name_number") @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("name_number") public BigDecimal getNameNumber() { return nameNumber; } @@ -249,9 +249,9 @@ public XmlItem nameInteger(Integer nameInteger) { * Get nameInteger * @return nameInteger */ - @JsonProperty("name_integer") @ApiModelProperty(example = "-2", value = "") + @JsonProperty("name_integer") public Integer getNameInteger() { return nameInteger; } @@ -269,9 +269,9 @@ public XmlItem nameBoolean(Boolean nameBoolean) { * Get nameBoolean * @return nameBoolean */ - @JsonProperty("name_boolean") @ApiModelProperty(example = "true", value = "") + @JsonProperty("name_boolean") public Boolean getNameBoolean() { return nameBoolean; } @@ -297,9 +297,9 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) { * Get nameArray * @return nameArray */ - @JsonProperty("name_array") @ApiModelProperty(value = "") + @JsonProperty("name_array") public List getNameArray() { return nameArray; } @@ -325,9 +325,9 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) { * Get nameWrappedArray * @return nameWrappedArray */ - @JsonProperty("name_wrapped_array") @ApiModelProperty(value = "") + @JsonProperty("name_wrapped_array") public List getNameWrappedArray() { return nameWrappedArray; } @@ -345,9 +345,9 @@ public XmlItem prefixString(String prefixString) { * Get prefixString * @return prefixString */ - @JsonProperty("prefix_string") @ApiModelProperty(example = "string", value = "") + @JsonProperty("prefix_string") public String getPrefixString() { return prefixString; } @@ -365,9 +365,9 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) { * Get prefixNumber * @return prefixNumber */ - @JsonProperty("prefix_number") @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("prefix_number") public BigDecimal getPrefixNumber() { return prefixNumber; } @@ -385,9 +385,9 @@ public XmlItem prefixInteger(Integer prefixInteger) { * Get prefixInteger * @return prefixInteger */ - @JsonProperty("prefix_integer") @ApiModelProperty(example = "-2", value = "") + @JsonProperty("prefix_integer") public Integer getPrefixInteger() { return prefixInteger; } @@ -405,9 +405,9 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) { * Get prefixBoolean * @return prefixBoolean */ - @JsonProperty("prefix_boolean") @ApiModelProperty(example = "true", value = "") + @JsonProperty("prefix_boolean") public Boolean getPrefixBoolean() { return prefixBoolean; } @@ -433,9 +433,9 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) { * Get prefixArray * @return prefixArray */ - @JsonProperty("prefix_array") @ApiModelProperty(value = "") + @JsonProperty("prefix_array") public List getPrefixArray() { return prefixArray; } @@ -461,9 +461,9 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) { * Get prefixWrappedArray * @return prefixWrappedArray */ - @JsonProperty("prefix_wrapped_array") @ApiModelProperty(value = "") + @JsonProperty("prefix_wrapped_array") public List getPrefixWrappedArray() { return prefixWrappedArray; } @@ -481,9 +481,9 @@ public XmlItem namespaceString(String namespaceString) { * Get namespaceString * @return namespaceString */ - @JsonProperty("namespace_string") @ApiModelProperty(example = "string", value = "") + @JsonProperty("namespace_string") public String getNamespaceString() { return namespaceString; } @@ -501,9 +501,9 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) { * Get namespaceNumber * @return namespaceNumber */ - @JsonProperty("namespace_number") @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("namespace_number") public BigDecimal getNamespaceNumber() { return namespaceNumber; } @@ -521,9 +521,9 @@ public XmlItem namespaceInteger(Integer namespaceInteger) { * Get namespaceInteger * @return namespaceInteger */ - @JsonProperty("namespace_integer") @ApiModelProperty(example = "-2", value = "") + @JsonProperty("namespace_integer") public Integer getNamespaceInteger() { return namespaceInteger; } @@ -541,9 +541,9 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) { * Get namespaceBoolean * @return namespaceBoolean */ - @JsonProperty("namespace_boolean") @ApiModelProperty(example = "true", value = "") + @JsonProperty("namespace_boolean") public Boolean getNamespaceBoolean() { return namespaceBoolean; } @@ -569,9 +569,9 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) { * Get namespaceArray * @return namespaceArray */ - @JsonProperty("namespace_array") @ApiModelProperty(value = "") + @JsonProperty("namespace_array") public List getNamespaceArray() { return namespaceArray; } @@ -597,9 +597,9 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) { * Get namespaceWrappedArray * @return namespaceWrappedArray */ - @JsonProperty("namespace_wrapped_array") @ApiModelProperty(value = "") + @JsonProperty("namespace_wrapped_array") public List getNamespaceWrappedArray() { return namespaceWrappedArray; } @@ -617,9 +617,9 @@ public XmlItem prefixNsString(String prefixNsString) { * Get prefixNsString * @return prefixNsString */ - @JsonProperty("prefix_ns_string") @ApiModelProperty(example = "string", value = "") + @JsonProperty("prefix_ns_string") public String getPrefixNsString() { return prefixNsString; } @@ -637,9 +637,9 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) { * Get prefixNsNumber * @return prefixNsNumber */ - @JsonProperty("prefix_ns_number") @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("prefix_ns_number") public BigDecimal getPrefixNsNumber() { return prefixNsNumber; } @@ -657,9 +657,9 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) { * Get prefixNsInteger * @return prefixNsInteger */ - @JsonProperty("prefix_ns_integer") @ApiModelProperty(example = "-2", value = "") + @JsonProperty("prefix_ns_integer") public Integer getPrefixNsInteger() { return prefixNsInteger; } @@ -677,9 +677,9 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) { * Get prefixNsBoolean * @return prefixNsBoolean */ - @JsonProperty("prefix_ns_boolean") @ApiModelProperty(example = "true", value = "") + @JsonProperty("prefix_ns_boolean") public Boolean getPrefixNsBoolean() { return prefixNsBoolean; } @@ -705,9 +705,9 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) { * Get prefixNsArray * @return prefixNsArray */ - @JsonProperty("prefix_ns_array") @ApiModelProperty(value = "") + @JsonProperty("prefix_ns_array") public List getPrefixNsArray() { return prefixNsArray; } @@ -733,9 +733,9 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) { * Get prefixNsWrappedArray * @return prefixNsWrappedArray */ - @JsonProperty("prefix_ns_wrapped_array") @ApiModelProperty(value = "") + @JsonProperty("prefix_ns_wrapped_array") public List getPrefixNsWrappedArray() { return prefixNsWrappedArray; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml index 2999e6f2f8d6..5fdcfc33eada 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml @@ -2111,7 +2111,6 @@ components: status: description: Updated status of the pet type: string - type: object uploadFile_request: properties: additionalMetadata: @@ -2121,7 +2120,6 @@ components: description: file to upload format: binary type: string - type: object testEnumParameters_request: properties: enum_form_string_array: @@ -2141,7 +2139,6 @@ components: - -efg - (xyz) type: string - type: object testEndpointParameters_request: properties: integer: @@ -2214,7 +2211,6 @@ components: - double - number - pattern_without_delimiter - type: object testJsonFormData_request: properties: param: @@ -2226,7 +2222,6 @@ components: required: - param - param2 - type: object uploadFileWithRequiredFile_request: properties: additionalMetadata: @@ -2238,7 +2233,6 @@ components: type: string required: - requiredFile - type: object Dog_allOf: properties: breed: diff --git a/samples/server/petstore/springboot-reactive/.openapi-generator/FILES b/samples/server/petstore/springboot-reactive/.openapi-generator/FILES index bf09bb15ac79..b552438ed416 100644 --- a/samples/server/petstore/springboot-reactive/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-reactive/.openapi-generator/FILES @@ -21,7 +21,6 @@ src/main/java/org/openapitools/api/StoreApiDelegate.java src/main/java/org/openapitools/api/UserApi.java src/main/java/org/openapitools/api/UserApiController.java src/main/java/org/openapitools/api/UserApiDelegate.java -src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java src/main/java/org/openapitools/model/AdditionalPropertiesArray.java diff --git a/samples/server/petstore/springboot-reactive/.openapi-generator/VERSION b/samples/server/petstore/springboot-reactive/.openapi-generator/VERSION index d6b4ec4aa783..ed829dbcddec 100644 --- a/samples/server/petstore/springboot-reactive/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-reactive/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0-SNAPSHOT \ No newline at end of file +6.2.1-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java index 9aa14c56592d..ff1872149c2d 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApiController.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApiController.java index c9afaab792d8..ac91b64909a1 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApiController.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApiController.java @@ -28,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class AnotherFakeApiController implements AnotherFakeApi { private final AnotherFakeApiDelegate delegate; 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 f598c332026d..eccbe54fab5e 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiController.java index db9b0dff167e..113e86683929 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiController.java @@ -38,7 +38,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeApiController implements FakeApi { private final FakeApiDelegate delegate; diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 789b88876a4d..dcf310bf3016 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java index f98a29c1d782..99cb9416db60 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java @@ -28,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeClassnameTestApiController implements FakeClassnameTestApi { private final FakeClassnameTestApiDelegate delegate; 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 2286bc126ea8..384f6e6693ce 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiController.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiController.java index 4b6a806bf6df..df2e9ebac57a 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiController.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiController.java @@ -30,7 +30,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class PetApiController implements PetApi { private final PetApiDelegate delegate; diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java index 826fe6283a3c..26af3b8d214c 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiController.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiController.java index 72b8085628cf..0f1102844b4e 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiController.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiController.java @@ -29,7 +29,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class StoreApiController implements StoreApi { private final StoreApiDelegate delegate; diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java index 2e7af65dc8b2..83c0cecd4439 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApiController.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApiController.java index 6d3effb9ec3b..840baa171120 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApiController.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApiController.java @@ -30,7 +30,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class UserApiController implements UserApi { private final UserApiDelegate delegate; diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index cb51920a8c28..686fafb2faaf 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -35,9 +35,9 @@ public AdditionalPropertiesAnyType name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 1c66a636116f..a2c3df24a2df 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -36,9 +36,9 @@ public AdditionalPropertiesArray name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 1dcc607639bf..82fcada6f56a 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -35,9 +35,9 @@ public AdditionalPropertiesBoolean name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 74250eb564ad..7b720b30d83a 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -73,9 +73,9 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt * Get mapString * @return mapString */ - @JsonProperty("map_string") @ApiModelProperty(value = "") + @JsonProperty("map_string") public Map getMapString() { return mapString; } @@ -101,9 +101,9 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * Get mapNumber * @return mapNumber */ - @JsonProperty("map_number") @Valid @ApiModelProperty(value = "") + @JsonProperty("map_number") public Map getMapNumber() { return mapNumber; } @@ -129,9 +129,9 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege * Get mapInteger * @return mapInteger */ - @JsonProperty("map_integer") @ApiModelProperty(value = "") + @JsonProperty("map_integer") public Map getMapInteger() { return mapInteger; } @@ -157,9 +157,9 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea * Get mapBoolean * @return mapBoolean */ - @JsonProperty("map_boolean") @ApiModelProperty(value = "") + @JsonProperty("map_boolean") public Map getMapBoolean() { return mapBoolean; } @@ -185,9 +185,9 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { return mapArrayInteger; } @@ -213,9 +213,9 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * Get mapArrayAnytype * @return mapArrayAnytype */ - @JsonProperty("map_array_anytype") @Valid @ApiModelProperty(value = "") + @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { return mapArrayAnytype; } @@ -241,9 +241,9 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { return mapMapString; } @@ -269,9 +269,9 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { return mapMapAnytype; } @@ -289,9 +289,9 @@ public AdditionalPropertiesClass anytype1(Object anytype1) { * Get anytype1 * @return anytype1 */ - @JsonProperty("anytype_1") @ApiModelProperty(value = "") + @JsonProperty("anytype_1") public Object getAnytype1() { return anytype1; } @@ -309,9 +309,9 @@ public AdditionalPropertiesClass anytype2(Object anytype2) { * Get anytype2 * @return anytype2 */ - @JsonProperty("anytype_2") @ApiModelProperty(value = "") + @JsonProperty("anytype_2") public Object getAnytype2() { return anytype2; } @@ -329,9 +329,9 @@ public AdditionalPropertiesClass anytype3(Object anytype3) { * Get anytype3 * @return anytype3 */ - @JsonProperty("anytype_3") @ApiModelProperty(value = "") + @JsonProperty("anytype_3") public Object getAnytype3() { return anytype3; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index ce8b8d62436c..ea2ec5365edc 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -35,9 +35,9 @@ public AdditionalPropertiesInteger name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index dec791e0a273..4ca4b5a2f509 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -36,9 +36,9 @@ public AdditionalPropertiesNumber name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 546d0ab9216f..7b9d8ef0b0b2 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -35,9 +35,9 @@ public AdditionalPropertiesObject name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index c1f95cf62e81..fdc4baa9de7b 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -35,9 +35,9 @@ public AdditionalPropertiesString name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Animal.java index e880f829164c..dfb303255b3b 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Animal.java @@ -52,9 +52,9 @@ public Animal className(String className) { * Get className * @return className */ - @JsonProperty("className") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("className") public String getClassName() { return className; } @@ -72,9 +72,9 @@ public Animal color(String color) { * Get color * @return color */ - @JsonProperty("color") @ApiModelProperty(value = "") + @JsonProperty("color") public String getColor() { return color; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 46ab3b631960..42b8443e9be2 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -45,9 +45,9 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * Get arrayArrayNumber * @return arrayArrayNumber */ - @JsonProperty("ArrayArrayNumber") @Valid @ApiModelProperty(value = "") + @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index cb5358905469..f60290a4d8ad 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -45,9 +45,9 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ - @JsonProperty("ArrayNumber") @Valid @ApiModelProperty(value = "") + @JsonProperty("ArrayNumber") public List getArrayNumber() { return arrayNumber; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayTest.java index 55cc431ecde6..8bb3f76ca666 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayTest.java @@ -51,9 +51,9 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) { * Get arrayOfString * @return arrayOfString */ - @JsonProperty("array_of_string") @ApiModelProperty(value = "") + @JsonProperty("array_of_string") public List getArrayOfString() { return arrayOfString; } @@ -79,9 +79,9 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ - @JsonProperty("array_array_of_integer") @Valid @ApiModelProperty(value = "") + @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; } @@ -107,9 +107,9 @@ public ArrayTest addArrayArrayOfModelItem(List arrayArrayOfModelI * Get arrayArrayOfModel * @return arrayArrayOfModel */ - @JsonProperty("array_array_of_model") @Valid @ApiModelProperty(value = "") + @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCat.java index 70bbb0b93532..16372fb10406 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCat.java @@ -78,9 +78,9 @@ public BigCat kind(KindEnum kind) { * Get kind * @return kind */ - @JsonProperty("kind") @ApiModelProperty(value = "") + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCatAllOf.java index 1a86665050e6..59ab1d8d2bf8 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCatAllOf.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCatAllOf.java @@ -75,9 +75,9 @@ public BigCatAllOf kind(KindEnum kind) { * Get kind * @return kind */ - @JsonProperty("kind") @ApiModelProperty(value = "") + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Capitalization.java index e0fdbe78bae2..feb0d643c5e5 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Capitalization.java @@ -43,9 +43,9 @@ public Capitalization smallCamel(String smallCamel) { * Get smallCamel * @return smallCamel */ - @JsonProperty("smallCamel") @ApiModelProperty(value = "") + @JsonProperty("smallCamel") public String getSmallCamel() { return smallCamel; } @@ -63,9 +63,9 @@ public Capitalization capitalCamel(String capitalCamel) { * Get capitalCamel * @return capitalCamel */ - @JsonProperty("CapitalCamel") @ApiModelProperty(value = "") + @JsonProperty("CapitalCamel") public String getCapitalCamel() { return capitalCamel; } @@ -83,9 +83,9 @@ public Capitalization smallSnake(String smallSnake) { * Get smallSnake * @return smallSnake */ - @JsonProperty("small_Snake") @ApiModelProperty(value = "") + @JsonProperty("small_Snake") public String getSmallSnake() { return smallSnake; } @@ -103,9 +103,9 @@ public Capitalization capitalSnake(String capitalSnake) { * Get capitalSnake * @return capitalSnake */ - @JsonProperty("Capital_Snake") @ApiModelProperty(value = "") + @JsonProperty("Capital_Snake") public String getCapitalSnake() { return capitalSnake; } @@ -123,9 +123,9 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) { * Get scAETHFlowPoints * @return scAETHFlowPoints */ - @JsonProperty("SCA_ETH_Flow_Points") @ApiModelProperty(value = "") + @JsonProperty("SCA_ETH_Flow_Points") public String getScAETHFlowPoints() { return scAETHFlowPoints; } @@ -143,9 +143,9 @@ public Capitalization ATT_NAME(String ATT_NAME) { * Name of the pet * @return ATT_NAME */ - @JsonProperty("ATT_NAME") @ApiModelProperty(value = "Name of the pet ") + @JsonProperty("ATT_NAME") public String getATTNAME() { return ATT_NAME; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Cat.java index 958fcb2298e0..04fd58e2e14a 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Cat.java @@ -47,9 +47,9 @@ public Cat declawed(Boolean declawed) { * Get declawed * @return declawed */ - @JsonProperty("declawed") @ApiModelProperty(value = "") + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/CatAllOf.java index 63de2ad8818e..85c6885ae000 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/CatAllOf.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/CatAllOf.java @@ -35,9 +35,9 @@ public CatAllOf declawed(Boolean declawed) { * Get declawed * @return declawed */ - @JsonProperty("declawed") @ApiModelProperty(value = "") + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Category.java index b63268b2c8ce..3b813dcea538 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Category.java @@ -35,9 +35,9 @@ public Category id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -55,9 +55,9 @@ public Category name(String name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ClassModel.java index 976f0b01d071..2c511abe3ecb 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ClassModel.java @@ -34,9 +34,9 @@ public ClassModel propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ - @JsonProperty("_class") @ApiModelProperty(value = "") + @JsonProperty("_class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Client.java index a3c4731f3339..a6bfdf58db7f 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Client.java @@ -33,9 +33,9 @@ public Client client(String client) { * Get client * @return client */ - @JsonProperty("client") @ApiModelProperty(value = "") + @JsonProperty("client") public String getClient() { return client; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Dog.java index 593562fabb42..a75ee6095e33 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Dog.java @@ -38,9 +38,9 @@ public Dog breed(String breed) { * Get breed * @return breed */ - @JsonProperty("breed") @ApiModelProperty(value = "") + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/DogAllOf.java index 7ddb24717737..5784d207b4d2 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/DogAllOf.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/DogAllOf.java @@ -35,9 +35,9 @@ public DogAllOf breed(String breed) { * Get breed * @return breed */ - @JsonProperty("breed") @ApiModelProperty(value = "") + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumArrays.java index 04e850b1cf17..43a28057b120 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumArrays.java @@ -109,9 +109,9 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) { * Get justSymbol * @return justSymbol */ - @JsonProperty("just_symbol") @ApiModelProperty(value = "") + @JsonProperty("just_symbol") public JustSymbolEnum getJustSymbol() { return justSymbol; } @@ -137,9 +137,9 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) { * Get arrayEnum * @return arrayEnum */ - @JsonProperty("array_enum") @ApiModelProperty(value = "") + @JsonProperty("array_enum") public List getArrayEnum() { return arrayEnum; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumTest.java index 49747f67dccf..3f7af66d4ce7 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumTest.java @@ -189,9 +189,9 @@ public EnumTest enumString(EnumStringEnum enumString) { * Get enumString * @return enumString */ - @JsonProperty("enum_string") @ApiModelProperty(value = "") + @JsonProperty("enum_string") public EnumStringEnum getEnumString() { return enumString; } @@ -209,9 +209,9 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) { * Get enumStringRequired * @return enumStringRequired */ - @JsonProperty("enum_string_required") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("enum_string_required") public EnumStringRequiredEnum getEnumStringRequired() { return enumStringRequired; } @@ -229,9 +229,9 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) { * Get enumInteger * @return enumInteger */ - @JsonProperty("enum_integer") @ApiModelProperty(value = "") + @JsonProperty("enum_integer") public EnumIntegerEnum getEnumInteger() { return enumInteger; } @@ -249,9 +249,9 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) { * Get enumNumber * @return enumNumber */ - @JsonProperty("enum_number") @ApiModelProperty(value = "") + @JsonProperty("enum_number") public EnumNumberEnum getEnumNumber() { return enumNumber; } @@ -269,9 +269,9 @@ public EnumTest outerEnum(OuterEnum outerEnum) { * Get outerEnum * @return outerEnum */ - @JsonProperty("outerEnum") @Valid @ApiModelProperty(value = "") + @JsonProperty("outerEnum") public OuterEnum getOuterEnum() { return outerEnum; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/File.java index 43c44fd344bb..fedeea1c6389 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/File.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/File.java @@ -34,9 +34,9 @@ public File sourceURI(String sourceURI) { * Test capitalization * @return sourceURI */ - @JsonProperty("sourceURI") @ApiModelProperty(value = "Test capitalization") + @JsonProperty("sourceURI") public String getSourceURI() { return sourceURI; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java index d7815943b774..81fc87926e00 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -39,9 +39,9 @@ public FileSchemaTestClass file(File file) { * Get file * @return file */ - @JsonProperty("file") @Valid @ApiModelProperty(value = "") + @JsonProperty("file") public File getFile() { return file; } @@ -67,9 +67,9 @@ public FileSchemaTestClass addFilesItem(File filesItem) { * Get files * @return files */ - @JsonProperty("files") @Valid @ApiModelProperty(value = "") + @JsonProperty("files") public List getFiles() { return files; } 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 ffd18f0ce221..e8697b47182b 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 @@ -71,9 +71,9 @@ public FormatTest integer(Integer integer) { * maximum: 100 * @return integer */ - @JsonProperty("integer") @Min(10) @Max(100) @ApiModelProperty(value = "") + @JsonProperty("integer") public Integer getInteger() { return integer; } @@ -93,9 +93,9 @@ public FormatTest int32(Integer int32) { * maximum: 200 * @return int32 */ - @JsonProperty("int32") @Min(20) @Max(200) @ApiModelProperty(value = "") + @JsonProperty("int32") public Integer getInt32() { return int32; } @@ -113,9 +113,9 @@ public FormatTest int64(Long int64) { * Get int64 * @return int64 */ - @JsonProperty("int64") @ApiModelProperty(value = "") + @JsonProperty("int64") public Long getInt64() { return int64; } @@ -135,9 +135,9 @@ public FormatTest number(BigDecimal number) { * maximum: 543.2 * @return number */ - @JsonProperty("number") @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") @ApiModelProperty(required = true, value = "") + @JsonProperty("number") public BigDecimal getNumber() { return number; } @@ -157,9 +157,9 @@ public FormatTest _float(Float _float) { * maximum: 987.6 * @return _float */ - @JsonProperty("float") @DecimalMin("54.3") @DecimalMax("987.6") @ApiModelProperty(value = "") + @JsonProperty("float") public Float getFloat() { return _float; } @@ -179,9 +179,9 @@ public FormatTest _double(Double _double) { * maximum: 123.4 * @return _double */ - @JsonProperty("double") @DecimalMin("67.8") @DecimalMax("123.4") @ApiModelProperty(value = "") + @JsonProperty("double") public Double getDouble() { return _double; } @@ -199,9 +199,9 @@ public FormatTest string(String string) { * Get string * @return string */ - @JsonProperty("string") @Pattern(regexp = "/[a-z]/i") @ApiModelProperty(value = "") + @JsonProperty("string") public String getString() { return string; } @@ -219,9 +219,9 @@ public FormatTest _byte(byte[] _byte) { * Get _byte * @return _byte */ - @JsonProperty("byte") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("byte") public byte[] getByte() { return _byte; } @@ -239,9 +239,9 @@ public FormatTest binary(org.springframework.core.io.Resource binary) { * Get binary * @return binary */ - @JsonProperty("binary") @Valid @ApiModelProperty(value = "") + @JsonProperty("binary") public org.springframework.core.io.Resource getBinary() { return binary; } @@ -259,9 +259,9 @@ public FormatTest date(LocalDate date) { * Get date * @return date */ - @JsonProperty("date") @NotNull @Valid @ApiModelProperty(required = true, value = "") + @JsonProperty("date") public LocalDate getDate() { return date; } @@ -279,9 +279,9 @@ public FormatTest dateTime(OffsetDateTime dateTime) { * Get dateTime * @return dateTime */ - @JsonProperty("dateTime") @Valid @ApiModelProperty(value = "") + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -299,9 +299,9 @@ public FormatTest uuid(UUID uuid) { * Get uuid * @return uuid */ - @JsonProperty("uuid") @Valid @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -319,9 +319,9 @@ public FormatTest password(String password) { * Get password * @return password */ - @JsonProperty("password") @NotNull @Size(min = 10, max = 64) @ApiModelProperty(required = true, value = "") + @JsonProperty("password") public String getPassword() { return password; } @@ -339,9 +339,9 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) { * Get bigDecimal * @return bigDecimal */ - @JsonProperty("BigDecimal") @Valid @ApiModelProperty(value = "") + @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { return bigDecimal; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index 948ed9a0731d..21a424459798 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -37,9 +37,9 @@ public HasOnlyReadOnly bar(String bar) { * Get bar * @return bar */ - @JsonProperty("bar") @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("bar") public String getBar() { return bar; } @@ -57,9 +57,9 @@ public HasOnlyReadOnly foo(String foo) { * Get foo * @return foo */ - @JsonProperty("foo") @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("foo") public String getFoo() { return foo; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MapTest.java index 94d4ae9a9d56..76c6bee7adcb 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MapTest.java @@ -89,9 +89,9 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapMapOfString * @return mapMapOfString */ - @JsonProperty("map_map_of_string") @Valid @ApiModelProperty(value = "") + @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { return mapMapOfString; } @@ -117,9 +117,9 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) * Get mapOfEnumString * @return mapOfEnumString */ - @JsonProperty("map_of_enum_string") @ApiModelProperty(value = "") + @JsonProperty("map_of_enum_string") public Map getMapOfEnumString() { return mapOfEnumString; } @@ -145,9 +145,9 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) { * Get directMap * @return directMap */ - @JsonProperty("direct_map") @ApiModelProperty(value = "") + @JsonProperty("direct_map") public Map getDirectMap() { return directMap; } @@ -173,9 +173,9 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) { * Get indirectMap * @return indirectMap */ - @JsonProperty("indirect_map") @ApiModelProperty(value = "") + @JsonProperty("indirect_map") public Map getIndirectMap() { return indirectMap; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 89a2475d82fb..f9e2230eba97 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -45,9 +45,9 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { * Get uuid * @return uuid */ - @JsonProperty("uuid") @Valid @ApiModelProperty(value = "") + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -65,9 +65,9 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT * Get dateTime * @return dateTime */ - @JsonProperty("dateTime") @Valid @ApiModelProperty(value = "") + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -93,9 +93,9 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * Get map * @return map */ - @JsonProperty("map") @Valid @ApiModelProperty(value = "") + @JsonProperty("map") public Map getMap() { return map; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Model200Response.java index 220b6493f31a..193231f85457 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Model200Response.java @@ -38,9 +38,9 @@ public Model200Response name(Integer name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public Integer getName() { return name; } @@ -58,9 +58,9 @@ public Model200Response propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ - @JsonProperty("class") @ApiModelProperty(value = "") + @JsonProperty("class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java index 29f3f43cf20e..693e1669879c 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -39,9 +39,9 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ - @JsonProperty("code") @ApiModelProperty(value = "") + @JsonProperty("code") public Integer getCode() { return code; } @@ -59,9 +59,9 @@ public ModelApiResponse type(String type) { * Get type * @return type */ - @JsonProperty("type") @ApiModelProperty(value = "") + @JsonProperty("type") public String getType() { return type; } @@ -79,9 +79,9 @@ public ModelApiResponse message(String message) { * Get message * @return message */ - @JsonProperty("message") @ApiModelProperty(value = "") + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelList.java index a374fe83d52a..7853f3d408a0 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelList.java @@ -35,9 +35,9 @@ public ModelList _123list(String _123list) { * Get _123list * @return _123list */ - @JsonProperty("123-list") @ApiModelProperty(value = "") + @JsonProperty("123-list") public String get123list() { return _123list; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelReturn.java index d8fc618d9dfb..b6f106cea222 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelReturn.java @@ -36,9 +36,9 @@ public ModelReturn _return(Integer _return) { * Get _return * @return _return */ - @JsonProperty("return") @ApiModelProperty(value = "") + @JsonProperty("return") public Integer getReturn() { return _return; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Name.java index 054901b488d6..32403fe65891 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Name.java @@ -40,9 +40,9 @@ public Name name(Integer name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("name") public Integer getName() { return name; } @@ -60,9 +60,9 @@ public Name snakeCase(Integer snakeCase) { * Get snakeCase * @return snakeCase */ - @JsonProperty("snake_case") @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("snake_case") public Integer getSnakeCase() { return snakeCase; } @@ -80,9 +80,9 @@ public Name property(String property) { * Get property * @return property */ - @JsonProperty("property") @ApiModelProperty(value = "") + @JsonProperty("property") public String getProperty() { return property; } @@ -100,9 +100,9 @@ public Name _123number(Integer _123number) { * Get _123number * @return _123number */ - @JsonProperty("123Number") @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("123Number") public Integer get123number() { return _123number; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NumberOnly.java index 8f2f2b19b191..1e3f9e15421d 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NumberOnly.java @@ -34,9 +34,9 @@ public NumberOnly justNumber(BigDecimal justNumber) { * Get justNumber * @return justNumber */ - @JsonProperty("JustNumber") @Valid @ApiModelProperty(value = "") + @JsonProperty("JustNumber") public BigDecimal getJustNumber() { return justNumber; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Order.java index feac4d2cad8d..b24c70c07808 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Order.java @@ -84,9 +84,9 @@ public Order id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -104,9 +104,9 @@ public Order petId(Long petId) { * Get petId * @return petId */ - @JsonProperty("petId") @ApiModelProperty(value = "") + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -124,9 +124,9 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ - @JsonProperty("quantity") @ApiModelProperty(value = "") + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -144,9 +144,9 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ - @JsonProperty("shipDate") @Valid @ApiModelProperty(value = "") + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -164,9 +164,9 @@ public Order status(StatusEnum status) { * Order Status * @return status */ - @JsonProperty("status") @ApiModelProperty(value = "Order Status") + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -184,9 +184,9 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ - @JsonProperty("complete") @ApiModelProperty(value = "") + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/OuterComposite.java index 00cce99097d7..ade2b9150190 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/OuterComposite.java @@ -38,9 +38,9 @@ public OuterComposite myNumber(BigDecimal myNumber) { * Get myNumber * @return myNumber */ - @JsonProperty("my_number") @Valid @ApiModelProperty(value = "") + @JsonProperty("my_number") public BigDecimal getMyNumber() { return myNumber; } @@ -58,9 +58,9 @@ public OuterComposite myString(String myString) { * Get myString * @return myString */ - @JsonProperty("my_string") @ApiModelProperty(value = "") + @JsonProperty("my_string") public String getMyString() { return myString; } @@ -78,9 +78,9 @@ public OuterComposite myBoolean(Boolean myBoolean) { * Get myBoolean * @return myBoolean */ - @JsonProperty("my_boolean") @ApiModelProperty(value = "") + @JsonProperty("my_boolean") public Boolean getMyBoolean() { return myBoolean; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java index e39c22373324..b9358e2b1e87 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java @@ -90,9 +90,9 @@ public Pet id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -110,9 +110,9 @@ public Pet category(Category category) { * Get category * @return category */ - @JsonProperty("category") @Valid @ApiModelProperty(value = "") + @JsonProperty("category") public Category getCategory() { return category; } @@ -130,9 +130,9 @@ public Pet name(String name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") + @JsonProperty("name") public String getName() { return name; } @@ -155,9 +155,9 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ - @JsonProperty("photoUrls") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("photoUrls") public Set getPhotoUrls() { return photoUrls; } @@ -184,9 +184,9 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @JsonProperty("tags") @Valid @ApiModelProperty(value = "") + @JsonProperty("tags") public List getTags() { return tags; } @@ -204,9 +204,9 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ - @JsonProperty("status") @ApiModelProperty(value = "pet status in the store") + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java index d02b8c8cfd53..3eb0ebe069c1 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -35,9 +35,9 @@ public ReadOnlyFirst bar(String bar) { * Get bar * @return bar */ - @JsonProperty("bar") @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("bar") public String getBar() { return bar; } @@ -55,9 +55,9 @@ public ReadOnlyFirst baz(String baz) { * Get baz * @return baz */ - @JsonProperty("baz") @ApiModelProperty(value = "") + @JsonProperty("baz") public String getBaz() { return baz; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/SpecialModelName.java index 8f176362e027..668035becd14 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/SpecialModelName.java @@ -35,9 +35,9 @@ public class SpecialModelName { * Get $specialPropertyName * @return $specialPropertyName */ - @JsonProperty("$special[property.name]") @ApiModelProperty(value = "") + @JsonProperty("$special[property.name]") public Long get$SpecialPropertyName() { return $specialPropertyName; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Tag.java index f7797bef2f19..527e777278e2 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Tag.java @@ -35,9 +35,9 @@ public Tag id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -55,9 +55,9 @@ public Tag name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java index 506efbf431c1..41ba1c5bf1f3 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -45,9 +45,9 @@ public TypeHolderDefault stringItem(String stringItem) { * Get stringItem * @return stringItem */ - @JsonProperty("string_item") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -65,9 +65,9 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ - @JsonProperty("number_item") @NotNull @Valid @ApiModelProperty(required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -85,9 +85,9 @@ public TypeHolderDefault integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ - @JsonProperty("integer_item") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -105,9 +105,9 @@ public TypeHolderDefault boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ - @JsonProperty("bool_item") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -130,9 +130,9 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ - @JsonProperty("array_item") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java index 806c0c90fa18..8e1a76f88fdc 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -47,9 +47,9 @@ public TypeHolderExample stringItem(String stringItem) { * Get stringItem * @return stringItem */ - @JsonProperty("string_item") @NotNull @ApiModelProperty(example = "what", required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -67,9 +67,9 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ - @JsonProperty("number_item") @NotNull @Valid @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -87,9 +87,9 @@ public TypeHolderExample floatItem(Float floatItem) { * Get floatItem * @return floatItem */ - @JsonProperty("float_item") @NotNull @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("float_item") public Float getFloatItem() { return floatItem; } @@ -107,9 +107,9 @@ public TypeHolderExample integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ - @JsonProperty("integer_item") @NotNull @ApiModelProperty(example = "-2", required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -127,9 +127,9 @@ public TypeHolderExample boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ - @JsonProperty("bool_item") @NotNull @ApiModelProperty(example = "true", required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -152,9 +152,9 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ - @JsonProperty("array_item") @NotNull @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/User.java index f42832389ffe..36d29ba307d0 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/User.java @@ -47,9 +47,9 @@ public User id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -67,9 +67,9 @@ public User username(String username) { * Get username * @return username */ - @JsonProperty("username") @ApiModelProperty(value = "") + @JsonProperty("username") public String getUsername() { return username; } @@ -87,9 +87,9 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ - @JsonProperty("firstName") @ApiModelProperty(value = "") + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -107,9 +107,9 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ - @JsonProperty("lastName") @ApiModelProperty(value = "") + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -127,9 +127,9 @@ public User email(String email) { * Get email * @return email */ - @JsonProperty("email") @ApiModelProperty(value = "") + @JsonProperty("email") public String getEmail() { return email; } @@ -147,9 +147,9 @@ public User password(String password) { * Get password * @return password */ - @JsonProperty("password") @ApiModelProperty(value = "") + @JsonProperty("password") public String getPassword() { return password; } @@ -167,9 +167,9 @@ public User phone(String phone) { * Get phone * @return phone */ - @JsonProperty("phone") @ApiModelProperty(value = "") + @JsonProperty("phone") public String getPhone() { return phone; } @@ -187,9 +187,9 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ - @JsonProperty("userStatus") @ApiModelProperty(value = "User Status") + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/XmlItem.java index c795b4b85e6d..3a8d108bdbce 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/XmlItem.java @@ -101,9 +101,9 @@ public XmlItem attributeString(String attributeString) { * Get attributeString * @return attributeString */ - @JsonProperty("attribute_string") @ApiModelProperty(example = "string", value = "") + @JsonProperty("attribute_string") public String getAttributeString() { return attributeString; } @@ -121,9 +121,9 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) { * Get attributeNumber * @return attributeNumber */ - @JsonProperty("attribute_number") @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("attribute_number") public BigDecimal getAttributeNumber() { return attributeNumber; } @@ -141,9 +141,9 @@ public XmlItem attributeInteger(Integer attributeInteger) { * Get attributeInteger * @return attributeInteger */ - @JsonProperty("attribute_integer") @ApiModelProperty(example = "-2", value = "") + @JsonProperty("attribute_integer") public Integer getAttributeInteger() { return attributeInteger; } @@ -161,9 +161,9 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) { * Get attributeBoolean * @return attributeBoolean */ - @JsonProperty("attribute_boolean") @ApiModelProperty(example = "true", value = "") + @JsonProperty("attribute_boolean") public Boolean getAttributeBoolean() { return attributeBoolean; } @@ -189,9 +189,9 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) { * Get wrappedArray * @return wrappedArray */ - @JsonProperty("wrapped_array") @ApiModelProperty(value = "") + @JsonProperty("wrapped_array") public List getWrappedArray() { return wrappedArray; } @@ -209,9 +209,9 @@ public XmlItem nameString(String nameString) { * Get nameString * @return nameString */ - @JsonProperty("name_string") @ApiModelProperty(example = "string", value = "") + @JsonProperty("name_string") public String getNameString() { return nameString; } @@ -229,9 +229,9 @@ public XmlItem nameNumber(BigDecimal nameNumber) { * Get nameNumber * @return nameNumber */ - @JsonProperty("name_number") @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("name_number") public BigDecimal getNameNumber() { return nameNumber; } @@ -249,9 +249,9 @@ public XmlItem nameInteger(Integer nameInteger) { * Get nameInteger * @return nameInteger */ - @JsonProperty("name_integer") @ApiModelProperty(example = "-2", value = "") + @JsonProperty("name_integer") public Integer getNameInteger() { return nameInteger; } @@ -269,9 +269,9 @@ public XmlItem nameBoolean(Boolean nameBoolean) { * Get nameBoolean * @return nameBoolean */ - @JsonProperty("name_boolean") @ApiModelProperty(example = "true", value = "") + @JsonProperty("name_boolean") public Boolean getNameBoolean() { return nameBoolean; } @@ -297,9 +297,9 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) { * Get nameArray * @return nameArray */ - @JsonProperty("name_array") @ApiModelProperty(value = "") + @JsonProperty("name_array") public List getNameArray() { return nameArray; } @@ -325,9 +325,9 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) { * Get nameWrappedArray * @return nameWrappedArray */ - @JsonProperty("name_wrapped_array") @ApiModelProperty(value = "") + @JsonProperty("name_wrapped_array") public List getNameWrappedArray() { return nameWrappedArray; } @@ -345,9 +345,9 @@ public XmlItem prefixString(String prefixString) { * Get prefixString * @return prefixString */ - @JsonProperty("prefix_string") @ApiModelProperty(example = "string", value = "") + @JsonProperty("prefix_string") public String getPrefixString() { return prefixString; } @@ -365,9 +365,9 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) { * Get prefixNumber * @return prefixNumber */ - @JsonProperty("prefix_number") @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("prefix_number") public BigDecimal getPrefixNumber() { return prefixNumber; } @@ -385,9 +385,9 @@ public XmlItem prefixInteger(Integer prefixInteger) { * Get prefixInteger * @return prefixInteger */ - @JsonProperty("prefix_integer") @ApiModelProperty(example = "-2", value = "") + @JsonProperty("prefix_integer") public Integer getPrefixInteger() { return prefixInteger; } @@ -405,9 +405,9 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) { * Get prefixBoolean * @return prefixBoolean */ - @JsonProperty("prefix_boolean") @ApiModelProperty(example = "true", value = "") + @JsonProperty("prefix_boolean") public Boolean getPrefixBoolean() { return prefixBoolean; } @@ -433,9 +433,9 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) { * Get prefixArray * @return prefixArray */ - @JsonProperty("prefix_array") @ApiModelProperty(value = "") + @JsonProperty("prefix_array") public List getPrefixArray() { return prefixArray; } @@ -461,9 +461,9 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) { * Get prefixWrappedArray * @return prefixWrappedArray */ - @JsonProperty("prefix_wrapped_array") @ApiModelProperty(value = "") + @JsonProperty("prefix_wrapped_array") public List getPrefixWrappedArray() { return prefixWrappedArray; } @@ -481,9 +481,9 @@ public XmlItem namespaceString(String namespaceString) { * Get namespaceString * @return namespaceString */ - @JsonProperty("namespace_string") @ApiModelProperty(example = "string", value = "") + @JsonProperty("namespace_string") public String getNamespaceString() { return namespaceString; } @@ -501,9 +501,9 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) { * Get namespaceNumber * @return namespaceNumber */ - @JsonProperty("namespace_number") @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("namespace_number") public BigDecimal getNamespaceNumber() { return namespaceNumber; } @@ -521,9 +521,9 @@ public XmlItem namespaceInteger(Integer namespaceInteger) { * Get namespaceInteger * @return namespaceInteger */ - @JsonProperty("namespace_integer") @ApiModelProperty(example = "-2", value = "") + @JsonProperty("namespace_integer") public Integer getNamespaceInteger() { return namespaceInteger; } @@ -541,9 +541,9 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) { * Get namespaceBoolean * @return namespaceBoolean */ - @JsonProperty("namespace_boolean") @ApiModelProperty(example = "true", value = "") + @JsonProperty("namespace_boolean") public Boolean getNamespaceBoolean() { return namespaceBoolean; } @@ -569,9 +569,9 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) { * Get namespaceArray * @return namespaceArray */ - @JsonProperty("namespace_array") @ApiModelProperty(value = "") + @JsonProperty("namespace_array") public List getNamespaceArray() { return namespaceArray; } @@ -597,9 +597,9 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) { * Get namespaceWrappedArray * @return namespaceWrappedArray */ - @JsonProperty("namespace_wrapped_array") @ApiModelProperty(value = "") + @JsonProperty("namespace_wrapped_array") public List getNamespaceWrappedArray() { return namespaceWrappedArray; } @@ -617,9 +617,9 @@ public XmlItem prefixNsString(String prefixNsString) { * Get prefixNsString * @return prefixNsString */ - @JsonProperty("prefix_ns_string") @ApiModelProperty(example = "string", value = "") + @JsonProperty("prefix_ns_string") public String getPrefixNsString() { return prefixNsString; } @@ -637,9 +637,9 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) { * Get prefixNsNumber * @return prefixNsNumber */ - @JsonProperty("prefix_ns_number") @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("prefix_ns_number") public BigDecimal getPrefixNsNumber() { return prefixNsNumber; } @@ -657,9 +657,9 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) { * Get prefixNsInteger * @return prefixNsInteger */ - @JsonProperty("prefix_ns_integer") @ApiModelProperty(example = "-2", value = "") + @JsonProperty("prefix_ns_integer") public Integer getPrefixNsInteger() { return prefixNsInteger; } @@ -677,9 +677,9 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) { * Get prefixNsBoolean * @return prefixNsBoolean */ - @JsonProperty("prefix_ns_boolean") @ApiModelProperty(example = "true", value = "") + @JsonProperty("prefix_ns_boolean") public Boolean getPrefixNsBoolean() { return prefixNsBoolean; } @@ -705,9 +705,9 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) { * Get prefixNsArray * @return prefixNsArray */ - @JsonProperty("prefix_ns_array") @ApiModelProperty(value = "") + @JsonProperty("prefix_ns_array") public List getPrefixNsArray() { return prefixNsArray; } @@ -733,9 +733,9 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) { * Get prefixNsWrappedArray * @return prefixNsWrappedArray */ - @JsonProperty("prefix_ns_wrapped_array") @ApiModelProperty(value = "") + @JsonProperty("prefix_ns_wrapped_array") public List getPrefixNsWrappedArray() { return prefixNsWrappedArray; } diff --git a/samples/server/petstore/springboot-reactive/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-reactive/src/main/resources/openapi.yaml index 2999e6f2f8d6..5fdcfc33eada 100644 --- a/samples/server/petstore/springboot-reactive/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-reactive/src/main/resources/openapi.yaml @@ -2111,7 +2111,6 @@ components: status: description: Updated status of the pet type: string - type: object uploadFile_request: properties: additionalMetadata: @@ -2121,7 +2120,6 @@ components: description: file to upload format: binary type: string - type: object testEnumParameters_request: properties: enum_form_string_array: @@ -2141,7 +2139,6 @@ components: - -efg - (xyz) type: string - type: object testEndpointParameters_request: properties: integer: @@ -2214,7 +2211,6 @@ components: - double - number - pattern_without_delimiter - type: object testJsonFormData_request: properties: param: @@ -2226,7 +2222,6 @@ components: required: - param - param2 - type: object uploadFileWithRequiredFile_request: properties: additionalMetadata: @@ -2238,7 +2233,6 @@ components: type: string required: - requiredFile - type: object Dog_allOf: properties: breed: diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/.openapi-generator/FILES b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/.openapi-generator/FILES index 7a4d79c7e105..cfad6877d8e0 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/.openapi-generator/FILES @@ -21,7 +21,6 @@ src/main/java/org/openapitools/api/StoreApiDelegate.java src/main/java/org/openapitools/api/UserApi.java src/main/java/org/openapitools/api/UserApiController.java src/main/java/org/openapitools/api/UserApiDelegate.java -src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/configuration/SpringFoxConfiguration.java src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/.openapi-generator/VERSION b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/.openapi-generator/VERSION index d6b4ec4aa783..ed829dbcddec 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0-SNAPSHOT \ No newline at end of file +6.2.1-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java index ffa28f493727..e364fcafe96a 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/AnotherFakeApiController.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/AnotherFakeApiController.java index e27e2fc20ea9..7c3f20492479 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/AnotherFakeApiController.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/AnotherFakeApiController.java @@ -27,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class AnotherFakeApiController implements AnotherFakeApi { private final AnotherFakeApiDelegate delegate; 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 599c2a879c59..97769d2e2a5b 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ 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 726b17779f18..8e624ba5fb59 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 @@ -37,7 +37,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeApiController implements FakeApi { private final FakeApiDelegate delegate; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index ecc2a625ddfb..b58eee9db9f4 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java index 21e28fe8b213..48a276daf130 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java @@ -27,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeClassnameTestApiController implements FakeClassnameTestApi { private final FakeClassnameTestApiDelegate delegate; 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 c1d022bbe331..f05c3e5f6282 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ 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 665635623373..1218abedfa61 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 @@ -30,7 +30,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class PetApiController implements PetApi { private final PetApiDelegate delegate; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApi.java index c9e8abe50bf6..8a1f4ea555b9 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApiController.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApiController.java index e9e29a41b4f9..8c3b33a99af6 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApiController.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApiController.java @@ -28,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class StoreApiController implements StoreApi { private final StoreApiDelegate delegate; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/UserApi.java index e960ec9acd6b..9d54717caa97 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/UserApiController.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/UserApiController.java index 1b48d4a9444b..58511a07291c 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/UserApiController.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/UserApiController.java @@ -29,7 +29,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class UserApiController implements UserApi { private final UserApiDelegate delegate; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index cb51920a8c28..686fafb2faaf 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -35,9 +35,9 @@ public AdditionalPropertiesAnyType name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 1c66a636116f..a2c3df24a2df 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -36,9 +36,9 @@ public AdditionalPropertiesArray name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 1dcc607639bf..82fcada6f56a 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -35,9 +35,9 @@ public AdditionalPropertiesBoolean name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 74250eb564ad..7b720b30d83a 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -73,9 +73,9 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt * Get mapString * @return mapString */ - @JsonProperty("map_string") @ApiModelProperty(value = "") + @JsonProperty("map_string") public Map getMapString() { return mapString; } @@ -101,9 +101,9 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * Get mapNumber * @return mapNumber */ - @JsonProperty("map_number") @Valid @ApiModelProperty(value = "") + @JsonProperty("map_number") public Map getMapNumber() { return mapNumber; } @@ -129,9 +129,9 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege * Get mapInteger * @return mapInteger */ - @JsonProperty("map_integer") @ApiModelProperty(value = "") + @JsonProperty("map_integer") public Map getMapInteger() { return mapInteger; } @@ -157,9 +157,9 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea * Get mapBoolean * @return mapBoolean */ - @JsonProperty("map_boolean") @ApiModelProperty(value = "") + @JsonProperty("map_boolean") public Map getMapBoolean() { return mapBoolean; } @@ -185,9 +185,9 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { return mapArrayInteger; } @@ -213,9 +213,9 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * Get mapArrayAnytype * @return mapArrayAnytype */ - @JsonProperty("map_array_anytype") @Valid @ApiModelProperty(value = "") + @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { return mapArrayAnytype; } @@ -241,9 +241,9 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { return mapMapString; } @@ -269,9 +269,9 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { return mapMapAnytype; } @@ -289,9 +289,9 @@ public AdditionalPropertiesClass anytype1(Object anytype1) { * Get anytype1 * @return anytype1 */ - @JsonProperty("anytype_1") @ApiModelProperty(value = "") + @JsonProperty("anytype_1") public Object getAnytype1() { return anytype1; } @@ -309,9 +309,9 @@ public AdditionalPropertiesClass anytype2(Object anytype2) { * Get anytype2 * @return anytype2 */ - @JsonProperty("anytype_2") @ApiModelProperty(value = "") + @JsonProperty("anytype_2") public Object getAnytype2() { return anytype2; } @@ -329,9 +329,9 @@ public AdditionalPropertiesClass anytype3(Object anytype3) { * Get anytype3 * @return anytype3 */ - @JsonProperty("anytype_3") @ApiModelProperty(value = "") + @JsonProperty("anytype_3") public Object getAnytype3() { return anytype3; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index ce8b8d62436c..ea2ec5365edc 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -35,9 +35,9 @@ public AdditionalPropertiesInteger name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index dec791e0a273..4ca4b5a2f509 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -36,9 +36,9 @@ public AdditionalPropertiesNumber name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 546d0ab9216f..7b9d8ef0b0b2 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -35,9 +35,9 @@ public AdditionalPropertiesObject name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index c1f95cf62e81..fdc4baa9de7b 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -35,9 +35,9 @@ public AdditionalPropertiesString name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Animal.java index 4673ab974ce8..0ccaf94a7505 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Animal.java @@ -50,9 +50,9 @@ public Animal className(String className) { * Get className * @return className */ - @JsonProperty("className") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("className") public String getClassName() { return className; } @@ -70,9 +70,9 @@ public Animal color(String color) { * Get color * @return color */ - @JsonProperty("color") @ApiModelProperty(value = "") + @JsonProperty("color") public String getColor() { return color; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 46ab3b631960..42b8443e9be2 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -45,9 +45,9 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * Get arrayArrayNumber * @return arrayArrayNumber */ - @JsonProperty("ArrayArrayNumber") @Valid @ApiModelProperty(value = "") + @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index cb5358905469..f60290a4d8ad 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -45,9 +45,9 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ - @JsonProperty("ArrayNumber") @Valid @ApiModelProperty(value = "") + @JsonProperty("ArrayNumber") public List getArrayNumber() { return arrayNumber; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayTest.java index 55cc431ecde6..8bb3f76ca666 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayTest.java @@ -51,9 +51,9 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) { * Get arrayOfString * @return arrayOfString */ - @JsonProperty("array_of_string") @ApiModelProperty(value = "") + @JsonProperty("array_of_string") public List getArrayOfString() { return arrayOfString; } @@ -79,9 +79,9 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ - @JsonProperty("array_array_of_integer") @Valid @ApiModelProperty(value = "") + @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; } @@ -107,9 +107,9 @@ public ArrayTest addArrayArrayOfModelItem(List arrayArrayOfModelI * Get arrayArrayOfModel * @return arrayArrayOfModel */ - @JsonProperty("array_array_of_model") @Valid @ApiModelProperty(value = "") + @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Capitalization.java index e0fdbe78bae2..feb0d643c5e5 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Capitalization.java @@ -43,9 +43,9 @@ public Capitalization smallCamel(String smallCamel) { * Get smallCamel * @return smallCamel */ - @JsonProperty("smallCamel") @ApiModelProperty(value = "") + @JsonProperty("smallCamel") public String getSmallCamel() { return smallCamel; } @@ -63,9 +63,9 @@ public Capitalization capitalCamel(String capitalCamel) { * Get capitalCamel * @return capitalCamel */ - @JsonProperty("CapitalCamel") @ApiModelProperty(value = "") + @JsonProperty("CapitalCamel") public String getCapitalCamel() { return capitalCamel; } @@ -83,9 +83,9 @@ public Capitalization smallSnake(String smallSnake) { * Get smallSnake * @return smallSnake */ - @JsonProperty("small_Snake") @ApiModelProperty(value = "") + @JsonProperty("small_Snake") public String getSmallSnake() { return smallSnake; } @@ -103,9 +103,9 @@ public Capitalization capitalSnake(String capitalSnake) { * Get capitalSnake * @return capitalSnake */ - @JsonProperty("Capital_Snake") @ApiModelProperty(value = "") + @JsonProperty("Capital_Snake") public String getCapitalSnake() { return capitalSnake; } @@ -123,9 +123,9 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) { * Get scAETHFlowPoints * @return scAETHFlowPoints */ - @JsonProperty("SCA_ETH_Flow_Points") @ApiModelProperty(value = "") + @JsonProperty("SCA_ETH_Flow_Points") public String getScAETHFlowPoints() { return scAETHFlowPoints; } @@ -143,9 +143,9 @@ public Capitalization ATT_NAME(String ATT_NAME) { * Name of the pet * @return ATT_NAME */ - @JsonProperty("ATT_NAME") @ApiModelProperty(value = "Name of the pet ") + @JsonProperty("ATT_NAME") public String getATTNAME() { return ATT_NAME; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Cat.java index 9b798b7b5a25..be094b204902 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Cat.java @@ -38,9 +38,9 @@ public Cat declawed(Boolean declawed) { * Get declawed * @return declawed */ - @JsonProperty("declawed") @ApiModelProperty(value = "") + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/CatAllOf.java index 63de2ad8818e..85c6885ae000 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/CatAllOf.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/CatAllOf.java @@ -35,9 +35,9 @@ public CatAllOf declawed(Boolean declawed) { * Get declawed * @return declawed */ - @JsonProperty("declawed") @ApiModelProperty(value = "") + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Category.java index b63268b2c8ce..3b813dcea538 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Category.java @@ -35,9 +35,9 @@ public Category id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -55,9 +55,9 @@ public Category name(String name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ClassModel.java index 976f0b01d071..2c511abe3ecb 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ClassModel.java @@ -34,9 +34,9 @@ public ClassModel propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ - @JsonProperty("_class") @ApiModelProperty(value = "") + @JsonProperty("_class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Client.java index a3c4731f3339..a6bfdf58db7f 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Client.java @@ -33,9 +33,9 @@ public Client client(String client) { * Get client * @return client */ - @JsonProperty("client") @ApiModelProperty(value = "") + @JsonProperty("client") public String getClient() { return client; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Dog.java index 593562fabb42..a75ee6095e33 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Dog.java @@ -38,9 +38,9 @@ public Dog breed(String breed) { * Get breed * @return breed */ - @JsonProperty("breed") @ApiModelProperty(value = "") + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/DogAllOf.java index 7ddb24717737..5784d207b4d2 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/DogAllOf.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/DogAllOf.java @@ -35,9 +35,9 @@ public DogAllOf breed(String breed) { * Get breed * @return breed */ - @JsonProperty("breed") @ApiModelProperty(value = "") + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumArrays.java index 04e850b1cf17..43a28057b120 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumArrays.java @@ -109,9 +109,9 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) { * Get justSymbol * @return justSymbol */ - @JsonProperty("just_symbol") @ApiModelProperty(value = "") + @JsonProperty("just_symbol") public JustSymbolEnum getJustSymbol() { return justSymbol; } @@ -137,9 +137,9 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) { * Get arrayEnum * @return arrayEnum */ - @JsonProperty("array_enum") @ApiModelProperty(value = "") + @JsonProperty("array_enum") public List getArrayEnum() { return arrayEnum; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumTest.java index 49747f67dccf..3f7af66d4ce7 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumTest.java @@ -189,9 +189,9 @@ public EnumTest enumString(EnumStringEnum enumString) { * Get enumString * @return enumString */ - @JsonProperty("enum_string") @ApiModelProperty(value = "") + @JsonProperty("enum_string") public EnumStringEnum getEnumString() { return enumString; } @@ -209,9 +209,9 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) { * Get enumStringRequired * @return enumStringRequired */ - @JsonProperty("enum_string_required") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("enum_string_required") public EnumStringRequiredEnum getEnumStringRequired() { return enumStringRequired; } @@ -229,9 +229,9 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) { * Get enumInteger * @return enumInteger */ - @JsonProperty("enum_integer") @ApiModelProperty(value = "") + @JsonProperty("enum_integer") public EnumIntegerEnum getEnumInteger() { return enumInteger; } @@ -249,9 +249,9 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) { * Get enumNumber * @return enumNumber */ - @JsonProperty("enum_number") @ApiModelProperty(value = "") + @JsonProperty("enum_number") public EnumNumberEnum getEnumNumber() { return enumNumber; } @@ -269,9 +269,9 @@ public EnumTest outerEnum(OuterEnum outerEnum) { * Get outerEnum * @return outerEnum */ - @JsonProperty("outerEnum") @Valid @ApiModelProperty(value = "") + @JsonProperty("outerEnum") public OuterEnum getOuterEnum() { return outerEnum; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/File.java index 43c44fd344bb..fedeea1c6389 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/File.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/File.java @@ -34,9 +34,9 @@ public File sourceURI(String sourceURI) { * Test capitalization * @return sourceURI */ - @JsonProperty("sourceURI") @ApiModelProperty(value = "Test capitalization") + @JsonProperty("sourceURI") public String getSourceURI() { return sourceURI; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java index d7815943b774..81fc87926e00 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -39,9 +39,9 @@ public FileSchemaTestClass file(File file) { * Get file * @return file */ - @JsonProperty("file") @Valid @ApiModelProperty(value = "") + @JsonProperty("file") public File getFile() { return file; } @@ -67,9 +67,9 @@ public FileSchemaTestClass addFilesItem(File filesItem) { * Get files * @return files */ - @JsonProperty("files") @Valid @ApiModelProperty(value = "") + @JsonProperty("files") public List getFiles() { return files; } 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 ffd18f0ce221..e8697b47182b 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 @@ -71,9 +71,9 @@ public FormatTest integer(Integer integer) { * maximum: 100 * @return integer */ - @JsonProperty("integer") @Min(10) @Max(100) @ApiModelProperty(value = "") + @JsonProperty("integer") public Integer getInteger() { return integer; } @@ -93,9 +93,9 @@ public FormatTest int32(Integer int32) { * maximum: 200 * @return int32 */ - @JsonProperty("int32") @Min(20) @Max(200) @ApiModelProperty(value = "") + @JsonProperty("int32") public Integer getInt32() { return int32; } @@ -113,9 +113,9 @@ public FormatTest int64(Long int64) { * Get int64 * @return int64 */ - @JsonProperty("int64") @ApiModelProperty(value = "") + @JsonProperty("int64") public Long getInt64() { return int64; } @@ -135,9 +135,9 @@ public FormatTest number(BigDecimal number) { * maximum: 543.2 * @return number */ - @JsonProperty("number") @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") @ApiModelProperty(required = true, value = "") + @JsonProperty("number") public BigDecimal getNumber() { return number; } @@ -157,9 +157,9 @@ public FormatTest _float(Float _float) { * maximum: 987.6 * @return _float */ - @JsonProperty("float") @DecimalMin("54.3") @DecimalMax("987.6") @ApiModelProperty(value = "") + @JsonProperty("float") public Float getFloat() { return _float; } @@ -179,9 +179,9 @@ public FormatTest _double(Double _double) { * maximum: 123.4 * @return _double */ - @JsonProperty("double") @DecimalMin("67.8") @DecimalMax("123.4") @ApiModelProperty(value = "") + @JsonProperty("double") public Double getDouble() { return _double; } @@ -199,9 +199,9 @@ public FormatTest string(String string) { * Get string * @return string */ - @JsonProperty("string") @Pattern(regexp = "/[a-z]/i") @ApiModelProperty(value = "") + @JsonProperty("string") public String getString() { return string; } @@ -219,9 +219,9 @@ public FormatTest _byte(byte[] _byte) { * Get _byte * @return _byte */ - @JsonProperty("byte") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("byte") public byte[] getByte() { return _byte; } @@ -239,9 +239,9 @@ public FormatTest binary(org.springframework.core.io.Resource binary) { * Get binary * @return binary */ - @JsonProperty("binary") @Valid @ApiModelProperty(value = "") + @JsonProperty("binary") public org.springframework.core.io.Resource getBinary() { return binary; } @@ -259,9 +259,9 @@ public FormatTest date(LocalDate date) { * Get date * @return date */ - @JsonProperty("date") @NotNull @Valid @ApiModelProperty(required = true, value = "") + @JsonProperty("date") public LocalDate getDate() { return date; } @@ -279,9 +279,9 @@ public FormatTest dateTime(OffsetDateTime dateTime) { * Get dateTime * @return dateTime */ - @JsonProperty("dateTime") @Valid @ApiModelProperty(value = "") + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -299,9 +299,9 @@ public FormatTest uuid(UUID uuid) { * Get uuid * @return uuid */ - @JsonProperty("uuid") @Valid @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -319,9 +319,9 @@ public FormatTest password(String password) { * Get password * @return password */ - @JsonProperty("password") @NotNull @Size(min = 10, max = 64) @ApiModelProperty(required = true, value = "") + @JsonProperty("password") public String getPassword() { return password; } @@ -339,9 +339,9 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) { * Get bigDecimal * @return bigDecimal */ - @JsonProperty("BigDecimal") @Valid @ApiModelProperty(value = "") + @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { return bigDecimal; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index 948ed9a0731d..21a424459798 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -37,9 +37,9 @@ public HasOnlyReadOnly bar(String bar) { * Get bar * @return bar */ - @JsonProperty("bar") @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("bar") public String getBar() { return bar; } @@ -57,9 +57,9 @@ public HasOnlyReadOnly foo(String foo) { * Get foo * @return foo */ - @JsonProperty("foo") @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("foo") public String getFoo() { return foo; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MapTest.java index 94d4ae9a9d56..76c6bee7adcb 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MapTest.java @@ -89,9 +89,9 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapMapOfString * @return mapMapOfString */ - @JsonProperty("map_map_of_string") @Valid @ApiModelProperty(value = "") + @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { return mapMapOfString; } @@ -117,9 +117,9 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) * Get mapOfEnumString * @return mapOfEnumString */ - @JsonProperty("map_of_enum_string") @ApiModelProperty(value = "") + @JsonProperty("map_of_enum_string") public Map getMapOfEnumString() { return mapOfEnumString; } @@ -145,9 +145,9 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) { * Get directMap * @return directMap */ - @JsonProperty("direct_map") @ApiModelProperty(value = "") + @JsonProperty("direct_map") public Map getDirectMap() { return directMap; } @@ -173,9 +173,9 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) { * Get indirectMap * @return indirectMap */ - @JsonProperty("indirect_map") @ApiModelProperty(value = "") + @JsonProperty("indirect_map") public Map getIndirectMap() { return indirectMap; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 89a2475d82fb..f9e2230eba97 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -45,9 +45,9 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { * Get uuid * @return uuid */ - @JsonProperty("uuid") @Valid @ApiModelProperty(value = "") + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -65,9 +65,9 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT * Get dateTime * @return dateTime */ - @JsonProperty("dateTime") @Valid @ApiModelProperty(value = "") + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -93,9 +93,9 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * Get map * @return map */ - @JsonProperty("map") @Valid @ApiModelProperty(value = "") + @JsonProperty("map") public Map getMap() { return map; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Model200Response.java index 220b6493f31a..193231f85457 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Model200Response.java @@ -38,9 +38,9 @@ public Model200Response name(Integer name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public Integer getName() { return name; } @@ -58,9 +58,9 @@ public Model200Response propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ - @JsonProperty("class") @ApiModelProperty(value = "") + @JsonProperty("class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelApiResponse.java index 29f3f43cf20e..693e1669879c 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -39,9 +39,9 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ - @JsonProperty("code") @ApiModelProperty(value = "") + @JsonProperty("code") public Integer getCode() { return code; } @@ -59,9 +59,9 @@ public ModelApiResponse type(String type) { * Get type * @return type */ - @JsonProperty("type") @ApiModelProperty(value = "") + @JsonProperty("type") public String getType() { return type; } @@ -79,9 +79,9 @@ public ModelApiResponse message(String message) { * Get message * @return message */ - @JsonProperty("message") @ApiModelProperty(value = "") + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelList.java index a374fe83d52a..7853f3d408a0 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelList.java @@ -35,9 +35,9 @@ public ModelList _123list(String _123list) { * Get _123list * @return _123list */ - @JsonProperty("123-list") @ApiModelProperty(value = "") + @JsonProperty("123-list") public String get123list() { return _123list; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelReturn.java index d8fc618d9dfb..b6f106cea222 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelReturn.java @@ -36,9 +36,9 @@ public ModelReturn _return(Integer _return) { * Get _return * @return _return */ - @JsonProperty("return") @ApiModelProperty(value = "") + @JsonProperty("return") public Integer getReturn() { return _return; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Name.java index 054901b488d6..32403fe65891 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Name.java @@ -40,9 +40,9 @@ public Name name(Integer name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("name") public Integer getName() { return name; } @@ -60,9 +60,9 @@ public Name snakeCase(Integer snakeCase) { * Get snakeCase * @return snakeCase */ - @JsonProperty("snake_case") @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("snake_case") public Integer getSnakeCase() { return snakeCase; } @@ -80,9 +80,9 @@ public Name property(String property) { * Get property * @return property */ - @JsonProperty("property") @ApiModelProperty(value = "") + @JsonProperty("property") public String getProperty() { return property; } @@ -100,9 +100,9 @@ public Name _123number(Integer _123number) { * Get _123number * @return _123number */ - @JsonProperty("123Number") @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("123Number") public Integer get123number() { return _123number; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/NumberOnly.java index 8f2f2b19b191..1e3f9e15421d 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/NumberOnly.java @@ -34,9 +34,9 @@ public NumberOnly justNumber(BigDecimal justNumber) { * Get justNumber * @return justNumber */ - @JsonProperty("JustNumber") @Valid @ApiModelProperty(value = "") + @JsonProperty("JustNumber") public BigDecimal getJustNumber() { return justNumber; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Order.java index feac4d2cad8d..b24c70c07808 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Order.java @@ -84,9 +84,9 @@ public Order id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -104,9 +104,9 @@ public Order petId(Long petId) { * Get petId * @return petId */ - @JsonProperty("petId") @ApiModelProperty(value = "") + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -124,9 +124,9 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ - @JsonProperty("quantity") @ApiModelProperty(value = "") + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -144,9 +144,9 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ - @JsonProperty("shipDate") @Valid @ApiModelProperty(value = "") + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -164,9 +164,9 @@ public Order status(StatusEnum status) { * Order Status * @return status */ - @JsonProperty("status") @ApiModelProperty(value = "Order Status") + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -184,9 +184,9 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ - @JsonProperty("complete") @ApiModelProperty(value = "") + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/OuterComposite.java index 00cce99097d7..ade2b9150190 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/OuterComposite.java @@ -38,9 +38,9 @@ public OuterComposite myNumber(BigDecimal myNumber) { * Get myNumber * @return myNumber */ - @JsonProperty("my_number") @Valid @ApiModelProperty(value = "") + @JsonProperty("my_number") public BigDecimal getMyNumber() { return myNumber; } @@ -58,9 +58,9 @@ public OuterComposite myString(String myString) { * Get myString * @return myString */ - @JsonProperty("my_string") @ApiModelProperty(value = "") + @JsonProperty("my_string") public String getMyString() { return myString; } @@ -78,9 +78,9 @@ public OuterComposite myBoolean(Boolean myBoolean) { * Get myBoolean * @return myBoolean */ - @JsonProperty("my_boolean") @ApiModelProperty(value = "") + @JsonProperty("my_boolean") public Boolean getMyBoolean() { return myBoolean; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Pet.java index 1d8ef7f7160f..571dc12b9f77 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Pet.java @@ -87,9 +87,9 @@ public Pet id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -107,9 +107,9 @@ public Pet category(Category category) { * Get category * @return category */ - @JsonProperty("category") @Valid @ApiModelProperty(value = "") + @JsonProperty("category") public Category getCategory() { return category; } @@ -127,9 +127,9 @@ public Pet name(String name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") + @JsonProperty("name") public String getName() { return name; } @@ -152,9 +152,9 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ - @JsonProperty("photoUrls") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; } @@ -180,9 +180,9 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @JsonProperty("tags") @Valid @ApiModelProperty(value = "") + @JsonProperty("tags") public List getTags() { return tags; } @@ -200,9 +200,9 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ - @JsonProperty("status") @ApiModelProperty(value = "pet status in the store") + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java index d02b8c8cfd53..3eb0ebe069c1 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -35,9 +35,9 @@ public ReadOnlyFirst bar(String bar) { * Get bar * @return bar */ - @JsonProperty("bar") @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("bar") public String getBar() { return bar; } @@ -55,9 +55,9 @@ public ReadOnlyFirst baz(String baz) { * Get baz * @return baz */ - @JsonProperty("baz") @ApiModelProperty(value = "") + @JsonProperty("baz") public String getBaz() { return baz; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java index 8f176362e027..668035becd14 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java @@ -35,9 +35,9 @@ public class SpecialModelName { * Get $specialPropertyName * @return $specialPropertyName */ - @JsonProperty("$special[property.name]") @ApiModelProperty(value = "") + @JsonProperty("$special[property.name]") public Long get$SpecialPropertyName() { return $specialPropertyName; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Tag.java index f7797bef2f19..527e777278e2 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Tag.java @@ -35,9 +35,9 @@ public Tag id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -55,9 +55,9 @@ public Tag name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java index 506efbf431c1..41ba1c5bf1f3 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -45,9 +45,9 @@ public TypeHolderDefault stringItem(String stringItem) { * Get stringItem * @return stringItem */ - @JsonProperty("string_item") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -65,9 +65,9 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ - @JsonProperty("number_item") @NotNull @Valid @ApiModelProperty(required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -85,9 +85,9 @@ public TypeHolderDefault integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ - @JsonProperty("integer_item") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -105,9 +105,9 @@ public TypeHolderDefault boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ - @JsonProperty("bool_item") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -130,9 +130,9 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ - @JsonProperty("array_item") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java index 806c0c90fa18..8e1a76f88fdc 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -47,9 +47,9 @@ public TypeHolderExample stringItem(String stringItem) { * Get stringItem * @return stringItem */ - @JsonProperty("string_item") @NotNull @ApiModelProperty(example = "what", required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -67,9 +67,9 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ - @JsonProperty("number_item") @NotNull @Valid @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -87,9 +87,9 @@ public TypeHolderExample floatItem(Float floatItem) { * Get floatItem * @return floatItem */ - @JsonProperty("float_item") @NotNull @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("float_item") public Float getFloatItem() { return floatItem; } @@ -107,9 +107,9 @@ public TypeHolderExample integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ - @JsonProperty("integer_item") @NotNull @ApiModelProperty(example = "-2", required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -127,9 +127,9 @@ public TypeHolderExample boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ - @JsonProperty("bool_item") @NotNull @ApiModelProperty(example = "true", required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -152,9 +152,9 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ - @JsonProperty("array_item") @NotNull @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/User.java index f42832389ffe..36d29ba307d0 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/User.java @@ -47,9 +47,9 @@ public User id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -67,9 +67,9 @@ public User username(String username) { * Get username * @return username */ - @JsonProperty("username") @ApiModelProperty(value = "") + @JsonProperty("username") public String getUsername() { return username; } @@ -87,9 +87,9 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ - @JsonProperty("firstName") @ApiModelProperty(value = "") + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -107,9 +107,9 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ - @JsonProperty("lastName") @ApiModelProperty(value = "") + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -127,9 +127,9 @@ public User email(String email) { * Get email * @return email */ - @JsonProperty("email") @ApiModelProperty(value = "") + @JsonProperty("email") public String getEmail() { return email; } @@ -147,9 +147,9 @@ public User password(String password) { * Get password * @return password */ - @JsonProperty("password") @ApiModelProperty(value = "") + @JsonProperty("password") public String getPassword() { return password; } @@ -167,9 +167,9 @@ public User phone(String phone) { * Get phone * @return phone */ - @JsonProperty("phone") @ApiModelProperty(value = "") + @JsonProperty("phone") public String getPhone() { return phone; } @@ -187,9 +187,9 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ - @JsonProperty("userStatus") @ApiModelProperty(value = "User Status") + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/XmlItem.java index c795b4b85e6d..3a8d108bdbce 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/XmlItem.java @@ -101,9 +101,9 @@ public XmlItem attributeString(String attributeString) { * Get attributeString * @return attributeString */ - @JsonProperty("attribute_string") @ApiModelProperty(example = "string", value = "") + @JsonProperty("attribute_string") public String getAttributeString() { return attributeString; } @@ -121,9 +121,9 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) { * Get attributeNumber * @return attributeNumber */ - @JsonProperty("attribute_number") @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("attribute_number") public BigDecimal getAttributeNumber() { return attributeNumber; } @@ -141,9 +141,9 @@ public XmlItem attributeInteger(Integer attributeInteger) { * Get attributeInteger * @return attributeInteger */ - @JsonProperty("attribute_integer") @ApiModelProperty(example = "-2", value = "") + @JsonProperty("attribute_integer") public Integer getAttributeInteger() { return attributeInteger; } @@ -161,9 +161,9 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) { * Get attributeBoolean * @return attributeBoolean */ - @JsonProperty("attribute_boolean") @ApiModelProperty(example = "true", value = "") + @JsonProperty("attribute_boolean") public Boolean getAttributeBoolean() { return attributeBoolean; } @@ -189,9 +189,9 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) { * Get wrappedArray * @return wrappedArray */ - @JsonProperty("wrapped_array") @ApiModelProperty(value = "") + @JsonProperty("wrapped_array") public List getWrappedArray() { return wrappedArray; } @@ -209,9 +209,9 @@ public XmlItem nameString(String nameString) { * Get nameString * @return nameString */ - @JsonProperty("name_string") @ApiModelProperty(example = "string", value = "") + @JsonProperty("name_string") public String getNameString() { return nameString; } @@ -229,9 +229,9 @@ public XmlItem nameNumber(BigDecimal nameNumber) { * Get nameNumber * @return nameNumber */ - @JsonProperty("name_number") @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("name_number") public BigDecimal getNameNumber() { return nameNumber; } @@ -249,9 +249,9 @@ public XmlItem nameInteger(Integer nameInteger) { * Get nameInteger * @return nameInteger */ - @JsonProperty("name_integer") @ApiModelProperty(example = "-2", value = "") + @JsonProperty("name_integer") public Integer getNameInteger() { return nameInteger; } @@ -269,9 +269,9 @@ public XmlItem nameBoolean(Boolean nameBoolean) { * Get nameBoolean * @return nameBoolean */ - @JsonProperty("name_boolean") @ApiModelProperty(example = "true", value = "") + @JsonProperty("name_boolean") public Boolean getNameBoolean() { return nameBoolean; } @@ -297,9 +297,9 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) { * Get nameArray * @return nameArray */ - @JsonProperty("name_array") @ApiModelProperty(value = "") + @JsonProperty("name_array") public List getNameArray() { return nameArray; } @@ -325,9 +325,9 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) { * Get nameWrappedArray * @return nameWrappedArray */ - @JsonProperty("name_wrapped_array") @ApiModelProperty(value = "") + @JsonProperty("name_wrapped_array") public List getNameWrappedArray() { return nameWrappedArray; } @@ -345,9 +345,9 @@ public XmlItem prefixString(String prefixString) { * Get prefixString * @return prefixString */ - @JsonProperty("prefix_string") @ApiModelProperty(example = "string", value = "") + @JsonProperty("prefix_string") public String getPrefixString() { return prefixString; } @@ -365,9 +365,9 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) { * Get prefixNumber * @return prefixNumber */ - @JsonProperty("prefix_number") @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("prefix_number") public BigDecimal getPrefixNumber() { return prefixNumber; } @@ -385,9 +385,9 @@ public XmlItem prefixInteger(Integer prefixInteger) { * Get prefixInteger * @return prefixInteger */ - @JsonProperty("prefix_integer") @ApiModelProperty(example = "-2", value = "") + @JsonProperty("prefix_integer") public Integer getPrefixInteger() { return prefixInteger; } @@ -405,9 +405,9 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) { * Get prefixBoolean * @return prefixBoolean */ - @JsonProperty("prefix_boolean") @ApiModelProperty(example = "true", value = "") + @JsonProperty("prefix_boolean") public Boolean getPrefixBoolean() { return prefixBoolean; } @@ -433,9 +433,9 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) { * Get prefixArray * @return prefixArray */ - @JsonProperty("prefix_array") @ApiModelProperty(value = "") + @JsonProperty("prefix_array") public List getPrefixArray() { return prefixArray; } @@ -461,9 +461,9 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) { * Get prefixWrappedArray * @return prefixWrappedArray */ - @JsonProperty("prefix_wrapped_array") @ApiModelProperty(value = "") + @JsonProperty("prefix_wrapped_array") public List getPrefixWrappedArray() { return prefixWrappedArray; } @@ -481,9 +481,9 @@ public XmlItem namespaceString(String namespaceString) { * Get namespaceString * @return namespaceString */ - @JsonProperty("namespace_string") @ApiModelProperty(example = "string", value = "") + @JsonProperty("namespace_string") public String getNamespaceString() { return namespaceString; } @@ -501,9 +501,9 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) { * Get namespaceNumber * @return namespaceNumber */ - @JsonProperty("namespace_number") @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("namespace_number") public BigDecimal getNamespaceNumber() { return namespaceNumber; } @@ -521,9 +521,9 @@ public XmlItem namespaceInteger(Integer namespaceInteger) { * Get namespaceInteger * @return namespaceInteger */ - @JsonProperty("namespace_integer") @ApiModelProperty(example = "-2", value = "") + @JsonProperty("namespace_integer") public Integer getNamespaceInteger() { return namespaceInteger; } @@ -541,9 +541,9 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) { * Get namespaceBoolean * @return namespaceBoolean */ - @JsonProperty("namespace_boolean") @ApiModelProperty(example = "true", value = "") + @JsonProperty("namespace_boolean") public Boolean getNamespaceBoolean() { return namespaceBoolean; } @@ -569,9 +569,9 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) { * Get namespaceArray * @return namespaceArray */ - @JsonProperty("namespace_array") @ApiModelProperty(value = "") + @JsonProperty("namespace_array") public List getNamespaceArray() { return namespaceArray; } @@ -597,9 +597,9 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) { * Get namespaceWrappedArray * @return namespaceWrappedArray */ - @JsonProperty("namespace_wrapped_array") @ApiModelProperty(value = "") + @JsonProperty("namespace_wrapped_array") public List getNamespaceWrappedArray() { return namespaceWrappedArray; } @@ -617,9 +617,9 @@ public XmlItem prefixNsString(String prefixNsString) { * Get prefixNsString * @return prefixNsString */ - @JsonProperty("prefix_ns_string") @ApiModelProperty(example = "string", value = "") + @JsonProperty("prefix_ns_string") public String getPrefixNsString() { return prefixNsString; } @@ -637,9 +637,9 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) { * Get prefixNsNumber * @return prefixNsNumber */ - @JsonProperty("prefix_ns_number") @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("prefix_ns_number") public BigDecimal getPrefixNsNumber() { return prefixNsNumber; } @@ -657,9 +657,9 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) { * Get prefixNsInteger * @return prefixNsInteger */ - @JsonProperty("prefix_ns_integer") @ApiModelProperty(example = "-2", value = "") + @JsonProperty("prefix_ns_integer") public Integer getPrefixNsInteger() { return prefixNsInteger; } @@ -677,9 +677,9 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) { * Get prefixNsBoolean * @return prefixNsBoolean */ - @JsonProperty("prefix_ns_boolean") @ApiModelProperty(example = "true", value = "") + @JsonProperty("prefix_ns_boolean") public Boolean getPrefixNsBoolean() { return prefixNsBoolean; } @@ -705,9 +705,9 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) { * Get prefixNsArray * @return prefixNsArray */ - @JsonProperty("prefix_ns_array") @ApiModelProperty(value = "") + @JsonProperty("prefix_ns_array") public List getPrefixNsArray() { return prefixNsArray; } @@ -733,9 +733,9 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) { * Get prefixNsWrappedArray * @return prefixNsWrappedArray */ - @JsonProperty("prefix_ns_wrapped_array") @ApiModelProperty(value = "") + @JsonProperty("prefix_ns_wrapped_array") public List getPrefixNsWrappedArray() { return prefixNsWrappedArray; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/resources/openapi.yaml index d28bcff839b2..81cc16dcab22 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/resources/openapi.yaml @@ -2105,7 +2105,6 @@ components: status: description: Updated status of the pet type: string - type: object uploadFile_request: properties: additionalMetadata: @@ -2115,7 +2114,6 @@ components: description: file to upload format: binary type: string - type: object testEnumParameters_request: properties: enum_form_string_array: @@ -2135,7 +2133,6 @@ components: - -efg - (xyz) type: string - type: object testEndpointParameters_request: properties: integer: @@ -2208,7 +2205,6 @@ components: - double - number - pattern_without_delimiter - type: object testJsonFormData_request: properties: param: @@ -2220,7 +2216,6 @@ components: required: - param - param2 - type: object uploadFileWithRequiredFile_request: properties: additionalMetadata: @@ -2232,7 +2227,6 @@ components: type: string required: - requiredFile - type: object Dog_allOf: properties: breed: diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/.openapi-generator/FILES b/samples/server/petstore/springboot-spring-pageable-delegatePattern/.openapi-generator/FILES index 7a4d79c7e105..cfad6877d8e0 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/.openapi-generator/FILES @@ -21,7 +21,6 @@ src/main/java/org/openapitools/api/StoreApiDelegate.java src/main/java/org/openapitools/api/UserApi.java src/main/java/org/openapitools/api/UserApiController.java src/main/java/org/openapitools/api/UserApiDelegate.java -src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/configuration/SpringFoxConfiguration.java src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/.openapi-generator/VERSION b/samples/server/petstore/springboot-spring-pageable-delegatePattern/.openapi-generator/VERSION index d6b4ec4aa783..ed829dbcddec 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0-SNAPSHOT \ No newline at end of file +6.2.1-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/AnotherFakeApi.java index ffa28f493727..e364fcafe96a 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/AnotherFakeApiController.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/AnotherFakeApiController.java index e27e2fc20ea9..7c3f20492479 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/AnotherFakeApiController.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/AnotherFakeApiController.java @@ -27,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class AnotherFakeApiController implements AnotherFakeApi { private final AnotherFakeApiDelegate delegate; 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 599c2a879c59..97769d2e2a5b 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApiController.java index 726b17779f18..8e624ba5fb59 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApiController.java @@ -37,7 +37,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeApiController implements FakeApi { private final FakeApiDelegate delegate; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index ecc2a625ddfb..b58eee9db9f4 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java index 21e28fe8b213..48a276daf130 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java @@ -27,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeClassnameTestApiController implements FakeClassnameTestApi { private final FakeClassnameTestApiDelegate delegate; 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 c1d022bbe331..f05c3e5f6282 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/PetApiController.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/PetApiController.java index 665635623373..1218abedfa61 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/PetApiController.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/PetApiController.java @@ -30,7 +30,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class PetApiController implements PetApi { private final PetApiDelegate delegate; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApi.java index c9e8abe50bf6..8a1f4ea555b9 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApiController.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApiController.java index e9e29a41b4f9..8c3b33a99af6 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApiController.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApiController.java @@ -28,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class StoreApiController implements StoreApi { private final StoreApiDelegate delegate; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/UserApi.java index e960ec9acd6b..9d54717caa97 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/UserApiController.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/UserApiController.java index 1b48d4a9444b..58511a07291c 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/UserApiController.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/UserApiController.java @@ -29,7 +29,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class UserApiController implements UserApi { private final UserApiDelegate delegate; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index cb51920a8c28..686fafb2faaf 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -35,9 +35,9 @@ public AdditionalPropertiesAnyType name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 1c66a636116f..a2c3df24a2df 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -36,9 +36,9 @@ public AdditionalPropertiesArray name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 1dcc607639bf..82fcada6f56a 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -35,9 +35,9 @@ public AdditionalPropertiesBoolean name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 74250eb564ad..7b720b30d83a 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -73,9 +73,9 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt * Get mapString * @return mapString */ - @JsonProperty("map_string") @ApiModelProperty(value = "") + @JsonProperty("map_string") public Map getMapString() { return mapString; } @@ -101,9 +101,9 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * Get mapNumber * @return mapNumber */ - @JsonProperty("map_number") @Valid @ApiModelProperty(value = "") + @JsonProperty("map_number") public Map getMapNumber() { return mapNumber; } @@ -129,9 +129,9 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege * Get mapInteger * @return mapInteger */ - @JsonProperty("map_integer") @ApiModelProperty(value = "") + @JsonProperty("map_integer") public Map getMapInteger() { return mapInteger; } @@ -157,9 +157,9 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea * Get mapBoolean * @return mapBoolean */ - @JsonProperty("map_boolean") @ApiModelProperty(value = "") + @JsonProperty("map_boolean") public Map getMapBoolean() { return mapBoolean; } @@ -185,9 +185,9 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { return mapArrayInteger; } @@ -213,9 +213,9 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * Get mapArrayAnytype * @return mapArrayAnytype */ - @JsonProperty("map_array_anytype") @Valid @ApiModelProperty(value = "") + @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { return mapArrayAnytype; } @@ -241,9 +241,9 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { return mapMapString; } @@ -269,9 +269,9 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { return mapMapAnytype; } @@ -289,9 +289,9 @@ public AdditionalPropertiesClass anytype1(Object anytype1) { * Get anytype1 * @return anytype1 */ - @JsonProperty("anytype_1") @ApiModelProperty(value = "") + @JsonProperty("anytype_1") public Object getAnytype1() { return anytype1; } @@ -309,9 +309,9 @@ public AdditionalPropertiesClass anytype2(Object anytype2) { * Get anytype2 * @return anytype2 */ - @JsonProperty("anytype_2") @ApiModelProperty(value = "") + @JsonProperty("anytype_2") public Object getAnytype2() { return anytype2; } @@ -329,9 +329,9 @@ public AdditionalPropertiesClass anytype3(Object anytype3) { * Get anytype3 * @return anytype3 */ - @JsonProperty("anytype_3") @ApiModelProperty(value = "") + @JsonProperty("anytype_3") public Object getAnytype3() { return anytype3; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index ce8b8d62436c..ea2ec5365edc 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -35,9 +35,9 @@ public AdditionalPropertiesInteger name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index dec791e0a273..4ca4b5a2f509 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -36,9 +36,9 @@ public AdditionalPropertiesNumber name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 546d0ab9216f..7b9d8ef0b0b2 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -35,9 +35,9 @@ public AdditionalPropertiesObject name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index c1f95cf62e81..fdc4baa9de7b 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -35,9 +35,9 @@ public AdditionalPropertiesString name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Animal.java index 4673ab974ce8..0ccaf94a7505 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Animal.java @@ -50,9 +50,9 @@ public Animal className(String className) { * Get className * @return className */ - @JsonProperty("className") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("className") public String getClassName() { return className; } @@ -70,9 +70,9 @@ public Animal color(String color) { * Get color * @return color */ - @JsonProperty("color") @ApiModelProperty(value = "") + @JsonProperty("color") public String getColor() { return color; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 46ab3b631960..42b8443e9be2 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -45,9 +45,9 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * Get arrayArrayNumber * @return arrayArrayNumber */ - @JsonProperty("ArrayArrayNumber") @Valid @ApiModelProperty(value = "") + @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index cb5358905469..f60290a4d8ad 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -45,9 +45,9 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ - @JsonProperty("ArrayNumber") @Valid @ApiModelProperty(value = "") + @JsonProperty("ArrayNumber") public List getArrayNumber() { return arrayNumber; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayTest.java index 55cc431ecde6..8bb3f76ca666 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayTest.java @@ -51,9 +51,9 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) { * Get arrayOfString * @return arrayOfString */ - @JsonProperty("array_of_string") @ApiModelProperty(value = "") + @JsonProperty("array_of_string") public List getArrayOfString() { return arrayOfString; } @@ -79,9 +79,9 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ - @JsonProperty("array_array_of_integer") @Valid @ApiModelProperty(value = "") + @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; } @@ -107,9 +107,9 @@ public ArrayTest addArrayArrayOfModelItem(List arrayArrayOfModelI * Get arrayArrayOfModel * @return arrayArrayOfModel */ - @JsonProperty("array_array_of_model") @Valid @ApiModelProperty(value = "") + @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Capitalization.java index e0fdbe78bae2..feb0d643c5e5 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Capitalization.java @@ -43,9 +43,9 @@ public Capitalization smallCamel(String smallCamel) { * Get smallCamel * @return smallCamel */ - @JsonProperty("smallCamel") @ApiModelProperty(value = "") + @JsonProperty("smallCamel") public String getSmallCamel() { return smallCamel; } @@ -63,9 +63,9 @@ public Capitalization capitalCamel(String capitalCamel) { * Get capitalCamel * @return capitalCamel */ - @JsonProperty("CapitalCamel") @ApiModelProperty(value = "") + @JsonProperty("CapitalCamel") public String getCapitalCamel() { return capitalCamel; } @@ -83,9 +83,9 @@ public Capitalization smallSnake(String smallSnake) { * Get smallSnake * @return smallSnake */ - @JsonProperty("small_Snake") @ApiModelProperty(value = "") + @JsonProperty("small_Snake") public String getSmallSnake() { return smallSnake; } @@ -103,9 +103,9 @@ public Capitalization capitalSnake(String capitalSnake) { * Get capitalSnake * @return capitalSnake */ - @JsonProperty("Capital_Snake") @ApiModelProperty(value = "") + @JsonProperty("Capital_Snake") public String getCapitalSnake() { return capitalSnake; } @@ -123,9 +123,9 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) { * Get scAETHFlowPoints * @return scAETHFlowPoints */ - @JsonProperty("SCA_ETH_Flow_Points") @ApiModelProperty(value = "") + @JsonProperty("SCA_ETH_Flow_Points") public String getScAETHFlowPoints() { return scAETHFlowPoints; } @@ -143,9 +143,9 @@ public Capitalization ATT_NAME(String ATT_NAME) { * Name of the pet * @return ATT_NAME */ - @JsonProperty("ATT_NAME") @ApiModelProperty(value = "Name of the pet ") + @JsonProperty("ATT_NAME") public String getATTNAME() { return ATT_NAME; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Cat.java index 9b798b7b5a25..be094b204902 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Cat.java @@ -38,9 +38,9 @@ public Cat declawed(Boolean declawed) { * Get declawed * @return declawed */ - @JsonProperty("declawed") @ApiModelProperty(value = "") + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/CatAllOf.java index 63de2ad8818e..85c6885ae000 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/CatAllOf.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/CatAllOf.java @@ -35,9 +35,9 @@ public CatAllOf declawed(Boolean declawed) { * Get declawed * @return declawed */ - @JsonProperty("declawed") @ApiModelProperty(value = "") + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Category.java index b63268b2c8ce..3b813dcea538 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Category.java @@ -35,9 +35,9 @@ public Category id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -55,9 +55,9 @@ public Category name(String name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ClassModel.java index 976f0b01d071..2c511abe3ecb 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ClassModel.java @@ -34,9 +34,9 @@ public ClassModel propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ - @JsonProperty("_class") @ApiModelProperty(value = "") + @JsonProperty("_class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Client.java index a3c4731f3339..a6bfdf58db7f 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Client.java @@ -33,9 +33,9 @@ public Client client(String client) { * Get client * @return client */ - @JsonProperty("client") @ApiModelProperty(value = "") + @JsonProperty("client") public String getClient() { return client; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Dog.java index 593562fabb42..a75ee6095e33 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Dog.java @@ -38,9 +38,9 @@ public Dog breed(String breed) { * Get breed * @return breed */ - @JsonProperty("breed") @ApiModelProperty(value = "") + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/DogAllOf.java index 7ddb24717737..5784d207b4d2 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/DogAllOf.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/DogAllOf.java @@ -35,9 +35,9 @@ public DogAllOf breed(String breed) { * Get breed * @return breed */ - @JsonProperty("breed") @ApiModelProperty(value = "") + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumArrays.java index 04e850b1cf17..43a28057b120 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumArrays.java @@ -109,9 +109,9 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) { * Get justSymbol * @return justSymbol */ - @JsonProperty("just_symbol") @ApiModelProperty(value = "") + @JsonProperty("just_symbol") public JustSymbolEnum getJustSymbol() { return justSymbol; } @@ -137,9 +137,9 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) { * Get arrayEnum * @return arrayEnum */ - @JsonProperty("array_enum") @ApiModelProperty(value = "") + @JsonProperty("array_enum") public List getArrayEnum() { return arrayEnum; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumTest.java index 49747f67dccf..3f7af66d4ce7 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumTest.java @@ -189,9 +189,9 @@ public EnumTest enumString(EnumStringEnum enumString) { * Get enumString * @return enumString */ - @JsonProperty("enum_string") @ApiModelProperty(value = "") + @JsonProperty("enum_string") public EnumStringEnum getEnumString() { return enumString; } @@ -209,9 +209,9 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) { * Get enumStringRequired * @return enumStringRequired */ - @JsonProperty("enum_string_required") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("enum_string_required") public EnumStringRequiredEnum getEnumStringRequired() { return enumStringRequired; } @@ -229,9 +229,9 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) { * Get enumInteger * @return enumInteger */ - @JsonProperty("enum_integer") @ApiModelProperty(value = "") + @JsonProperty("enum_integer") public EnumIntegerEnum getEnumInteger() { return enumInteger; } @@ -249,9 +249,9 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) { * Get enumNumber * @return enumNumber */ - @JsonProperty("enum_number") @ApiModelProperty(value = "") + @JsonProperty("enum_number") public EnumNumberEnum getEnumNumber() { return enumNumber; } @@ -269,9 +269,9 @@ public EnumTest outerEnum(OuterEnum outerEnum) { * Get outerEnum * @return outerEnum */ - @JsonProperty("outerEnum") @Valid @ApiModelProperty(value = "") + @JsonProperty("outerEnum") public OuterEnum getOuterEnum() { return outerEnum; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/File.java index 43c44fd344bb..fedeea1c6389 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/File.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/File.java @@ -34,9 +34,9 @@ public File sourceURI(String sourceURI) { * Test capitalization * @return sourceURI */ - @JsonProperty("sourceURI") @ApiModelProperty(value = "Test capitalization") + @JsonProperty("sourceURI") public String getSourceURI() { return sourceURI; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FileSchemaTestClass.java index d7815943b774..81fc87926e00 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -39,9 +39,9 @@ public FileSchemaTestClass file(File file) { * Get file * @return file */ - @JsonProperty("file") @Valid @ApiModelProperty(value = "") + @JsonProperty("file") public File getFile() { return file; } @@ -67,9 +67,9 @@ public FileSchemaTestClass addFilesItem(File filesItem) { * Get files * @return files */ - @JsonProperty("files") @Valid @ApiModelProperty(value = "") + @JsonProperty("files") public List getFiles() { return files; } 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 ffd18f0ce221..e8697b47182b 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 @@ -71,9 +71,9 @@ public FormatTest integer(Integer integer) { * maximum: 100 * @return integer */ - @JsonProperty("integer") @Min(10) @Max(100) @ApiModelProperty(value = "") + @JsonProperty("integer") public Integer getInteger() { return integer; } @@ -93,9 +93,9 @@ public FormatTest int32(Integer int32) { * maximum: 200 * @return int32 */ - @JsonProperty("int32") @Min(20) @Max(200) @ApiModelProperty(value = "") + @JsonProperty("int32") public Integer getInt32() { return int32; } @@ -113,9 +113,9 @@ public FormatTest int64(Long int64) { * Get int64 * @return int64 */ - @JsonProperty("int64") @ApiModelProperty(value = "") + @JsonProperty("int64") public Long getInt64() { return int64; } @@ -135,9 +135,9 @@ public FormatTest number(BigDecimal number) { * maximum: 543.2 * @return number */ - @JsonProperty("number") @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") @ApiModelProperty(required = true, value = "") + @JsonProperty("number") public BigDecimal getNumber() { return number; } @@ -157,9 +157,9 @@ public FormatTest _float(Float _float) { * maximum: 987.6 * @return _float */ - @JsonProperty("float") @DecimalMin("54.3") @DecimalMax("987.6") @ApiModelProperty(value = "") + @JsonProperty("float") public Float getFloat() { return _float; } @@ -179,9 +179,9 @@ public FormatTest _double(Double _double) { * maximum: 123.4 * @return _double */ - @JsonProperty("double") @DecimalMin("67.8") @DecimalMax("123.4") @ApiModelProperty(value = "") + @JsonProperty("double") public Double getDouble() { return _double; } @@ -199,9 +199,9 @@ public FormatTest string(String string) { * Get string * @return string */ - @JsonProperty("string") @Pattern(regexp = "/[a-z]/i") @ApiModelProperty(value = "") + @JsonProperty("string") public String getString() { return string; } @@ -219,9 +219,9 @@ public FormatTest _byte(byte[] _byte) { * Get _byte * @return _byte */ - @JsonProperty("byte") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("byte") public byte[] getByte() { return _byte; } @@ -239,9 +239,9 @@ public FormatTest binary(org.springframework.core.io.Resource binary) { * Get binary * @return binary */ - @JsonProperty("binary") @Valid @ApiModelProperty(value = "") + @JsonProperty("binary") public org.springframework.core.io.Resource getBinary() { return binary; } @@ -259,9 +259,9 @@ public FormatTest date(LocalDate date) { * Get date * @return date */ - @JsonProperty("date") @NotNull @Valid @ApiModelProperty(required = true, value = "") + @JsonProperty("date") public LocalDate getDate() { return date; } @@ -279,9 +279,9 @@ public FormatTest dateTime(OffsetDateTime dateTime) { * Get dateTime * @return dateTime */ - @JsonProperty("dateTime") @Valid @ApiModelProperty(value = "") + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -299,9 +299,9 @@ public FormatTest uuid(UUID uuid) { * Get uuid * @return uuid */ - @JsonProperty("uuid") @Valid @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -319,9 +319,9 @@ public FormatTest password(String password) { * Get password * @return password */ - @JsonProperty("password") @NotNull @Size(min = 10, max = 64) @ApiModelProperty(required = true, value = "") + @JsonProperty("password") public String getPassword() { return password; } @@ -339,9 +339,9 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) { * Get bigDecimal * @return bigDecimal */ - @JsonProperty("BigDecimal") @Valid @ApiModelProperty(value = "") + @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { return bigDecimal; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index 948ed9a0731d..21a424459798 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -37,9 +37,9 @@ public HasOnlyReadOnly bar(String bar) { * Get bar * @return bar */ - @JsonProperty("bar") @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("bar") public String getBar() { return bar; } @@ -57,9 +57,9 @@ public HasOnlyReadOnly foo(String foo) { * Get foo * @return foo */ - @JsonProperty("foo") @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("foo") public String getFoo() { return foo; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MapTest.java index 94d4ae9a9d56..76c6bee7adcb 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MapTest.java @@ -89,9 +89,9 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapMapOfString * @return mapMapOfString */ - @JsonProperty("map_map_of_string") @Valid @ApiModelProperty(value = "") + @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { return mapMapOfString; } @@ -117,9 +117,9 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) * Get mapOfEnumString * @return mapOfEnumString */ - @JsonProperty("map_of_enum_string") @ApiModelProperty(value = "") + @JsonProperty("map_of_enum_string") public Map getMapOfEnumString() { return mapOfEnumString; } @@ -145,9 +145,9 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) { * Get directMap * @return directMap */ - @JsonProperty("direct_map") @ApiModelProperty(value = "") + @JsonProperty("direct_map") public Map getDirectMap() { return directMap; } @@ -173,9 +173,9 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) { * Get indirectMap * @return indirectMap */ - @JsonProperty("indirect_map") @ApiModelProperty(value = "") + @JsonProperty("indirect_map") public Map getIndirectMap() { return indirectMap; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 89a2475d82fb..f9e2230eba97 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -45,9 +45,9 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { * Get uuid * @return uuid */ - @JsonProperty("uuid") @Valid @ApiModelProperty(value = "") + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -65,9 +65,9 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT * Get dateTime * @return dateTime */ - @JsonProperty("dateTime") @Valid @ApiModelProperty(value = "") + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -93,9 +93,9 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * Get map * @return map */ - @JsonProperty("map") @Valid @ApiModelProperty(value = "") + @JsonProperty("map") public Map getMap() { return map; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Model200Response.java index 220b6493f31a..193231f85457 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Model200Response.java @@ -38,9 +38,9 @@ public Model200Response name(Integer name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public Integer getName() { return name; } @@ -58,9 +58,9 @@ public Model200Response propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ - @JsonProperty("class") @ApiModelProperty(value = "") + @JsonProperty("class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelApiResponse.java index 29f3f43cf20e..693e1669879c 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -39,9 +39,9 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ - @JsonProperty("code") @ApiModelProperty(value = "") + @JsonProperty("code") public Integer getCode() { return code; } @@ -59,9 +59,9 @@ public ModelApiResponse type(String type) { * Get type * @return type */ - @JsonProperty("type") @ApiModelProperty(value = "") + @JsonProperty("type") public String getType() { return type; } @@ -79,9 +79,9 @@ public ModelApiResponse message(String message) { * Get message * @return message */ - @JsonProperty("message") @ApiModelProperty(value = "") + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelList.java index a374fe83d52a..7853f3d408a0 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelList.java @@ -35,9 +35,9 @@ public ModelList _123list(String _123list) { * Get _123list * @return _123list */ - @JsonProperty("123-list") @ApiModelProperty(value = "") + @JsonProperty("123-list") public String get123list() { return _123list; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelReturn.java index d8fc618d9dfb..b6f106cea222 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelReturn.java @@ -36,9 +36,9 @@ public ModelReturn _return(Integer _return) { * Get _return * @return _return */ - @JsonProperty("return") @ApiModelProperty(value = "") + @JsonProperty("return") public Integer getReturn() { return _return; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Name.java index 054901b488d6..32403fe65891 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Name.java @@ -40,9 +40,9 @@ public Name name(Integer name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("name") public Integer getName() { return name; } @@ -60,9 +60,9 @@ public Name snakeCase(Integer snakeCase) { * Get snakeCase * @return snakeCase */ - @JsonProperty("snake_case") @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("snake_case") public Integer getSnakeCase() { return snakeCase; } @@ -80,9 +80,9 @@ public Name property(String property) { * Get property * @return property */ - @JsonProperty("property") @ApiModelProperty(value = "") + @JsonProperty("property") public String getProperty() { return property; } @@ -100,9 +100,9 @@ public Name _123number(Integer _123number) { * Get _123number * @return _123number */ - @JsonProperty("123Number") @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("123Number") public Integer get123number() { return _123number; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/NumberOnly.java index 8f2f2b19b191..1e3f9e15421d 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/NumberOnly.java @@ -34,9 +34,9 @@ public NumberOnly justNumber(BigDecimal justNumber) { * Get justNumber * @return justNumber */ - @JsonProperty("JustNumber") @Valid @ApiModelProperty(value = "") + @JsonProperty("JustNumber") public BigDecimal getJustNumber() { return justNumber; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Order.java index feac4d2cad8d..b24c70c07808 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Order.java @@ -84,9 +84,9 @@ public Order id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -104,9 +104,9 @@ public Order petId(Long petId) { * Get petId * @return petId */ - @JsonProperty("petId") @ApiModelProperty(value = "") + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -124,9 +124,9 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ - @JsonProperty("quantity") @ApiModelProperty(value = "") + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -144,9 +144,9 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ - @JsonProperty("shipDate") @Valid @ApiModelProperty(value = "") + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -164,9 +164,9 @@ public Order status(StatusEnum status) { * Order Status * @return status */ - @JsonProperty("status") @ApiModelProperty(value = "Order Status") + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -184,9 +184,9 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ - @JsonProperty("complete") @ApiModelProperty(value = "") + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/OuterComposite.java index 00cce99097d7..ade2b9150190 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/OuterComposite.java @@ -38,9 +38,9 @@ public OuterComposite myNumber(BigDecimal myNumber) { * Get myNumber * @return myNumber */ - @JsonProperty("my_number") @Valid @ApiModelProperty(value = "") + @JsonProperty("my_number") public BigDecimal getMyNumber() { return myNumber; } @@ -58,9 +58,9 @@ public OuterComposite myString(String myString) { * Get myString * @return myString */ - @JsonProperty("my_string") @ApiModelProperty(value = "") + @JsonProperty("my_string") public String getMyString() { return myString; } @@ -78,9 +78,9 @@ public OuterComposite myBoolean(Boolean myBoolean) { * Get myBoolean * @return myBoolean */ - @JsonProperty("my_boolean") @ApiModelProperty(value = "") + @JsonProperty("my_boolean") public Boolean getMyBoolean() { return myBoolean; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Pet.java index 1d8ef7f7160f..571dc12b9f77 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Pet.java @@ -87,9 +87,9 @@ public Pet id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -107,9 +107,9 @@ public Pet category(Category category) { * Get category * @return category */ - @JsonProperty("category") @Valid @ApiModelProperty(value = "") + @JsonProperty("category") public Category getCategory() { return category; } @@ -127,9 +127,9 @@ public Pet name(String name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") + @JsonProperty("name") public String getName() { return name; } @@ -152,9 +152,9 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ - @JsonProperty("photoUrls") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; } @@ -180,9 +180,9 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @JsonProperty("tags") @Valid @ApiModelProperty(value = "") + @JsonProperty("tags") public List getTags() { return tags; } @@ -200,9 +200,9 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ - @JsonProperty("status") @ApiModelProperty(value = "pet status in the store") + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ReadOnlyFirst.java index d02b8c8cfd53..3eb0ebe069c1 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -35,9 +35,9 @@ public ReadOnlyFirst bar(String bar) { * Get bar * @return bar */ - @JsonProperty("bar") @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("bar") public String getBar() { return bar; } @@ -55,9 +55,9 @@ public ReadOnlyFirst baz(String baz) { * Get baz * @return baz */ - @JsonProperty("baz") @ApiModelProperty(value = "") + @JsonProperty("baz") public String getBaz() { return baz; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/SpecialModelName.java index 8f176362e027..668035becd14 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/SpecialModelName.java @@ -35,9 +35,9 @@ public class SpecialModelName { * Get $specialPropertyName * @return $specialPropertyName */ - @JsonProperty("$special[property.name]") @ApiModelProperty(value = "") + @JsonProperty("$special[property.name]") public Long get$SpecialPropertyName() { return $specialPropertyName; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Tag.java index f7797bef2f19..527e777278e2 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Tag.java @@ -35,9 +35,9 @@ public Tag id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -55,9 +55,9 @@ public Tag name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderDefault.java index 506efbf431c1..41ba1c5bf1f3 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -45,9 +45,9 @@ public TypeHolderDefault stringItem(String stringItem) { * Get stringItem * @return stringItem */ - @JsonProperty("string_item") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -65,9 +65,9 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ - @JsonProperty("number_item") @NotNull @Valid @ApiModelProperty(required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -85,9 +85,9 @@ public TypeHolderDefault integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ - @JsonProperty("integer_item") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -105,9 +105,9 @@ public TypeHolderDefault boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ - @JsonProperty("bool_item") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -130,9 +130,9 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ - @JsonProperty("array_item") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderExample.java index 806c0c90fa18..8e1a76f88fdc 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -47,9 +47,9 @@ public TypeHolderExample stringItem(String stringItem) { * Get stringItem * @return stringItem */ - @JsonProperty("string_item") @NotNull @ApiModelProperty(example = "what", required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -67,9 +67,9 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ - @JsonProperty("number_item") @NotNull @Valid @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -87,9 +87,9 @@ public TypeHolderExample floatItem(Float floatItem) { * Get floatItem * @return floatItem */ - @JsonProperty("float_item") @NotNull @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("float_item") public Float getFloatItem() { return floatItem; } @@ -107,9 +107,9 @@ public TypeHolderExample integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ - @JsonProperty("integer_item") @NotNull @ApiModelProperty(example = "-2", required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -127,9 +127,9 @@ public TypeHolderExample boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ - @JsonProperty("bool_item") @NotNull @ApiModelProperty(example = "true", required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -152,9 +152,9 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ - @JsonProperty("array_item") @NotNull @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/User.java index f42832389ffe..36d29ba307d0 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/User.java @@ -47,9 +47,9 @@ public User id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -67,9 +67,9 @@ public User username(String username) { * Get username * @return username */ - @JsonProperty("username") @ApiModelProperty(value = "") + @JsonProperty("username") public String getUsername() { return username; } @@ -87,9 +87,9 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ - @JsonProperty("firstName") @ApiModelProperty(value = "") + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -107,9 +107,9 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ - @JsonProperty("lastName") @ApiModelProperty(value = "") + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -127,9 +127,9 @@ public User email(String email) { * Get email * @return email */ - @JsonProperty("email") @ApiModelProperty(value = "") + @JsonProperty("email") public String getEmail() { return email; } @@ -147,9 +147,9 @@ public User password(String password) { * Get password * @return password */ - @JsonProperty("password") @ApiModelProperty(value = "") + @JsonProperty("password") public String getPassword() { return password; } @@ -167,9 +167,9 @@ public User phone(String phone) { * Get phone * @return phone */ - @JsonProperty("phone") @ApiModelProperty(value = "") + @JsonProperty("phone") public String getPhone() { return phone; } @@ -187,9 +187,9 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ - @JsonProperty("userStatus") @ApiModelProperty(value = "User Status") + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/XmlItem.java index c795b4b85e6d..3a8d108bdbce 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/XmlItem.java @@ -101,9 +101,9 @@ public XmlItem attributeString(String attributeString) { * Get attributeString * @return attributeString */ - @JsonProperty("attribute_string") @ApiModelProperty(example = "string", value = "") + @JsonProperty("attribute_string") public String getAttributeString() { return attributeString; } @@ -121,9 +121,9 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) { * Get attributeNumber * @return attributeNumber */ - @JsonProperty("attribute_number") @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("attribute_number") public BigDecimal getAttributeNumber() { return attributeNumber; } @@ -141,9 +141,9 @@ public XmlItem attributeInteger(Integer attributeInteger) { * Get attributeInteger * @return attributeInteger */ - @JsonProperty("attribute_integer") @ApiModelProperty(example = "-2", value = "") + @JsonProperty("attribute_integer") public Integer getAttributeInteger() { return attributeInteger; } @@ -161,9 +161,9 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) { * Get attributeBoolean * @return attributeBoolean */ - @JsonProperty("attribute_boolean") @ApiModelProperty(example = "true", value = "") + @JsonProperty("attribute_boolean") public Boolean getAttributeBoolean() { return attributeBoolean; } @@ -189,9 +189,9 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) { * Get wrappedArray * @return wrappedArray */ - @JsonProperty("wrapped_array") @ApiModelProperty(value = "") + @JsonProperty("wrapped_array") public List getWrappedArray() { return wrappedArray; } @@ -209,9 +209,9 @@ public XmlItem nameString(String nameString) { * Get nameString * @return nameString */ - @JsonProperty("name_string") @ApiModelProperty(example = "string", value = "") + @JsonProperty("name_string") public String getNameString() { return nameString; } @@ -229,9 +229,9 @@ public XmlItem nameNumber(BigDecimal nameNumber) { * Get nameNumber * @return nameNumber */ - @JsonProperty("name_number") @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("name_number") public BigDecimal getNameNumber() { return nameNumber; } @@ -249,9 +249,9 @@ public XmlItem nameInteger(Integer nameInteger) { * Get nameInteger * @return nameInteger */ - @JsonProperty("name_integer") @ApiModelProperty(example = "-2", value = "") + @JsonProperty("name_integer") public Integer getNameInteger() { return nameInteger; } @@ -269,9 +269,9 @@ public XmlItem nameBoolean(Boolean nameBoolean) { * Get nameBoolean * @return nameBoolean */ - @JsonProperty("name_boolean") @ApiModelProperty(example = "true", value = "") + @JsonProperty("name_boolean") public Boolean getNameBoolean() { return nameBoolean; } @@ -297,9 +297,9 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) { * Get nameArray * @return nameArray */ - @JsonProperty("name_array") @ApiModelProperty(value = "") + @JsonProperty("name_array") public List getNameArray() { return nameArray; } @@ -325,9 +325,9 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) { * Get nameWrappedArray * @return nameWrappedArray */ - @JsonProperty("name_wrapped_array") @ApiModelProperty(value = "") + @JsonProperty("name_wrapped_array") public List getNameWrappedArray() { return nameWrappedArray; } @@ -345,9 +345,9 @@ public XmlItem prefixString(String prefixString) { * Get prefixString * @return prefixString */ - @JsonProperty("prefix_string") @ApiModelProperty(example = "string", value = "") + @JsonProperty("prefix_string") public String getPrefixString() { return prefixString; } @@ -365,9 +365,9 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) { * Get prefixNumber * @return prefixNumber */ - @JsonProperty("prefix_number") @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("prefix_number") public BigDecimal getPrefixNumber() { return prefixNumber; } @@ -385,9 +385,9 @@ public XmlItem prefixInteger(Integer prefixInteger) { * Get prefixInteger * @return prefixInteger */ - @JsonProperty("prefix_integer") @ApiModelProperty(example = "-2", value = "") + @JsonProperty("prefix_integer") public Integer getPrefixInteger() { return prefixInteger; } @@ -405,9 +405,9 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) { * Get prefixBoolean * @return prefixBoolean */ - @JsonProperty("prefix_boolean") @ApiModelProperty(example = "true", value = "") + @JsonProperty("prefix_boolean") public Boolean getPrefixBoolean() { return prefixBoolean; } @@ -433,9 +433,9 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) { * Get prefixArray * @return prefixArray */ - @JsonProperty("prefix_array") @ApiModelProperty(value = "") + @JsonProperty("prefix_array") public List getPrefixArray() { return prefixArray; } @@ -461,9 +461,9 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) { * Get prefixWrappedArray * @return prefixWrappedArray */ - @JsonProperty("prefix_wrapped_array") @ApiModelProperty(value = "") + @JsonProperty("prefix_wrapped_array") public List getPrefixWrappedArray() { return prefixWrappedArray; } @@ -481,9 +481,9 @@ public XmlItem namespaceString(String namespaceString) { * Get namespaceString * @return namespaceString */ - @JsonProperty("namespace_string") @ApiModelProperty(example = "string", value = "") + @JsonProperty("namespace_string") public String getNamespaceString() { return namespaceString; } @@ -501,9 +501,9 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) { * Get namespaceNumber * @return namespaceNumber */ - @JsonProperty("namespace_number") @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("namespace_number") public BigDecimal getNamespaceNumber() { return namespaceNumber; } @@ -521,9 +521,9 @@ public XmlItem namespaceInteger(Integer namespaceInteger) { * Get namespaceInteger * @return namespaceInteger */ - @JsonProperty("namespace_integer") @ApiModelProperty(example = "-2", value = "") + @JsonProperty("namespace_integer") public Integer getNamespaceInteger() { return namespaceInteger; } @@ -541,9 +541,9 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) { * Get namespaceBoolean * @return namespaceBoolean */ - @JsonProperty("namespace_boolean") @ApiModelProperty(example = "true", value = "") + @JsonProperty("namespace_boolean") public Boolean getNamespaceBoolean() { return namespaceBoolean; } @@ -569,9 +569,9 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) { * Get namespaceArray * @return namespaceArray */ - @JsonProperty("namespace_array") @ApiModelProperty(value = "") + @JsonProperty("namespace_array") public List getNamespaceArray() { return namespaceArray; } @@ -597,9 +597,9 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) { * Get namespaceWrappedArray * @return namespaceWrappedArray */ - @JsonProperty("namespace_wrapped_array") @ApiModelProperty(value = "") + @JsonProperty("namespace_wrapped_array") public List getNamespaceWrappedArray() { return namespaceWrappedArray; } @@ -617,9 +617,9 @@ public XmlItem prefixNsString(String prefixNsString) { * Get prefixNsString * @return prefixNsString */ - @JsonProperty("prefix_ns_string") @ApiModelProperty(example = "string", value = "") + @JsonProperty("prefix_ns_string") public String getPrefixNsString() { return prefixNsString; } @@ -637,9 +637,9 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) { * Get prefixNsNumber * @return prefixNsNumber */ - @JsonProperty("prefix_ns_number") @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("prefix_ns_number") public BigDecimal getPrefixNsNumber() { return prefixNsNumber; } @@ -657,9 +657,9 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) { * Get prefixNsInteger * @return prefixNsInteger */ - @JsonProperty("prefix_ns_integer") @ApiModelProperty(example = "-2", value = "") + @JsonProperty("prefix_ns_integer") public Integer getPrefixNsInteger() { return prefixNsInteger; } @@ -677,9 +677,9 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) { * Get prefixNsBoolean * @return prefixNsBoolean */ - @JsonProperty("prefix_ns_boolean") @ApiModelProperty(example = "true", value = "") + @JsonProperty("prefix_ns_boolean") public Boolean getPrefixNsBoolean() { return prefixNsBoolean; } @@ -705,9 +705,9 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) { * Get prefixNsArray * @return prefixNsArray */ - @JsonProperty("prefix_ns_array") @ApiModelProperty(value = "") + @JsonProperty("prefix_ns_array") public List getPrefixNsArray() { return prefixNsArray; } @@ -733,9 +733,9 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) { * Get prefixNsWrappedArray * @return prefixNsWrappedArray */ - @JsonProperty("prefix_ns_wrapped_array") @ApiModelProperty(value = "") + @JsonProperty("prefix_ns_wrapped_array") public List getPrefixNsWrappedArray() { return prefixNsWrappedArray; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/resources/openapi.yaml index d28bcff839b2..81cc16dcab22 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/resources/openapi.yaml @@ -2105,7 +2105,6 @@ components: status: description: Updated status of the pet type: string - type: object uploadFile_request: properties: additionalMetadata: @@ -2115,7 +2114,6 @@ components: description: file to upload format: binary type: string - type: object testEnumParameters_request: properties: enum_form_string_array: @@ -2135,7 +2133,6 @@ components: - -efg - (xyz) type: string - type: object testEndpointParameters_request: properties: integer: @@ -2208,7 +2205,6 @@ components: - double - number - pattern_without_delimiter - type: object testJsonFormData_request: properties: param: @@ -2220,7 +2216,6 @@ components: required: - param - param2 - type: object uploadFileWithRequiredFile_request: properties: additionalMetadata: @@ -2232,7 +2227,6 @@ components: type: string required: - requiredFile - type: object Dog_allOf: properties: breed: diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/.openapi-generator/FILES b/samples/server/petstore/springboot-spring-pageable-without-j8/.openapi-generator/FILES index 82b3e0b0d8f2..2696c0211eb9 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/.openapi-generator/FILES @@ -15,7 +15,6 @@ src/main/java/org/openapitools/api/StoreApi.java src/main/java/org/openapitools/api/StoreApiController.java src/main/java/org/openapitools/api/UserApi.java src/main/java/org/openapitools/api/UserApiController.java -src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/configuration/SpringFoxConfiguration.java src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/.openapi-generator/VERSION b/samples/server/petstore/springboot-spring-pageable-without-j8/.openapi-generator/VERSION index d6b4ec4aa783..ed829dbcddec 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0-SNAPSHOT \ No newline at end of file +6.2.1-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java index b45fcc5dc16c..9ecd403de93c 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/AnotherFakeApiController.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/AnotherFakeApiController.java index c2db7ca5a815..65c9de6908c2 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/AnotherFakeApiController.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/AnotherFakeApiController.java @@ -28,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class AnotherFakeApiController implements AnotherFakeApi { private final NativeWebRequest request; 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 c07a605db9de..f7ea83eb0311 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ 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 5ae5d5fed985..b30f53bb595c 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 @@ -38,7 +38,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeApiController implements FakeApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index d54c2670f8e2..decd021376d6 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java index 65b695629d43..05196793d4c2 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java @@ -28,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeClassnameTestApiController implements FakeClassnameTestApi { private final NativeWebRequest request; 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 f6c886ac94c8..3d7097297201 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ 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 ab60617a7ee1..58de86d8ac79 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 @@ -31,7 +31,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class PetApiController implements PetApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/StoreApi.java index 1afb547b40ee..f4319f650f50 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/StoreApiController.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/StoreApiController.java index 1292dc0b721d..f8c784ff3838 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/StoreApiController.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/StoreApiController.java @@ -29,7 +29,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class StoreApiController implements StoreApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/UserApi.java index 981e3a95cbe6..e458b4a0b8bf 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/UserApiController.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/UserApiController.java index ca00184d2a56..894bf6db762e 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/UserApiController.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/UserApiController.java @@ -30,7 +30,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class UserApiController implements UserApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index cb51920a8c28..686fafb2faaf 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -35,9 +35,9 @@ public AdditionalPropertiesAnyType name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 1c66a636116f..a2c3df24a2df 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -36,9 +36,9 @@ public AdditionalPropertiesArray name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 1dcc607639bf..82fcada6f56a 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -35,9 +35,9 @@ public AdditionalPropertiesBoolean name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 74250eb564ad..7b720b30d83a 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -73,9 +73,9 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt * Get mapString * @return mapString */ - @JsonProperty("map_string") @ApiModelProperty(value = "") + @JsonProperty("map_string") public Map getMapString() { return mapString; } @@ -101,9 +101,9 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * Get mapNumber * @return mapNumber */ - @JsonProperty("map_number") @Valid @ApiModelProperty(value = "") + @JsonProperty("map_number") public Map getMapNumber() { return mapNumber; } @@ -129,9 +129,9 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege * Get mapInteger * @return mapInteger */ - @JsonProperty("map_integer") @ApiModelProperty(value = "") + @JsonProperty("map_integer") public Map getMapInteger() { return mapInteger; } @@ -157,9 +157,9 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea * Get mapBoolean * @return mapBoolean */ - @JsonProperty("map_boolean") @ApiModelProperty(value = "") + @JsonProperty("map_boolean") public Map getMapBoolean() { return mapBoolean; } @@ -185,9 +185,9 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { return mapArrayInteger; } @@ -213,9 +213,9 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * Get mapArrayAnytype * @return mapArrayAnytype */ - @JsonProperty("map_array_anytype") @Valid @ApiModelProperty(value = "") + @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { return mapArrayAnytype; } @@ -241,9 +241,9 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { return mapMapString; } @@ -269,9 +269,9 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { return mapMapAnytype; } @@ -289,9 +289,9 @@ public AdditionalPropertiesClass anytype1(Object anytype1) { * Get anytype1 * @return anytype1 */ - @JsonProperty("anytype_1") @ApiModelProperty(value = "") + @JsonProperty("anytype_1") public Object getAnytype1() { return anytype1; } @@ -309,9 +309,9 @@ public AdditionalPropertiesClass anytype2(Object anytype2) { * Get anytype2 * @return anytype2 */ - @JsonProperty("anytype_2") @ApiModelProperty(value = "") + @JsonProperty("anytype_2") public Object getAnytype2() { return anytype2; } @@ -329,9 +329,9 @@ public AdditionalPropertiesClass anytype3(Object anytype3) { * Get anytype3 * @return anytype3 */ - @JsonProperty("anytype_3") @ApiModelProperty(value = "") + @JsonProperty("anytype_3") public Object getAnytype3() { return anytype3; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index ce8b8d62436c..ea2ec5365edc 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -35,9 +35,9 @@ public AdditionalPropertiesInteger name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index dec791e0a273..4ca4b5a2f509 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -36,9 +36,9 @@ public AdditionalPropertiesNumber name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 546d0ab9216f..7b9d8ef0b0b2 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -35,9 +35,9 @@ public AdditionalPropertiesObject name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index c1f95cf62e81..fdc4baa9de7b 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -35,9 +35,9 @@ public AdditionalPropertiesString name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Animal.java index 4673ab974ce8..0ccaf94a7505 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Animal.java @@ -50,9 +50,9 @@ public Animal className(String className) { * Get className * @return className */ - @JsonProperty("className") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("className") public String getClassName() { return className; } @@ -70,9 +70,9 @@ public Animal color(String color) { * Get color * @return color */ - @JsonProperty("color") @ApiModelProperty(value = "") + @JsonProperty("color") public String getColor() { return color; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 46ab3b631960..42b8443e9be2 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -45,9 +45,9 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * Get arrayArrayNumber * @return arrayArrayNumber */ - @JsonProperty("ArrayArrayNumber") @Valid @ApiModelProperty(value = "") + @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index cb5358905469..f60290a4d8ad 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -45,9 +45,9 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ - @JsonProperty("ArrayNumber") @Valid @ApiModelProperty(value = "") + @JsonProperty("ArrayNumber") public List getArrayNumber() { return arrayNumber; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayTest.java index 55cc431ecde6..8bb3f76ca666 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayTest.java @@ -51,9 +51,9 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) { * Get arrayOfString * @return arrayOfString */ - @JsonProperty("array_of_string") @ApiModelProperty(value = "") + @JsonProperty("array_of_string") public List getArrayOfString() { return arrayOfString; } @@ -79,9 +79,9 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ - @JsonProperty("array_array_of_integer") @Valid @ApiModelProperty(value = "") + @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; } @@ -107,9 +107,9 @@ public ArrayTest addArrayArrayOfModelItem(List arrayArrayOfModelI * Get arrayArrayOfModel * @return arrayArrayOfModel */ - @JsonProperty("array_array_of_model") @Valid @ApiModelProperty(value = "") + @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Capitalization.java index e0fdbe78bae2..feb0d643c5e5 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Capitalization.java @@ -43,9 +43,9 @@ public Capitalization smallCamel(String smallCamel) { * Get smallCamel * @return smallCamel */ - @JsonProperty("smallCamel") @ApiModelProperty(value = "") + @JsonProperty("smallCamel") public String getSmallCamel() { return smallCamel; } @@ -63,9 +63,9 @@ public Capitalization capitalCamel(String capitalCamel) { * Get capitalCamel * @return capitalCamel */ - @JsonProperty("CapitalCamel") @ApiModelProperty(value = "") + @JsonProperty("CapitalCamel") public String getCapitalCamel() { return capitalCamel; } @@ -83,9 +83,9 @@ public Capitalization smallSnake(String smallSnake) { * Get smallSnake * @return smallSnake */ - @JsonProperty("small_Snake") @ApiModelProperty(value = "") + @JsonProperty("small_Snake") public String getSmallSnake() { return smallSnake; } @@ -103,9 +103,9 @@ public Capitalization capitalSnake(String capitalSnake) { * Get capitalSnake * @return capitalSnake */ - @JsonProperty("Capital_Snake") @ApiModelProperty(value = "") + @JsonProperty("Capital_Snake") public String getCapitalSnake() { return capitalSnake; } @@ -123,9 +123,9 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) { * Get scAETHFlowPoints * @return scAETHFlowPoints */ - @JsonProperty("SCA_ETH_Flow_Points") @ApiModelProperty(value = "") + @JsonProperty("SCA_ETH_Flow_Points") public String getScAETHFlowPoints() { return scAETHFlowPoints; } @@ -143,9 +143,9 @@ public Capitalization ATT_NAME(String ATT_NAME) { * Name of the pet * @return ATT_NAME */ - @JsonProperty("ATT_NAME") @ApiModelProperty(value = "Name of the pet ") + @JsonProperty("ATT_NAME") public String getATTNAME() { return ATT_NAME; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Cat.java index 9b798b7b5a25..be094b204902 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Cat.java @@ -38,9 +38,9 @@ public Cat declawed(Boolean declawed) { * Get declawed * @return declawed */ - @JsonProperty("declawed") @ApiModelProperty(value = "") + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/CatAllOf.java index 63de2ad8818e..85c6885ae000 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/CatAllOf.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/CatAllOf.java @@ -35,9 +35,9 @@ public CatAllOf declawed(Boolean declawed) { * Get declawed * @return declawed */ - @JsonProperty("declawed") @ApiModelProperty(value = "") + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Category.java index b63268b2c8ce..3b813dcea538 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Category.java @@ -35,9 +35,9 @@ public Category id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -55,9 +55,9 @@ public Category name(String name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ClassModel.java index 976f0b01d071..2c511abe3ecb 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ClassModel.java @@ -34,9 +34,9 @@ public ClassModel propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ - @JsonProperty("_class") @ApiModelProperty(value = "") + @JsonProperty("_class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Client.java index a3c4731f3339..a6bfdf58db7f 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Client.java @@ -33,9 +33,9 @@ public Client client(String client) { * Get client * @return client */ - @JsonProperty("client") @ApiModelProperty(value = "") + @JsonProperty("client") public String getClient() { return client; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Dog.java index 593562fabb42..a75ee6095e33 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Dog.java @@ -38,9 +38,9 @@ public Dog breed(String breed) { * Get breed * @return breed */ - @JsonProperty("breed") @ApiModelProperty(value = "") + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/DogAllOf.java index 7ddb24717737..5784d207b4d2 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/DogAllOf.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/DogAllOf.java @@ -35,9 +35,9 @@ public DogAllOf breed(String breed) { * Get breed * @return breed */ - @JsonProperty("breed") @ApiModelProperty(value = "") + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumArrays.java index 04e850b1cf17..43a28057b120 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumArrays.java @@ -109,9 +109,9 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) { * Get justSymbol * @return justSymbol */ - @JsonProperty("just_symbol") @ApiModelProperty(value = "") + @JsonProperty("just_symbol") public JustSymbolEnum getJustSymbol() { return justSymbol; } @@ -137,9 +137,9 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) { * Get arrayEnum * @return arrayEnum */ - @JsonProperty("array_enum") @ApiModelProperty(value = "") + @JsonProperty("array_enum") public List getArrayEnum() { return arrayEnum; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumTest.java index 49747f67dccf..3f7af66d4ce7 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumTest.java @@ -189,9 +189,9 @@ public EnumTest enumString(EnumStringEnum enumString) { * Get enumString * @return enumString */ - @JsonProperty("enum_string") @ApiModelProperty(value = "") + @JsonProperty("enum_string") public EnumStringEnum getEnumString() { return enumString; } @@ -209,9 +209,9 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) { * Get enumStringRequired * @return enumStringRequired */ - @JsonProperty("enum_string_required") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("enum_string_required") public EnumStringRequiredEnum getEnumStringRequired() { return enumStringRequired; } @@ -229,9 +229,9 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) { * Get enumInteger * @return enumInteger */ - @JsonProperty("enum_integer") @ApiModelProperty(value = "") + @JsonProperty("enum_integer") public EnumIntegerEnum getEnumInteger() { return enumInteger; } @@ -249,9 +249,9 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) { * Get enumNumber * @return enumNumber */ - @JsonProperty("enum_number") @ApiModelProperty(value = "") + @JsonProperty("enum_number") public EnumNumberEnum getEnumNumber() { return enumNumber; } @@ -269,9 +269,9 @@ public EnumTest outerEnum(OuterEnum outerEnum) { * Get outerEnum * @return outerEnum */ - @JsonProperty("outerEnum") @Valid @ApiModelProperty(value = "") + @JsonProperty("outerEnum") public OuterEnum getOuterEnum() { return outerEnum; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/File.java index 43c44fd344bb..fedeea1c6389 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/File.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/File.java @@ -34,9 +34,9 @@ public File sourceURI(String sourceURI) { * Test capitalization * @return sourceURI */ - @JsonProperty("sourceURI") @ApiModelProperty(value = "Test capitalization") + @JsonProperty("sourceURI") public String getSourceURI() { return sourceURI; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java index d7815943b774..81fc87926e00 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -39,9 +39,9 @@ public FileSchemaTestClass file(File file) { * Get file * @return file */ - @JsonProperty("file") @Valid @ApiModelProperty(value = "") + @JsonProperty("file") public File getFile() { return file; } @@ -67,9 +67,9 @@ public FileSchemaTestClass addFilesItem(File filesItem) { * Get files * @return files */ - @JsonProperty("files") @Valid @ApiModelProperty(value = "") + @JsonProperty("files") public List getFiles() { return files; } 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 ffd18f0ce221..e8697b47182b 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 @@ -71,9 +71,9 @@ public FormatTest integer(Integer integer) { * maximum: 100 * @return integer */ - @JsonProperty("integer") @Min(10) @Max(100) @ApiModelProperty(value = "") + @JsonProperty("integer") public Integer getInteger() { return integer; } @@ -93,9 +93,9 @@ public FormatTest int32(Integer int32) { * maximum: 200 * @return int32 */ - @JsonProperty("int32") @Min(20) @Max(200) @ApiModelProperty(value = "") + @JsonProperty("int32") public Integer getInt32() { return int32; } @@ -113,9 +113,9 @@ public FormatTest int64(Long int64) { * Get int64 * @return int64 */ - @JsonProperty("int64") @ApiModelProperty(value = "") + @JsonProperty("int64") public Long getInt64() { return int64; } @@ -135,9 +135,9 @@ public FormatTest number(BigDecimal number) { * maximum: 543.2 * @return number */ - @JsonProperty("number") @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") @ApiModelProperty(required = true, value = "") + @JsonProperty("number") public BigDecimal getNumber() { return number; } @@ -157,9 +157,9 @@ public FormatTest _float(Float _float) { * maximum: 987.6 * @return _float */ - @JsonProperty("float") @DecimalMin("54.3") @DecimalMax("987.6") @ApiModelProperty(value = "") + @JsonProperty("float") public Float getFloat() { return _float; } @@ -179,9 +179,9 @@ public FormatTest _double(Double _double) { * maximum: 123.4 * @return _double */ - @JsonProperty("double") @DecimalMin("67.8") @DecimalMax("123.4") @ApiModelProperty(value = "") + @JsonProperty("double") public Double getDouble() { return _double; } @@ -199,9 +199,9 @@ public FormatTest string(String string) { * Get string * @return string */ - @JsonProperty("string") @Pattern(regexp = "/[a-z]/i") @ApiModelProperty(value = "") + @JsonProperty("string") public String getString() { return string; } @@ -219,9 +219,9 @@ public FormatTest _byte(byte[] _byte) { * Get _byte * @return _byte */ - @JsonProperty("byte") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("byte") public byte[] getByte() { return _byte; } @@ -239,9 +239,9 @@ public FormatTest binary(org.springframework.core.io.Resource binary) { * Get binary * @return binary */ - @JsonProperty("binary") @Valid @ApiModelProperty(value = "") + @JsonProperty("binary") public org.springframework.core.io.Resource getBinary() { return binary; } @@ -259,9 +259,9 @@ public FormatTest date(LocalDate date) { * Get date * @return date */ - @JsonProperty("date") @NotNull @Valid @ApiModelProperty(required = true, value = "") + @JsonProperty("date") public LocalDate getDate() { return date; } @@ -279,9 +279,9 @@ public FormatTest dateTime(OffsetDateTime dateTime) { * Get dateTime * @return dateTime */ - @JsonProperty("dateTime") @Valid @ApiModelProperty(value = "") + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -299,9 +299,9 @@ public FormatTest uuid(UUID uuid) { * Get uuid * @return uuid */ - @JsonProperty("uuid") @Valid @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -319,9 +319,9 @@ public FormatTest password(String password) { * Get password * @return password */ - @JsonProperty("password") @NotNull @Size(min = 10, max = 64) @ApiModelProperty(required = true, value = "") + @JsonProperty("password") public String getPassword() { return password; } @@ -339,9 +339,9 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) { * Get bigDecimal * @return bigDecimal */ - @JsonProperty("BigDecimal") @Valid @ApiModelProperty(value = "") + @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { return bigDecimal; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index 948ed9a0731d..21a424459798 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -37,9 +37,9 @@ public HasOnlyReadOnly bar(String bar) { * Get bar * @return bar */ - @JsonProperty("bar") @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("bar") public String getBar() { return bar; } @@ -57,9 +57,9 @@ public HasOnlyReadOnly foo(String foo) { * Get foo * @return foo */ - @JsonProperty("foo") @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("foo") public String getFoo() { return foo; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MapTest.java index 94d4ae9a9d56..76c6bee7adcb 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MapTest.java @@ -89,9 +89,9 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapMapOfString * @return mapMapOfString */ - @JsonProperty("map_map_of_string") @Valid @ApiModelProperty(value = "") + @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { return mapMapOfString; } @@ -117,9 +117,9 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) * Get mapOfEnumString * @return mapOfEnumString */ - @JsonProperty("map_of_enum_string") @ApiModelProperty(value = "") + @JsonProperty("map_of_enum_string") public Map getMapOfEnumString() { return mapOfEnumString; } @@ -145,9 +145,9 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) { * Get directMap * @return directMap */ - @JsonProperty("direct_map") @ApiModelProperty(value = "") + @JsonProperty("direct_map") public Map getDirectMap() { return directMap; } @@ -173,9 +173,9 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) { * Get indirectMap * @return indirectMap */ - @JsonProperty("indirect_map") @ApiModelProperty(value = "") + @JsonProperty("indirect_map") public Map getIndirectMap() { return indirectMap; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 89a2475d82fb..f9e2230eba97 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -45,9 +45,9 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { * Get uuid * @return uuid */ - @JsonProperty("uuid") @Valid @ApiModelProperty(value = "") + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -65,9 +65,9 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT * Get dateTime * @return dateTime */ - @JsonProperty("dateTime") @Valid @ApiModelProperty(value = "") + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -93,9 +93,9 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * Get map * @return map */ - @JsonProperty("map") @Valid @ApiModelProperty(value = "") + @JsonProperty("map") public Map getMap() { return map; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Model200Response.java index 220b6493f31a..193231f85457 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Model200Response.java @@ -38,9 +38,9 @@ public Model200Response name(Integer name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public Integer getName() { return name; } @@ -58,9 +58,9 @@ public Model200Response propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ - @JsonProperty("class") @ApiModelProperty(value = "") + @JsonProperty("class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelApiResponse.java index 29f3f43cf20e..693e1669879c 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -39,9 +39,9 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ - @JsonProperty("code") @ApiModelProperty(value = "") + @JsonProperty("code") public Integer getCode() { return code; } @@ -59,9 +59,9 @@ public ModelApiResponse type(String type) { * Get type * @return type */ - @JsonProperty("type") @ApiModelProperty(value = "") + @JsonProperty("type") public String getType() { return type; } @@ -79,9 +79,9 @@ public ModelApiResponse message(String message) { * Get message * @return message */ - @JsonProperty("message") @ApiModelProperty(value = "") + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelList.java index a374fe83d52a..7853f3d408a0 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelList.java @@ -35,9 +35,9 @@ public ModelList _123list(String _123list) { * Get _123list * @return _123list */ - @JsonProperty("123-list") @ApiModelProperty(value = "") + @JsonProperty("123-list") public String get123list() { return _123list; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelReturn.java index d8fc618d9dfb..b6f106cea222 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelReturn.java @@ -36,9 +36,9 @@ public ModelReturn _return(Integer _return) { * Get _return * @return _return */ - @JsonProperty("return") @ApiModelProperty(value = "") + @JsonProperty("return") public Integer getReturn() { return _return; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Name.java index 054901b488d6..32403fe65891 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Name.java @@ -40,9 +40,9 @@ public Name name(Integer name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("name") public Integer getName() { return name; } @@ -60,9 +60,9 @@ public Name snakeCase(Integer snakeCase) { * Get snakeCase * @return snakeCase */ - @JsonProperty("snake_case") @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("snake_case") public Integer getSnakeCase() { return snakeCase; } @@ -80,9 +80,9 @@ public Name property(String property) { * Get property * @return property */ - @JsonProperty("property") @ApiModelProperty(value = "") + @JsonProperty("property") public String getProperty() { return property; } @@ -100,9 +100,9 @@ public Name _123number(Integer _123number) { * Get _123number * @return _123number */ - @JsonProperty("123Number") @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("123Number") public Integer get123number() { return _123number; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/NumberOnly.java index 8f2f2b19b191..1e3f9e15421d 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/NumberOnly.java @@ -34,9 +34,9 @@ public NumberOnly justNumber(BigDecimal justNumber) { * Get justNumber * @return justNumber */ - @JsonProperty("JustNumber") @Valid @ApiModelProperty(value = "") + @JsonProperty("JustNumber") public BigDecimal getJustNumber() { return justNumber; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Order.java index feac4d2cad8d..b24c70c07808 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Order.java @@ -84,9 +84,9 @@ public Order id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -104,9 +104,9 @@ public Order petId(Long petId) { * Get petId * @return petId */ - @JsonProperty("petId") @ApiModelProperty(value = "") + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -124,9 +124,9 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ - @JsonProperty("quantity") @ApiModelProperty(value = "") + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -144,9 +144,9 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ - @JsonProperty("shipDate") @Valid @ApiModelProperty(value = "") + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -164,9 +164,9 @@ public Order status(StatusEnum status) { * Order Status * @return status */ - @JsonProperty("status") @ApiModelProperty(value = "Order Status") + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -184,9 +184,9 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ - @JsonProperty("complete") @ApiModelProperty(value = "") + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/OuterComposite.java index 00cce99097d7..ade2b9150190 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/OuterComposite.java @@ -38,9 +38,9 @@ public OuterComposite myNumber(BigDecimal myNumber) { * Get myNumber * @return myNumber */ - @JsonProperty("my_number") @Valid @ApiModelProperty(value = "") + @JsonProperty("my_number") public BigDecimal getMyNumber() { return myNumber; } @@ -58,9 +58,9 @@ public OuterComposite myString(String myString) { * Get myString * @return myString */ - @JsonProperty("my_string") @ApiModelProperty(value = "") + @JsonProperty("my_string") public String getMyString() { return myString; } @@ -78,9 +78,9 @@ public OuterComposite myBoolean(Boolean myBoolean) { * Get myBoolean * @return myBoolean */ - @JsonProperty("my_boolean") @ApiModelProperty(value = "") + @JsonProperty("my_boolean") public Boolean getMyBoolean() { return myBoolean; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Pet.java index 1d8ef7f7160f..571dc12b9f77 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Pet.java @@ -87,9 +87,9 @@ public Pet id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -107,9 +107,9 @@ public Pet category(Category category) { * Get category * @return category */ - @JsonProperty("category") @Valid @ApiModelProperty(value = "") + @JsonProperty("category") public Category getCategory() { return category; } @@ -127,9 +127,9 @@ public Pet name(String name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") + @JsonProperty("name") public String getName() { return name; } @@ -152,9 +152,9 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ - @JsonProperty("photoUrls") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; } @@ -180,9 +180,9 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @JsonProperty("tags") @Valid @ApiModelProperty(value = "") + @JsonProperty("tags") public List getTags() { return tags; } @@ -200,9 +200,9 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ - @JsonProperty("status") @ApiModelProperty(value = "pet status in the store") + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java index d02b8c8cfd53..3eb0ebe069c1 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -35,9 +35,9 @@ public ReadOnlyFirst bar(String bar) { * Get bar * @return bar */ - @JsonProperty("bar") @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("bar") public String getBar() { return bar; } @@ -55,9 +55,9 @@ public ReadOnlyFirst baz(String baz) { * Get baz * @return baz */ - @JsonProperty("baz") @ApiModelProperty(value = "") + @JsonProperty("baz") public String getBaz() { return baz; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java index 8f176362e027..668035becd14 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java @@ -35,9 +35,9 @@ public class SpecialModelName { * Get $specialPropertyName * @return $specialPropertyName */ - @JsonProperty("$special[property.name]") @ApiModelProperty(value = "") + @JsonProperty("$special[property.name]") public Long get$SpecialPropertyName() { return $specialPropertyName; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Tag.java index f7797bef2f19..527e777278e2 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Tag.java @@ -35,9 +35,9 @@ public Tag id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -55,9 +55,9 @@ public Tag name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java index 506efbf431c1..41ba1c5bf1f3 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -45,9 +45,9 @@ public TypeHolderDefault stringItem(String stringItem) { * Get stringItem * @return stringItem */ - @JsonProperty("string_item") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -65,9 +65,9 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ - @JsonProperty("number_item") @NotNull @Valid @ApiModelProperty(required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -85,9 +85,9 @@ public TypeHolderDefault integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ - @JsonProperty("integer_item") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -105,9 +105,9 @@ public TypeHolderDefault boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ - @JsonProperty("bool_item") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -130,9 +130,9 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ - @JsonProperty("array_item") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java index 806c0c90fa18..8e1a76f88fdc 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -47,9 +47,9 @@ public TypeHolderExample stringItem(String stringItem) { * Get stringItem * @return stringItem */ - @JsonProperty("string_item") @NotNull @ApiModelProperty(example = "what", required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -67,9 +67,9 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ - @JsonProperty("number_item") @NotNull @Valid @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -87,9 +87,9 @@ public TypeHolderExample floatItem(Float floatItem) { * Get floatItem * @return floatItem */ - @JsonProperty("float_item") @NotNull @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("float_item") public Float getFloatItem() { return floatItem; } @@ -107,9 +107,9 @@ public TypeHolderExample integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ - @JsonProperty("integer_item") @NotNull @ApiModelProperty(example = "-2", required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -127,9 +127,9 @@ public TypeHolderExample boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ - @JsonProperty("bool_item") @NotNull @ApiModelProperty(example = "true", required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -152,9 +152,9 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ - @JsonProperty("array_item") @NotNull @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/User.java index f42832389ffe..36d29ba307d0 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/User.java @@ -47,9 +47,9 @@ public User id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -67,9 +67,9 @@ public User username(String username) { * Get username * @return username */ - @JsonProperty("username") @ApiModelProperty(value = "") + @JsonProperty("username") public String getUsername() { return username; } @@ -87,9 +87,9 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ - @JsonProperty("firstName") @ApiModelProperty(value = "") + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -107,9 +107,9 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ - @JsonProperty("lastName") @ApiModelProperty(value = "") + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -127,9 +127,9 @@ public User email(String email) { * Get email * @return email */ - @JsonProperty("email") @ApiModelProperty(value = "") + @JsonProperty("email") public String getEmail() { return email; } @@ -147,9 +147,9 @@ public User password(String password) { * Get password * @return password */ - @JsonProperty("password") @ApiModelProperty(value = "") + @JsonProperty("password") public String getPassword() { return password; } @@ -167,9 +167,9 @@ public User phone(String phone) { * Get phone * @return phone */ - @JsonProperty("phone") @ApiModelProperty(value = "") + @JsonProperty("phone") public String getPhone() { return phone; } @@ -187,9 +187,9 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ - @JsonProperty("userStatus") @ApiModelProperty(value = "User Status") + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/XmlItem.java index c795b4b85e6d..3a8d108bdbce 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/XmlItem.java @@ -101,9 +101,9 @@ public XmlItem attributeString(String attributeString) { * Get attributeString * @return attributeString */ - @JsonProperty("attribute_string") @ApiModelProperty(example = "string", value = "") + @JsonProperty("attribute_string") public String getAttributeString() { return attributeString; } @@ -121,9 +121,9 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) { * Get attributeNumber * @return attributeNumber */ - @JsonProperty("attribute_number") @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("attribute_number") public BigDecimal getAttributeNumber() { return attributeNumber; } @@ -141,9 +141,9 @@ public XmlItem attributeInteger(Integer attributeInteger) { * Get attributeInteger * @return attributeInteger */ - @JsonProperty("attribute_integer") @ApiModelProperty(example = "-2", value = "") + @JsonProperty("attribute_integer") public Integer getAttributeInteger() { return attributeInteger; } @@ -161,9 +161,9 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) { * Get attributeBoolean * @return attributeBoolean */ - @JsonProperty("attribute_boolean") @ApiModelProperty(example = "true", value = "") + @JsonProperty("attribute_boolean") public Boolean getAttributeBoolean() { return attributeBoolean; } @@ -189,9 +189,9 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) { * Get wrappedArray * @return wrappedArray */ - @JsonProperty("wrapped_array") @ApiModelProperty(value = "") + @JsonProperty("wrapped_array") public List getWrappedArray() { return wrappedArray; } @@ -209,9 +209,9 @@ public XmlItem nameString(String nameString) { * Get nameString * @return nameString */ - @JsonProperty("name_string") @ApiModelProperty(example = "string", value = "") + @JsonProperty("name_string") public String getNameString() { return nameString; } @@ -229,9 +229,9 @@ public XmlItem nameNumber(BigDecimal nameNumber) { * Get nameNumber * @return nameNumber */ - @JsonProperty("name_number") @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("name_number") public BigDecimal getNameNumber() { return nameNumber; } @@ -249,9 +249,9 @@ public XmlItem nameInteger(Integer nameInteger) { * Get nameInteger * @return nameInteger */ - @JsonProperty("name_integer") @ApiModelProperty(example = "-2", value = "") + @JsonProperty("name_integer") public Integer getNameInteger() { return nameInteger; } @@ -269,9 +269,9 @@ public XmlItem nameBoolean(Boolean nameBoolean) { * Get nameBoolean * @return nameBoolean */ - @JsonProperty("name_boolean") @ApiModelProperty(example = "true", value = "") + @JsonProperty("name_boolean") public Boolean getNameBoolean() { return nameBoolean; } @@ -297,9 +297,9 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) { * Get nameArray * @return nameArray */ - @JsonProperty("name_array") @ApiModelProperty(value = "") + @JsonProperty("name_array") public List getNameArray() { return nameArray; } @@ -325,9 +325,9 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) { * Get nameWrappedArray * @return nameWrappedArray */ - @JsonProperty("name_wrapped_array") @ApiModelProperty(value = "") + @JsonProperty("name_wrapped_array") public List getNameWrappedArray() { return nameWrappedArray; } @@ -345,9 +345,9 @@ public XmlItem prefixString(String prefixString) { * Get prefixString * @return prefixString */ - @JsonProperty("prefix_string") @ApiModelProperty(example = "string", value = "") + @JsonProperty("prefix_string") public String getPrefixString() { return prefixString; } @@ -365,9 +365,9 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) { * Get prefixNumber * @return prefixNumber */ - @JsonProperty("prefix_number") @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("prefix_number") public BigDecimal getPrefixNumber() { return prefixNumber; } @@ -385,9 +385,9 @@ public XmlItem prefixInteger(Integer prefixInteger) { * Get prefixInteger * @return prefixInteger */ - @JsonProperty("prefix_integer") @ApiModelProperty(example = "-2", value = "") + @JsonProperty("prefix_integer") public Integer getPrefixInteger() { return prefixInteger; } @@ -405,9 +405,9 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) { * Get prefixBoolean * @return prefixBoolean */ - @JsonProperty("prefix_boolean") @ApiModelProperty(example = "true", value = "") + @JsonProperty("prefix_boolean") public Boolean getPrefixBoolean() { return prefixBoolean; } @@ -433,9 +433,9 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) { * Get prefixArray * @return prefixArray */ - @JsonProperty("prefix_array") @ApiModelProperty(value = "") + @JsonProperty("prefix_array") public List getPrefixArray() { return prefixArray; } @@ -461,9 +461,9 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) { * Get prefixWrappedArray * @return prefixWrappedArray */ - @JsonProperty("prefix_wrapped_array") @ApiModelProperty(value = "") + @JsonProperty("prefix_wrapped_array") public List getPrefixWrappedArray() { return prefixWrappedArray; } @@ -481,9 +481,9 @@ public XmlItem namespaceString(String namespaceString) { * Get namespaceString * @return namespaceString */ - @JsonProperty("namespace_string") @ApiModelProperty(example = "string", value = "") + @JsonProperty("namespace_string") public String getNamespaceString() { return namespaceString; } @@ -501,9 +501,9 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) { * Get namespaceNumber * @return namespaceNumber */ - @JsonProperty("namespace_number") @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("namespace_number") public BigDecimal getNamespaceNumber() { return namespaceNumber; } @@ -521,9 +521,9 @@ public XmlItem namespaceInteger(Integer namespaceInteger) { * Get namespaceInteger * @return namespaceInteger */ - @JsonProperty("namespace_integer") @ApiModelProperty(example = "-2", value = "") + @JsonProperty("namespace_integer") public Integer getNamespaceInteger() { return namespaceInteger; } @@ -541,9 +541,9 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) { * Get namespaceBoolean * @return namespaceBoolean */ - @JsonProperty("namespace_boolean") @ApiModelProperty(example = "true", value = "") + @JsonProperty("namespace_boolean") public Boolean getNamespaceBoolean() { return namespaceBoolean; } @@ -569,9 +569,9 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) { * Get namespaceArray * @return namespaceArray */ - @JsonProperty("namespace_array") @ApiModelProperty(value = "") + @JsonProperty("namespace_array") public List getNamespaceArray() { return namespaceArray; } @@ -597,9 +597,9 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) { * Get namespaceWrappedArray * @return namespaceWrappedArray */ - @JsonProperty("namespace_wrapped_array") @ApiModelProperty(value = "") + @JsonProperty("namespace_wrapped_array") public List getNamespaceWrappedArray() { return namespaceWrappedArray; } @@ -617,9 +617,9 @@ public XmlItem prefixNsString(String prefixNsString) { * Get prefixNsString * @return prefixNsString */ - @JsonProperty("prefix_ns_string") @ApiModelProperty(example = "string", value = "") + @JsonProperty("prefix_ns_string") public String getPrefixNsString() { return prefixNsString; } @@ -637,9 +637,9 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) { * Get prefixNsNumber * @return prefixNsNumber */ - @JsonProperty("prefix_ns_number") @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("prefix_ns_number") public BigDecimal getPrefixNsNumber() { return prefixNsNumber; } @@ -657,9 +657,9 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) { * Get prefixNsInteger * @return prefixNsInteger */ - @JsonProperty("prefix_ns_integer") @ApiModelProperty(example = "-2", value = "") + @JsonProperty("prefix_ns_integer") public Integer getPrefixNsInteger() { return prefixNsInteger; } @@ -677,9 +677,9 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) { * Get prefixNsBoolean * @return prefixNsBoolean */ - @JsonProperty("prefix_ns_boolean") @ApiModelProperty(example = "true", value = "") + @JsonProperty("prefix_ns_boolean") public Boolean getPrefixNsBoolean() { return prefixNsBoolean; } @@ -705,9 +705,9 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) { * Get prefixNsArray * @return prefixNsArray */ - @JsonProperty("prefix_ns_array") @ApiModelProperty(value = "") + @JsonProperty("prefix_ns_array") public List getPrefixNsArray() { return prefixNsArray; } @@ -733,9 +733,9 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) { * Get prefixNsWrappedArray * @return prefixNsWrappedArray */ - @JsonProperty("prefix_ns_wrapped_array") @ApiModelProperty(value = "") + @JsonProperty("prefix_ns_wrapped_array") public List getPrefixNsWrappedArray() { return prefixNsWrappedArray; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/resources/openapi.yaml index d28bcff839b2..81cc16dcab22 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/resources/openapi.yaml @@ -2105,7 +2105,6 @@ components: status: description: Updated status of the pet type: string - type: object uploadFile_request: properties: additionalMetadata: @@ -2115,7 +2114,6 @@ components: description: file to upload format: binary type: string - type: object testEnumParameters_request: properties: enum_form_string_array: @@ -2135,7 +2133,6 @@ components: - -efg - (xyz) type: string - type: object testEndpointParameters_request: properties: integer: @@ -2208,7 +2205,6 @@ components: - double - number - pattern_without_delimiter - type: object testJsonFormData_request: properties: param: @@ -2220,7 +2216,6 @@ components: required: - param - param2 - type: object uploadFileWithRequiredFile_request: properties: additionalMetadata: @@ -2232,7 +2227,6 @@ components: type: string required: - requiredFile - type: object Dog_allOf: properties: breed: diff --git a/samples/server/petstore/springboot-spring-pageable/.openapi-generator/FILES b/samples/server/petstore/springboot-spring-pageable/.openapi-generator/FILES index 82b3e0b0d8f2..2696c0211eb9 100644 --- a/samples/server/petstore/springboot-spring-pageable/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-spring-pageable/.openapi-generator/FILES @@ -15,7 +15,6 @@ src/main/java/org/openapitools/api/StoreApi.java src/main/java/org/openapitools/api/StoreApiController.java src/main/java/org/openapitools/api/UserApi.java src/main/java/org/openapitools/api/UserApiController.java -src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/configuration/SpringFoxConfiguration.java src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java diff --git a/samples/server/petstore/springboot-spring-pageable/.openapi-generator/VERSION b/samples/server/petstore/springboot-spring-pageable/.openapi-generator/VERSION index d6b4ec4aa783..ed829dbcddec 100644 --- a/samples/server/petstore/springboot-spring-pageable/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-spring-pageable/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0-SNAPSHOT \ No newline at end of file +6.2.1-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApi.java index b45fcc5dc16c..9ecd403de93c 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApiController.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApiController.java index c2db7ca5a815..65c9de6908c2 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApiController.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApiController.java @@ -28,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class AnotherFakeApiController implements AnotherFakeApi { private final NativeWebRequest request; 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 c07a605db9de..f7ea83eb0311 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApiController.java index 5ae5d5fed985..b30f53bb595c 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApiController.java @@ -38,7 +38,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeApiController implements FakeApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index d54c2670f8e2..decd021376d6 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java index 65b695629d43..05196793d4c2 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java @@ -28,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeClassnameTestApiController implements FakeClassnameTestApi { private final NativeWebRequest request; 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 f6c886ac94c8..3d7097297201 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/PetApiController.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/PetApiController.java index ab60617a7ee1..58de86d8ac79 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/PetApiController.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/PetApiController.java @@ -31,7 +31,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class PetApiController implements PetApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java index 1afb547b40ee..f4319f650f50 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/StoreApiController.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/StoreApiController.java index 1292dc0b721d..f8c784ff3838 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/StoreApiController.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/StoreApiController.java @@ -29,7 +29,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class StoreApiController implements StoreApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/UserApi.java index 981e3a95cbe6..e458b4a0b8bf 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/UserApiController.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/UserApiController.java index ca00184d2a56..894bf6db762e 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/UserApiController.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/UserApiController.java @@ -30,7 +30,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class UserApiController implements UserApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index cb51920a8c28..686fafb2faaf 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -35,9 +35,9 @@ public AdditionalPropertiesAnyType name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 1c66a636116f..a2c3df24a2df 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -36,9 +36,9 @@ public AdditionalPropertiesArray name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 1dcc607639bf..82fcada6f56a 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -35,9 +35,9 @@ public AdditionalPropertiesBoolean name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 74250eb564ad..7b720b30d83a 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -73,9 +73,9 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt * Get mapString * @return mapString */ - @JsonProperty("map_string") @ApiModelProperty(value = "") + @JsonProperty("map_string") public Map getMapString() { return mapString; } @@ -101,9 +101,9 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * Get mapNumber * @return mapNumber */ - @JsonProperty("map_number") @Valid @ApiModelProperty(value = "") + @JsonProperty("map_number") public Map getMapNumber() { return mapNumber; } @@ -129,9 +129,9 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege * Get mapInteger * @return mapInteger */ - @JsonProperty("map_integer") @ApiModelProperty(value = "") + @JsonProperty("map_integer") public Map getMapInteger() { return mapInteger; } @@ -157,9 +157,9 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea * Get mapBoolean * @return mapBoolean */ - @JsonProperty("map_boolean") @ApiModelProperty(value = "") + @JsonProperty("map_boolean") public Map getMapBoolean() { return mapBoolean; } @@ -185,9 +185,9 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { return mapArrayInteger; } @@ -213,9 +213,9 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * Get mapArrayAnytype * @return mapArrayAnytype */ - @JsonProperty("map_array_anytype") @Valid @ApiModelProperty(value = "") + @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { return mapArrayAnytype; } @@ -241,9 +241,9 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { return mapMapString; } @@ -269,9 +269,9 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { return mapMapAnytype; } @@ -289,9 +289,9 @@ public AdditionalPropertiesClass anytype1(Object anytype1) { * Get anytype1 * @return anytype1 */ - @JsonProperty("anytype_1") @ApiModelProperty(value = "") + @JsonProperty("anytype_1") public Object getAnytype1() { return anytype1; } @@ -309,9 +309,9 @@ public AdditionalPropertiesClass anytype2(Object anytype2) { * Get anytype2 * @return anytype2 */ - @JsonProperty("anytype_2") @ApiModelProperty(value = "") + @JsonProperty("anytype_2") public Object getAnytype2() { return anytype2; } @@ -329,9 +329,9 @@ public AdditionalPropertiesClass anytype3(Object anytype3) { * Get anytype3 * @return anytype3 */ - @JsonProperty("anytype_3") @ApiModelProperty(value = "") + @JsonProperty("anytype_3") public Object getAnytype3() { return anytype3; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index ce8b8d62436c..ea2ec5365edc 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -35,9 +35,9 @@ public AdditionalPropertiesInteger name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index dec791e0a273..4ca4b5a2f509 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -36,9 +36,9 @@ public AdditionalPropertiesNumber name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 546d0ab9216f..7b9d8ef0b0b2 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -35,9 +35,9 @@ public AdditionalPropertiesObject name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index c1f95cf62e81..fdc4baa9de7b 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -35,9 +35,9 @@ public AdditionalPropertiesString name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Animal.java index 4673ab974ce8..0ccaf94a7505 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Animal.java @@ -50,9 +50,9 @@ public Animal className(String className) { * Get className * @return className */ - @JsonProperty("className") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("className") public String getClassName() { return className; } @@ -70,9 +70,9 @@ public Animal color(String color) { * Get color * @return color */ - @JsonProperty("color") @ApiModelProperty(value = "") + @JsonProperty("color") public String getColor() { return color; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 46ab3b631960..42b8443e9be2 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -45,9 +45,9 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * Get arrayArrayNumber * @return arrayArrayNumber */ - @JsonProperty("ArrayArrayNumber") @Valid @ApiModelProperty(value = "") + @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index cb5358905469..f60290a4d8ad 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -45,9 +45,9 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ - @JsonProperty("ArrayNumber") @Valid @ApiModelProperty(value = "") + @JsonProperty("ArrayNumber") public List getArrayNumber() { return arrayNumber; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayTest.java index 55cc431ecde6..8bb3f76ca666 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayTest.java @@ -51,9 +51,9 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) { * Get arrayOfString * @return arrayOfString */ - @JsonProperty("array_of_string") @ApiModelProperty(value = "") + @JsonProperty("array_of_string") public List getArrayOfString() { return arrayOfString; } @@ -79,9 +79,9 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ - @JsonProperty("array_array_of_integer") @Valid @ApiModelProperty(value = "") + @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; } @@ -107,9 +107,9 @@ public ArrayTest addArrayArrayOfModelItem(List arrayArrayOfModelI * Get arrayArrayOfModel * @return arrayArrayOfModel */ - @JsonProperty("array_array_of_model") @Valid @ApiModelProperty(value = "") + @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Capitalization.java index e0fdbe78bae2..feb0d643c5e5 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Capitalization.java @@ -43,9 +43,9 @@ public Capitalization smallCamel(String smallCamel) { * Get smallCamel * @return smallCamel */ - @JsonProperty("smallCamel") @ApiModelProperty(value = "") + @JsonProperty("smallCamel") public String getSmallCamel() { return smallCamel; } @@ -63,9 +63,9 @@ public Capitalization capitalCamel(String capitalCamel) { * Get capitalCamel * @return capitalCamel */ - @JsonProperty("CapitalCamel") @ApiModelProperty(value = "") + @JsonProperty("CapitalCamel") public String getCapitalCamel() { return capitalCamel; } @@ -83,9 +83,9 @@ public Capitalization smallSnake(String smallSnake) { * Get smallSnake * @return smallSnake */ - @JsonProperty("small_Snake") @ApiModelProperty(value = "") + @JsonProperty("small_Snake") public String getSmallSnake() { return smallSnake; } @@ -103,9 +103,9 @@ public Capitalization capitalSnake(String capitalSnake) { * Get capitalSnake * @return capitalSnake */ - @JsonProperty("Capital_Snake") @ApiModelProperty(value = "") + @JsonProperty("Capital_Snake") public String getCapitalSnake() { return capitalSnake; } @@ -123,9 +123,9 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) { * Get scAETHFlowPoints * @return scAETHFlowPoints */ - @JsonProperty("SCA_ETH_Flow_Points") @ApiModelProperty(value = "") + @JsonProperty("SCA_ETH_Flow_Points") public String getScAETHFlowPoints() { return scAETHFlowPoints; } @@ -143,9 +143,9 @@ public Capitalization ATT_NAME(String ATT_NAME) { * Name of the pet * @return ATT_NAME */ - @JsonProperty("ATT_NAME") @ApiModelProperty(value = "Name of the pet ") + @JsonProperty("ATT_NAME") public String getATTNAME() { return ATT_NAME; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Cat.java index 9b798b7b5a25..be094b204902 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Cat.java @@ -38,9 +38,9 @@ public Cat declawed(Boolean declawed) { * Get declawed * @return declawed */ - @JsonProperty("declawed") @ApiModelProperty(value = "") + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/CatAllOf.java index 63de2ad8818e..85c6885ae000 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/CatAllOf.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/CatAllOf.java @@ -35,9 +35,9 @@ public CatAllOf declawed(Boolean declawed) { * Get declawed * @return declawed */ - @JsonProperty("declawed") @ApiModelProperty(value = "") + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Category.java index b63268b2c8ce..3b813dcea538 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Category.java @@ -35,9 +35,9 @@ public Category id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -55,9 +55,9 @@ public Category name(String name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ClassModel.java index 976f0b01d071..2c511abe3ecb 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ClassModel.java @@ -34,9 +34,9 @@ public ClassModel propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ - @JsonProperty("_class") @ApiModelProperty(value = "") + @JsonProperty("_class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Client.java index a3c4731f3339..a6bfdf58db7f 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Client.java @@ -33,9 +33,9 @@ public Client client(String client) { * Get client * @return client */ - @JsonProperty("client") @ApiModelProperty(value = "") + @JsonProperty("client") public String getClient() { return client; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Dog.java index 593562fabb42..a75ee6095e33 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Dog.java @@ -38,9 +38,9 @@ public Dog breed(String breed) { * Get breed * @return breed */ - @JsonProperty("breed") @ApiModelProperty(value = "") + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/DogAllOf.java index 7ddb24717737..5784d207b4d2 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/DogAllOf.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/DogAllOf.java @@ -35,9 +35,9 @@ public DogAllOf breed(String breed) { * Get breed * @return breed */ - @JsonProperty("breed") @ApiModelProperty(value = "") + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumArrays.java index 04e850b1cf17..43a28057b120 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumArrays.java @@ -109,9 +109,9 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) { * Get justSymbol * @return justSymbol */ - @JsonProperty("just_symbol") @ApiModelProperty(value = "") + @JsonProperty("just_symbol") public JustSymbolEnum getJustSymbol() { return justSymbol; } @@ -137,9 +137,9 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) { * Get arrayEnum * @return arrayEnum */ - @JsonProperty("array_enum") @ApiModelProperty(value = "") + @JsonProperty("array_enum") public List getArrayEnum() { return arrayEnum; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumTest.java index 49747f67dccf..3f7af66d4ce7 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumTest.java @@ -189,9 +189,9 @@ public EnumTest enumString(EnumStringEnum enumString) { * Get enumString * @return enumString */ - @JsonProperty("enum_string") @ApiModelProperty(value = "") + @JsonProperty("enum_string") public EnumStringEnum getEnumString() { return enumString; } @@ -209,9 +209,9 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) { * Get enumStringRequired * @return enumStringRequired */ - @JsonProperty("enum_string_required") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("enum_string_required") public EnumStringRequiredEnum getEnumStringRequired() { return enumStringRequired; } @@ -229,9 +229,9 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) { * Get enumInteger * @return enumInteger */ - @JsonProperty("enum_integer") @ApiModelProperty(value = "") + @JsonProperty("enum_integer") public EnumIntegerEnum getEnumInteger() { return enumInteger; } @@ -249,9 +249,9 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) { * Get enumNumber * @return enumNumber */ - @JsonProperty("enum_number") @ApiModelProperty(value = "") + @JsonProperty("enum_number") public EnumNumberEnum getEnumNumber() { return enumNumber; } @@ -269,9 +269,9 @@ public EnumTest outerEnum(OuterEnum outerEnum) { * Get outerEnum * @return outerEnum */ - @JsonProperty("outerEnum") @Valid @ApiModelProperty(value = "") + @JsonProperty("outerEnum") public OuterEnum getOuterEnum() { return outerEnum; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/File.java index 43c44fd344bb..fedeea1c6389 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/File.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/File.java @@ -34,9 +34,9 @@ public File sourceURI(String sourceURI) { * Test capitalization * @return sourceURI */ - @JsonProperty("sourceURI") @ApiModelProperty(value = "Test capitalization") + @JsonProperty("sourceURI") public String getSourceURI() { return sourceURI; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FileSchemaTestClass.java index d7815943b774..81fc87926e00 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -39,9 +39,9 @@ public FileSchemaTestClass file(File file) { * Get file * @return file */ - @JsonProperty("file") @Valid @ApiModelProperty(value = "") + @JsonProperty("file") public File getFile() { return file; } @@ -67,9 +67,9 @@ public FileSchemaTestClass addFilesItem(File filesItem) { * Get files * @return files */ - @JsonProperty("files") @Valid @ApiModelProperty(value = "") + @JsonProperty("files") public List getFiles() { return files; } 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 ffd18f0ce221..e8697b47182b 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 @@ -71,9 +71,9 @@ public FormatTest integer(Integer integer) { * maximum: 100 * @return integer */ - @JsonProperty("integer") @Min(10) @Max(100) @ApiModelProperty(value = "") + @JsonProperty("integer") public Integer getInteger() { return integer; } @@ -93,9 +93,9 @@ public FormatTest int32(Integer int32) { * maximum: 200 * @return int32 */ - @JsonProperty("int32") @Min(20) @Max(200) @ApiModelProperty(value = "") + @JsonProperty("int32") public Integer getInt32() { return int32; } @@ -113,9 +113,9 @@ public FormatTest int64(Long int64) { * Get int64 * @return int64 */ - @JsonProperty("int64") @ApiModelProperty(value = "") + @JsonProperty("int64") public Long getInt64() { return int64; } @@ -135,9 +135,9 @@ public FormatTest number(BigDecimal number) { * maximum: 543.2 * @return number */ - @JsonProperty("number") @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") @ApiModelProperty(required = true, value = "") + @JsonProperty("number") public BigDecimal getNumber() { return number; } @@ -157,9 +157,9 @@ public FormatTest _float(Float _float) { * maximum: 987.6 * @return _float */ - @JsonProperty("float") @DecimalMin("54.3") @DecimalMax("987.6") @ApiModelProperty(value = "") + @JsonProperty("float") public Float getFloat() { return _float; } @@ -179,9 +179,9 @@ public FormatTest _double(Double _double) { * maximum: 123.4 * @return _double */ - @JsonProperty("double") @DecimalMin("67.8") @DecimalMax("123.4") @ApiModelProperty(value = "") + @JsonProperty("double") public Double getDouble() { return _double; } @@ -199,9 +199,9 @@ public FormatTest string(String string) { * Get string * @return string */ - @JsonProperty("string") @Pattern(regexp = "/[a-z]/i") @ApiModelProperty(value = "") + @JsonProperty("string") public String getString() { return string; } @@ -219,9 +219,9 @@ public FormatTest _byte(byte[] _byte) { * Get _byte * @return _byte */ - @JsonProperty("byte") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("byte") public byte[] getByte() { return _byte; } @@ -239,9 +239,9 @@ public FormatTest binary(org.springframework.core.io.Resource binary) { * Get binary * @return binary */ - @JsonProperty("binary") @Valid @ApiModelProperty(value = "") + @JsonProperty("binary") public org.springframework.core.io.Resource getBinary() { return binary; } @@ -259,9 +259,9 @@ public FormatTest date(LocalDate date) { * Get date * @return date */ - @JsonProperty("date") @NotNull @Valid @ApiModelProperty(required = true, value = "") + @JsonProperty("date") public LocalDate getDate() { return date; } @@ -279,9 +279,9 @@ public FormatTest dateTime(OffsetDateTime dateTime) { * Get dateTime * @return dateTime */ - @JsonProperty("dateTime") @Valid @ApiModelProperty(value = "") + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -299,9 +299,9 @@ public FormatTest uuid(UUID uuid) { * Get uuid * @return uuid */ - @JsonProperty("uuid") @Valid @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -319,9 +319,9 @@ public FormatTest password(String password) { * Get password * @return password */ - @JsonProperty("password") @NotNull @Size(min = 10, max = 64) @ApiModelProperty(required = true, value = "") + @JsonProperty("password") public String getPassword() { return password; } @@ -339,9 +339,9 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) { * Get bigDecimal * @return bigDecimal */ - @JsonProperty("BigDecimal") @Valid @ApiModelProperty(value = "") + @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { return bigDecimal; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index 948ed9a0731d..21a424459798 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -37,9 +37,9 @@ public HasOnlyReadOnly bar(String bar) { * Get bar * @return bar */ - @JsonProperty("bar") @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("bar") public String getBar() { return bar; } @@ -57,9 +57,9 @@ public HasOnlyReadOnly foo(String foo) { * Get foo * @return foo */ - @JsonProperty("foo") @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("foo") public String getFoo() { return foo; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MapTest.java index 94d4ae9a9d56..76c6bee7adcb 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MapTest.java @@ -89,9 +89,9 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapMapOfString * @return mapMapOfString */ - @JsonProperty("map_map_of_string") @Valid @ApiModelProperty(value = "") + @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { return mapMapOfString; } @@ -117,9 +117,9 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) * Get mapOfEnumString * @return mapOfEnumString */ - @JsonProperty("map_of_enum_string") @ApiModelProperty(value = "") + @JsonProperty("map_of_enum_string") public Map getMapOfEnumString() { return mapOfEnumString; } @@ -145,9 +145,9 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) { * Get directMap * @return directMap */ - @JsonProperty("direct_map") @ApiModelProperty(value = "") + @JsonProperty("direct_map") public Map getDirectMap() { return directMap; } @@ -173,9 +173,9 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) { * Get indirectMap * @return indirectMap */ - @JsonProperty("indirect_map") @ApiModelProperty(value = "") + @JsonProperty("indirect_map") public Map getIndirectMap() { return indirectMap; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 89a2475d82fb..f9e2230eba97 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -45,9 +45,9 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { * Get uuid * @return uuid */ - @JsonProperty("uuid") @Valid @ApiModelProperty(value = "") + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -65,9 +65,9 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT * Get dateTime * @return dateTime */ - @JsonProperty("dateTime") @Valid @ApiModelProperty(value = "") + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -93,9 +93,9 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * Get map * @return map */ - @JsonProperty("map") @Valid @ApiModelProperty(value = "") + @JsonProperty("map") public Map getMap() { return map; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Model200Response.java index 220b6493f31a..193231f85457 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Model200Response.java @@ -38,9 +38,9 @@ public Model200Response name(Integer name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public Integer getName() { return name; } @@ -58,9 +58,9 @@ public Model200Response propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ - @JsonProperty("class") @ApiModelProperty(value = "") + @JsonProperty("class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java index 29f3f43cf20e..693e1669879c 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -39,9 +39,9 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ - @JsonProperty("code") @ApiModelProperty(value = "") + @JsonProperty("code") public Integer getCode() { return code; } @@ -59,9 +59,9 @@ public ModelApiResponse type(String type) { * Get type * @return type */ - @JsonProperty("type") @ApiModelProperty(value = "") + @JsonProperty("type") public String getType() { return type; } @@ -79,9 +79,9 @@ public ModelApiResponse message(String message) { * Get message * @return message */ - @JsonProperty("message") @ApiModelProperty(value = "") + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelList.java index a374fe83d52a..7853f3d408a0 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelList.java @@ -35,9 +35,9 @@ public ModelList _123list(String _123list) { * Get _123list * @return _123list */ - @JsonProperty("123-list") @ApiModelProperty(value = "") + @JsonProperty("123-list") public String get123list() { return _123list; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelReturn.java index d8fc618d9dfb..b6f106cea222 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelReturn.java @@ -36,9 +36,9 @@ public ModelReturn _return(Integer _return) { * Get _return * @return _return */ - @JsonProperty("return") @ApiModelProperty(value = "") + @JsonProperty("return") public Integer getReturn() { return _return; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Name.java index 054901b488d6..32403fe65891 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Name.java @@ -40,9 +40,9 @@ public Name name(Integer name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("name") public Integer getName() { return name; } @@ -60,9 +60,9 @@ public Name snakeCase(Integer snakeCase) { * Get snakeCase * @return snakeCase */ - @JsonProperty("snake_case") @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("snake_case") public Integer getSnakeCase() { return snakeCase; } @@ -80,9 +80,9 @@ public Name property(String property) { * Get property * @return property */ - @JsonProperty("property") @ApiModelProperty(value = "") + @JsonProperty("property") public String getProperty() { return property; } @@ -100,9 +100,9 @@ public Name _123number(Integer _123number) { * Get _123number * @return _123number */ - @JsonProperty("123Number") @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("123Number") public Integer get123number() { return _123number; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/NumberOnly.java index 8f2f2b19b191..1e3f9e15421d 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/NumberOnly.java @@ -34,9 +34,9 @@ public NumberOnly justNumber(BigDecimal justNumber) { * Get justNumber * @return justNumber */ - @JsonProperty("JustNumber") @Valid @ApiModelProperty(value = "") + @JsonProperty("JustNumber") public BigDecimal getJustNumber() { return justNumber; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Order.java index feac4d2cad8d..b24c70c07808 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Order.java @@ -84,9 +84,9 @@ public Order id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -104,9 +104,9 @@ public Order petId(Long petId) { * Get petId * @return petId */ - @JsonProperty("petId") @ApiModelProperty(value = "") + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -124,9 +124,9 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ - @JsonProperty("quantity") @ApiModelProperty(value = "") + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -144,9 +144,9 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ - @JsonProperty("shipDate") @Valid @ApiModelProperty(value = "") + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -164,9 +164,9 @@ public Order status(StatusEnum status) { * Order Status * @return status */ - @JsonProperty("status") @ApiModelProperty(value = "Order Status") + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -184,9 +184,9 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ - @JsonProperty("complete") @ApiModelProperty(value = "") + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/OuterComposite.java index 00cce99097d7..ade2b9150190 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/OuterComposite.java @@ -38,9 +38,9 @@ public OuterComposite myNumber(BigDecimal myNumber) { * Get myNumber * @return myNumber */ - @JsonProperty("my_number") @Valid @ApiModelProperty(value = "") + @JsonProperty("my_number") public BigDecimal getMyNumber() { return myNumber; } @@ -58,9 +58,9 @@ public OuterComposite myString(String myString) { * Get myString * @return myString */ - @JsonProperty("my_string") @ApiModelProperty(value = "") + @JsonProperty("my_string") public String getMyString() { return myString; } @@ -78,9 +78,9 @@ public OuterComposite myBoolean(Boolean myBoolean) { * Get myBoolean * @return myBoolean */ - @JsonProperty("my_boolean") @ApiModelProperty(value = "") + @JsonProperty("my_boolean") public Boolean getMyBoolean() { return myBoolean; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Pet.java index 1d8ef7f7160f..571dc12b9f77 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Pet.java @@ -87,9 +87,9 @@ public Pet id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -107,9 +107,9 @@ public Pet category(Category category) { * Get category * @return category */ - @JsonProperty("category") @Valid @ApiModelProperty(value = "") + @JsonProperty("category") public Category getCategory() { return category; } @@ -127,9 +127,9 @@ public Pet name(String name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") + @JsonProperty("name") public String getName() { return name; } @@ -152,9 +152,9 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ - @JsonProperty("photoUrls") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; } @@ -180,9 +180,9 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @JsonProperty("tags") @Valid @ApiModelProperty(value = "") + @JsonProperty("tags") public List getTags() { return tags; } @@ -200,9 +200,9 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ - @JsonProperty("status") @ApiModelProperty(value = "pet status in the store") + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ReadOnlyFirst.java index d02b8c8cfd53..3eb0ebe069c1 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -35,9 +35,9 @@ public ReadOnlyFirst bar(String bar) { * Get bar * @return bar */ - @JsonProperty("bar") @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("bar") public String getBar() { return bar; } @@ -55,9 +55,9 @@ public ReadOnlyFirst baz(String baz) { * Get baz * @return baz */ - @JsonProperty("baz") @ApiModelProperty(value = "") + @JsonProperty("baz") public String getBaz() { return baz; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/SpecialModelName.java index 8f176362e027..668035becd14 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/SpecialModelName.java @@ -35,9 +35,9 @@ public class SpecialModelName { * Get $specialPropertyName * @return $specialPropertyName */ - @JsonProperty("$special[property.name]") @ApiModelProperty(value = "") + @JsonProperty("$special[property.name]") public Long get$SpecialPropertyName() { return $specialPropertyName; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Tag.java index f7797bef2f19..527e777278e2 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Tag.java @@ -35,9 +35,9 @@ public Tag id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -55,9 +55,9 @@ public Tag name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderDefault.java index 506efbf431c1..41ba1c5bf1f3 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -45,9 +45,9 @@ public TypeHolderDefault stringItem(String stringItem) { * Get stringItem * @return stringItem */ - @JsonProperty("string_item") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -65,9 +65,9 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ - @JsonProperty("number_item") @NotNull @Valid @ApiModelProperty(required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -85,9 +85,9 @@ public TypeHolderDefault integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ - @JsonProperty("integer_item") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -105,9 +105,9 @@ public TypeHolderDefault boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ - @JsonProperty("bool_item") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -130,9 +130,9 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ - @JsonProperty("array_item") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderExample.java index 806c0c90fa18..8e1a76f88fdc 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -47,9 +47,9 @@ public TypeHolderExample stringItem(String stringItem) { * Get stringItem * @return stringItem */ - @JsonProperty("string_item") @NotNull @ApiModelProperty(example = "what", required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -67,9 +67,9 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ - @JsonProperty("number_item") @NotNull @Valid @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -87,9 +87,9 @@ public TypeHolderExample floatItem(Float floatItem) { * Get floatItem * @return floatItem */ - @JsonProperty("float_item") @NotNull @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("float_item") public Float getFloatItem() { return floatItem; } @@ -107,9 +107,9 @@ public TypeHolderExample integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ - @JsonProperty("integer_item") @NotNull @ApiModelProperty(example = "-2", required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -127,9 +127,9 @@ public TypeHolderExample boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ - @JsonProperty("bool_item") @NotNull @ApiModelProperty(example = "true", required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -152,9 +152,9 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ - @JsonProperty("array_item") @NotNull @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/User.java index f42832389ffe..36d29ba307d0 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/User.java @@ -47,9 +47,9 @@ public User id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -67,9 +67,9 @@ public User username(String username) { * Get username * @return username */ - @JsonProperty("username") @ApiModelProperty(value = "") + @JsonProperty("username") public String getUsername() { return username; } @@ -87,9 +87,9 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ - @JsonProperty("firstName") @ApiModelProperty(value = "") + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -107,9 +107,9 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ - @JsonProperty("lastName") @ApiModelProperty(value = "") + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -127,9 +127,9 @@ public User email(String email) { * Get email * @return email */ - @JsonProperty("email") @ApiModelProperty(value = "") + @JsonProperty("email") public String getEmail() { return email; } @@ -147,9 +147,9 @@ public User password(String password) { * Get password * @return password */ - @JsonProperty("password") @ApiModelProperty(value = "") + @JsonProperty("password") public String getPassword() { return password; } @@ -167,9 +167,9 @@ public User phone(String phone) { * Get phone * @return phone */ - @JsonProperty("phone") @ApiModelProperty(value = "") + @JsonProperty("phone") public String getPhone() { return phone; } @@ -187,9 +187,9 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ - @JsonProperty("userStatus") @ApiModelProperty(value = "User Status") + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/XmlItem.java index c795b4b85e6d..3a8d108bdbce 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/XmlItem.java @@ -101,9 +101,9 @@ public XmlItem attributeString(String attributeString) { * Get attributeString * @return attributeString */ - @JsonProperty("attribute_string") @ApiModelProperty(example = "string", value = "") + @JsonProperty("attribute_string") public String getAttributeString() { return attributeString; } @@ -121,9 +121,9 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) { * Get attributeNumber * @return attributeNumber */ - @JsonProperty("attribute_number") @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("attribute_number") public BigDecimal getAttributeNumber() { return attributeNumber; } @@ -141,9 +141,9 @@ public XmlItem attributeInteger(Integer attributeInteger) { * Get attributeInteger * @return attributeInteger */ - @JsonProperty("attribute_integer") @ApiModelProperty(example = "-2", value = "") + @JsonProperty("attribute_integer") public Integer getAttributeInteger() { return attributeInteger; } @@ -161,9 +161,9 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) { * Get attributeBoolean * @return attributeBoolean */ - @JsonProperty("attribute_boolean") @ApiModelProperty(example = "true", value = "") + @JsonProperty("attribute_boolean") public Boolean getAttributeBoolean() { return attributeBoolean; } @@ -189,9 +189,9 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) { * Get wrappedArray * @return wrappedArray */ - @JsonProperty("wrapped_array") @ApiModelProperty(value = "") + @JsonProperty("wrapped_array") public List getWrappedArray() { return wrappedArray; } @@ -209,9 +209,9 @@ public XmlItem nameString(String nameString) { * Get nameString * @return nameString */ - @JsonProperty("name_string") @ApiModelProperty(example = "string", value = "") + @JsonProperty("name_string") public String getNameString() { return nameString; } @@ -229,9 +229,9 @@ public XmlItem nameNumber(BigDecimal nameNumber) { * Get nameNumber * @return nameNumber */ - @JsonProperty("name_number") @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("name_number") public BigDecimal getNameNumber() { return nameNumber; } @@ -249,9 +249,9 @@ public XmlItem nameInteger(Integer nameInteger) { * Get nameInteger * @return nameInteger */ - @JsonProperty("name_integer") @ApiModelProperty(example = "-2", value = "") + @JsonProperty("name_integer") public Integer getNameInteger() { return nameInteger; } @@ -269,9 +269,9 @@ public XmlItem nameBoolean(Boolean nameBoolean) { * Get nameBoolean * @return nameBoolean */ - @JsonProperty("name_boolean") @ApiModelProperty(example = "true", value = "") + @JsonProperty("name_boolean") public Boolean getNameBoolean() { return nameBoolean; } @@ -297,9 +297,9 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) { * Get nameArray * @return nameArray */ - @JsonProperty("name_array") @ApiModelProperty(value = "") + @JsonProperty("name_array") public List getNameArray() { return nameArray; } @@ -325,9 +325,9 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) { * Get nameWrappedArray * @return nameWrappedArray */ - @JsonProperty("name_wrapped_array") @ApiModelProperty(value = "") + @JsonProperty("name_wrapped_array") public List getNameWrappedArray() { return nameWrappedArray; } @@ -345,9 +345,9 @@ public XmlItem prefixString(String prefixString) { * Get prefixString * @return prefixString */ - @JsonProperty("prefix_string") @ApiModelProperty(example = "string", value = "") + @JsonProperty("prefix_string") public String getPrefixString() { return prefixString; } @@ -365,9 +365,9 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) { * Get prefixNumber * @return prefixNumber */ - @JsonProperty("prefix_number") @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("prefix_number") public BigDecimal getPrefixNumber() { return prefixNumber; } @@ -385,9 +385,9 @@ public XmlItem prefixInteger(Integer prefixInteger) { * Get prefixInteger * @return prefixInteger */ - @JsonProperty("prefix_integer") @ApiModelProperty(example = "-2", value = "") + @JsonProperty("prefix_integer") public Integer getPrefixInteger() { return prefixInteger; } @@ -405,9 +405,9 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) { * Get prefixBoolean * @return prefixBoolean */ - @JsonProperty("prefix_boolean") @ApiModelProperty(example = "true", value = "") + @JsonProperty("prefix_boolean") public Boolean getPrefixBoolean() { return prefixBoolean; } @@ -433,9 +433,9 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) { * Get prefixArray * @return prefixArray */ - @JsonProperty("prefix_array") @ApiModelProperty(value = "") + @JsonProperty("prefix_array") public List getPrefixArray() { return prefixArray; } @@ -461,9 +461,9 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) { * Get prefixWrappedArray * @return prefixWrappedArray */ - @JsonProperty("prefix_wrapped_array") @ApiModelProperty(value = "") + @JsonProperty("prefix_wrapped_array") public List getPrefixWrappedArray() { return prefixWrappedArray; } @@ -481,9 +481,9 @@ public XmlItem namespaceString(String namespaceString) { * Get namespaceString * @return namespaceString */ - @JsonProperty("namespace_string") @ApiModelProperty(example = "string", value = "") + @JsonProperty("namespace_string") public String getNamespaceString() { return namespaceString; } @@ -501,9 +501,9 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) { * Get namespaceNumber * @return namespaceNumber */ - @JsonProperty("namespace_number") @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("namespace_number") public BigDecimal getNamespaceNumber() { return namespaceNumber; } @@ -521,9 +521,9 @@ public XmlItem namespaceInteger(Integer namespaceInteger) { * Get namespaceInteger * @return namespaceInteger */ - @JsonProperty("namespace_integer") @ApiModelProperty(example = "-2", value = "") + @JsonProperty("namespace_integer") public Integer getNamespaceInteger() { return namespaceInteger; } @@ -541,9 +541,9 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) { * Get namespaceBoolean * @return namespaceBoolean */ - @JsonProperty("namespace_boolean") @ApiModelProperty(example = "true", value = "") + @JsonProperty("namespace_boolean") public Boolean getNamespaceBoolean() { return namespaceBoolean; } @@ -569,9 +569,9 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) { * Get namespaceArray * @return namespaceArray */ - @JsonProperty("namespace_array") @ApiModelProperty(value = "") + @JsonProperty("namespace_array") public List getNamespaceArray() { return namespaceArray; } @@ -597,9 +597,9 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) { * Get namespaceWrappedArray * @return namespaceWrappedArray */ - @JsonProperty("namespace_wrapped_array") @ApiModelProperty(value = "") + @JsonProperty("namespace_wrapped_array") public List getNamespaceWrappedArray() { return namespaceWrappedArray; } @@ -617,9 +617,9 @@ public XmlItem prefixNsString(String prefixNsString) { * Get prefixNsString * @return prefixNsString */ - @JsonProperty("prefix_ns_string") @ApiModelProperty(example = "string", value = "") + @JsonProperty("prefix_ns_string") public String getPrefixNsString() { return prefixNsString; } @@ -637,9 +637,9 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) { * Get prefixNsNumber * @return prefixNsNumber */ - @JsonProperty("prefix_ns_number") @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("prefix_ns_number") public BigDecimal getPrefixNsNumber() { return prefixNsNumber; } @@ -657,9 +657,9 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) { * Get prefixNsInteger * @return prefixNsInteger */ - @JsonProperty("prefix_ns_integer") @ApiModelProperty(example = "-2", value = "") + @JsonProperty("prefix_ns_integer") public Integer getPrefixNsInteger() { return prefixNsInteger; } @@ -677,9 +677,9 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) { * Get prefixNsBoolean * @return prefixNsBoolean */ - @JsonProperty("prefix_ns_boolean") @ApiModelProperty(example = "true", value = "") + @JsonProperty("prefix_ns_boolean") public Boolean getPrefixNsBoolean() { return prefixNsBoolean; } @@ -705,9 +705,9 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) { * Get prefixNsArray * @return prefixNsArray */ - @JsonProperty("prefix_ns_array") @ApiModelProperty(value = "") + @JsonProperty("prefix_ns_array") public List getPrefixNsArray() { return prefixNsArray; } @@ -733,9 +733,9 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) { * Get prefixNsWrappedArray * @return prefixNsWrappedArray */ - @JsonProperty("prefix_ns_wrapped_array") @ApiModelProperty(value = "") + @JsonProperty("prefix_ns_wrapped_array") public List getPrefixNsWrappedArray() { return prefixNsWrappedArray; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-spring-pageable/src/main/resources/openapi.yaml index d28bcff839b2..81cc16dcab22 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-spring-pageable/src/main/resources/openapi.yaml @@ -2105,7 +2105,6 @@ components: status: description: Updated status of the pet type: string - type: object uploadFile_request: properties: additionalMetadata: @@ -2115,7 +2114,6 @@ components: description: file to upload format: binary type: string - type: object testEnumParameters_request: properties: enum_form_string_array: @@ -2135,7 +2133,6 @@ components: - -efg - (xyz) type: string - type: object testEndpointParameters_request: properties: integer: @@ -2208,7 +2205,6 @@ components: - double - number - pattern_without_delimiter - type: object testJsonFormData_request: properties: param: @@ -2220,7 +2216,6 @@ components: required: - param - param2 - type: object uploadFileWithRequiredFile_request: properties: additionalMetadata: @@ -2232,7 +2227,6 @@ components: type: string required: - requiredFile - type: object Dog_allOf: properties: breed: diff --git a/samples/server/petstore/springboot-useoptional/.openapi-generator/FILES b/samples/server/petstore/springboot-useoptional/.openapi-generator/FILES index 3c2e959bec02..32fdc6a9409b 100644 --- a/samples/server/petstore/springboot-useoptional/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-useoptional/.openapi-generator/FILES @@ -15,7 +15,6 @@ src/main/java/org/openapitools/api/StoreApi.java src/main/java/org/openapitools/api/StoreApiController.java src/main/java/org/openapitools/api/UserApi.java src/main/java/org/openapitools/api/UserApiController.java -src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/configuration/SpringFoxConfiguration.java src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java diff --git a/samples/server/petstore/springboot-useoptional/.openapi-generator/VERSION b/samples/server/petstore/springboot-useoptional/.openapi-generator/VERSION index d6b4ec4aa783..ed829dbcddec 100644 --- a/samples/server/petstore/springboot-useoptional/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-useoptional/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0-SNAPSHOT \ No newline at end of file +6.2.1-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java index b45fcc5dc16c..9ecd403de93c 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApiController.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApiController.java index c2db7ca5a815..65c9de6908c2 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApiController.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApiController.java @@ -28,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class AnotherFakeApiController implements AnotherFakeApi { private final NativeWebRequest request; 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 b8085e150ec5..f89cbd4f321a 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApiController.java index 5ae5d5fed985..b30f53bb595c 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApiController.java @@ -38,7 +38,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeApiController implements FakeApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index d54c2670f8e2..decd021376d6 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java index 65b695629d43..05196793d4c2 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java @@ -28,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeClassnameTestApiController implements FakeClassnameTestApi { private final NativeWebRequest request; 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 6d85c297c392..a72f4d9c2ffb 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApiController.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApiController.java index ea6c56e02c11..0b88e5980bf1 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApiController.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApiController.java @@ -30,7 +30,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class PetApiController implements PetApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java index 1afb547b40ee..f4319f650f50 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApiController.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApiController.java index 1292dc0b721d..f8c784ff3838 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApiController.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApiController.java @@ -29,7 +29,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class StoreApiController implements StoreApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java index 981e3a95cbe6..e458b4a0b8bf 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApiController.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApiController.java index ca00184d2a56..894bf6db762e 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApiController.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApiController.java @@ -30,7 +30,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class UserApiController implements UserApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index cb51920a8c28..686fafb2faaf 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -35,9 +35,9 @@ public AdditionalPropertiesAnyType name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 1c66a636116f..a2c3df24a2df 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -36,9 +36,9 @@ public AdditionalPropertiesArray name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 1dcc607639bf..82fcada6f56a 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -35,9 +35,9 @@ public AdditionalPropertiesBoolean name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 74250eb564ad..7b720b30d83a 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -73,9 +73,9 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt * Get mapString * @return mapString */ - @JsonProperty("map_string") @ApiModelProperty(value = "") + @JsonProperty("map_string") public Map getMapString() { return mapString; } @@ -101,9 +101,9 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * Get mapNumber * @return mapNumber */ - @JsonProperty("map_number") @Valid @ApiModelProperty(value = "") + @JsonProperty("map_number") public Map getMapNumber() { return mapNumber; } @@ -129,9 +129,9 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege * Get mapInteger * @return mapInteger */ - @JsonProperty("map_integer") @ApiModelProperty(value = "") + @JsonProperty("map_integer") public Map getMapInteger() { return mapInteger; } @@ -157,9 +157,9 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea * Get mapBoolean * @return mapBoolean */ - @JsonProperty("map_boolean") @ApiModelProperty(value = "") + @JsonProperty("map_boolean") public Map getMapBoolean() { return mapBoolean; } @@ -185,9 +185,9 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { return mapArrayInteger; } @@ -213,9 +213,9 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * Get mapArrayAnytype * @return mapArrayAnytype */ - @JsonProperty("map_array_anytype") @Valid @ApiModelProperty(value = "") + @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { return mapArrayAnytype; } @@ -241,9 +241,9 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { return mapMapString; } @@ -269,9 +269,9 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { return mapMapAnytype; } @@ -289,9 +289,9 @@ public AdditionalPropertiesClass anytype1(Object anytype1) { * Get anytype1 * @return anytype1 */ - @JsonProperty("anytype_1") @ApiModelProperty(value = "") + @JsonProperty("anytype_1") public Object getAnytype1() { return anytype1; } @@ -309,9 +309,9 @@ public AdditionalPropertiesClass anytype2(Object anytype2) { * Get anytype2 * @return anytype2 */ - @JsonProperty("anytype_2") @ApiModelProperty(value = "") + @JsonProperty("anytype_2") public Object getAnytype2() { return anytype2; } @@ -329,9 +329,9 @@ public AdditionalPropertiesClass anytype3(Object anytype3) { * Get anytype3 * @return anytype3 */ - @JsonProperty("anytype_3") @ApiModelProperty(value = "") + @JsonProperty("anytype_3") public Object getAnytype3() { return anytype3; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index ce8b8d62436c..ea2ec5365edc 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -35,9 +35,9 @@ public AdditionalPropertiesInteger name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index dec791e0a273..4ca4b5a2f509 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -36,9 +36,9 @@ public AdditionalPropertiesNumber name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 546d0ab9216f..7b9d8ef0b0b2 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -35,9 +35,9 @@ public AdditionalPropertiesObject name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index c1f95cf62e81..fdc4baa9de7b 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -35,9 +35,9 @@ public AdditionalPropertiesString name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Animal.java index e880f829164c..dfb303255b3b 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Animal.java @@ -52,9 +52,9 @@ public Animal className(String className) { * Get className * @return className */ - @JsonProperty("className") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("className") public String getClassName() { return className; } @@ -72,9 +72,9 @@ public Animal color(String color) { * Get color * @return color */ - @JsonProperty("color") @ApiModelProperty(value = "") + @JsonProperty("color") public String getColor() { return color; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 46ab3b631960..42b8443e9be2 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -45,9 +45,9 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * Get arrayArrayNumber * @return arrayArrayNumber */ - @JsonProperty("ArrayArrayNumber") @Valid @ApiModelProperty(value = "") + @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index cb5358905469..f60290a4d8ad 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -45,9 +45,9 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ - @JsonProperty("ArrayNumber") @Valid @ApiModelProperty(value = "") + @JsonProperty("ArrayNumber") public List getArrayNumber() { return arrayNumber; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java index 55cc431ecde6..8bb3f76ca666 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java @@ -51,9 +51,9 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) { * Get arrayOfString * @return arrayOfString */ - @JsonProperty("array_of_string") @ApiModelProperty(value = "") + @JsonProperty("array_of_string") public List getArrayOfString() { return arrayOfString; } @@ -79,9 +79,9 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ - @JsonProperty("array_array_of_integer") @Valid @ApiModelProperty(value = "") + @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; } @@ -107,9 +107,9 @@ public ArrayTest addArrayArrayOfModelItem(List arrayArrayOfModelI * Get arrayArrayOfModel * @return arrayArrayOfModel */ - @JsonProperty("array_array_of_model") @Valid @ApiModelProperty(value = "") + @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java index 70bbb0b93532..16372fb10406 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java @@ -78,9 +78,9 @@ public BigCat kind(KindEnum kind) { * Get kind * @return kind */ - @JsonProperty("kind") @ApiModelProperty(value = "") + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCatAllOf.java index 1a86665050e6..59ab1d8d2bf8 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCatAllOf.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCatAllOf.java @@ -75,9 +75,9 @@ public BigCatAllOf kind(KindEnum kind) { * Get kind * @return kind */ - @JsonProperty("kind") @ApiModelProperty(value = "") + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Capitalization.java index e0fdbe78bae2..feb0d643c5e5 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Capitalization.java @@ -43,9 +43,9 @@ public Capitalization smallCamel(String smallCamel) { * Get smallCamel * @return smallCamel */ - @JsonProperty("smallCamel") @ApiModelProperty(value = "") + @JsonProperty("smallCamel") public String getSmallCamel() { return smallCamel; } @@ -63,9 +63,9 @@ public Capitalization capitalCamel(String capitalCamel) { * Get capitalCamel * @return capitalCamel */ - @JsonProperty("CapitalCamel") @ApiModelProperty(value = "") + @JsonProperty("CapitalCamel") public String getCapitalCamel() { return capitalCamel; } @@ -83,9 +83,9 @@ public Capitalization smallSnake(String smallSnake) { * Get smallSnake * @return smallSnake */ - @JsonProperty("small_Snake") @ApiModelProperty(value = "") + @JsonProperty("small_Snake") public String getSmallSnake() { return smallSnake; } @@ -103,9 +103,9 @@ public Capitalization capitalSnake(String capitalSnake) { * Get capitalSnake * @return capitalSnake */ - @JsonProperty("Capital_Snake") @ApiModelProperty(value = "") + @JsonProperty("Capital_Snake") public String getCapitalSnake() { return capitalSnake; } @@ -123,9 +123,9 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) { * Get scAETHFlowPoints * @return scAETHFlowPoints */ - @JsonProperty("SCA_ETH_Flow_Points") @ApiModelProperty(value = "") + @JsonProperty("SCA_ETH_Flow_Points") public String getScAETHFlowPoints() { return scAETHFlowPoints; } @@ -143,9 +143,9 @@ public Capitalization ATT_NAME(String ATT_NAME) { * Name of the pet * @return ATT_NAME */ - @JsonProperty("ATT_NAME") @ApiModelProperty(value = "Name of the pet ") + @JsonProperty("ATT_NAME") public String getATTNAME() { return ATT_NAME; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java index 958fcb2298e0..04fd58e2e14a 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java @@ -47,9 +47,9 @@ public Cat declawed(Boolean declawed) { * Get declawed * @return declawed */ - @JsonProperty("declawed") @ApiModelProperty(value = "") + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/CatAllOf.java index 63de2ad8818e..85c6885ae000 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/CatAllOf.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/CatAllOf.java @@ -35,9 +35,9 @@ public CatAllOf declawed(Boolean declawed) { * Get declawed * @return declawed */ - @JsonProperty("declawed") @ApiModelProperty(value = "") + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Category.java index b63268b2c8ce..3b813dcea538 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Category.java @@ -35,9 +35,9 @@ public Category id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -55,9 +55,9 @@ public Category name(String name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ClassModel.java index 976f0b01d071..2c511abe3ecb 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ClassModel.java @@ -34,9 +34,9 @@ public ClassModel propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ - @JsonProperty("_class") @ApiModelProperty(value = "") + @JsonProperty("_class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Client.java index a3c4731f3339..a6bfdf58db7f 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Client.java @@ -33,9 +33,9 @@ public Client client(String client) { * Get client * @return client */ - @JsonProperty("client") @ApiModelProperty(value = "") + @JsonProperty("client") public String getClient() { return client; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Dog.java index 593562fabb42..a75ee6095e33 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Dog.java @@ -38,9 +38,9 @@ public Dog breed(String breed) { * Get breed * @return breed */ - @JsonProperty("breed") @ApiModelProperty(value = "") + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/DogAllOf.java index 7ddb24717737..5784d207b4d2 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/DogAllOf.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/DogAllOf.java @@ -35,9 +35,9 @@ public DogAllOf breed(String breed) { * Get breed * @return breed */ - @JsonProperty("breed") @ApiModelProperty(value = "") + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java index 04e850b1cf17..43a28057b120 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java @@ -109,9 +109,9 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) { * Get justSymbol * @return justSymbol */ - @JsonProperty("just_symbol") @ApiModelProperty(value = "") + @JsonProperty("just_symbol") public JustSymbolEnum getJustSymbol() { return justSymbol; } @@ -137,9 +137,9 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) { * Get arrayEnum * @return arrayEnum */ - @JsonProperty("array_enum") @ApiModelProperty(value = "") + @JsonProperty("array_enum") public List getArrayEnum() { return arrayEnum; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java index 49747f67dccf..3f7af66d4ce7 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java @@ -189,9 +189,9 @@ public EnumTest enumString(EnumStringEnum enumString) { * Get enumString * @return enumString */ - @JsonProperty("enum_string") @ApiModelProperty(value = "") + @JsonProperty("enum_string") public EnumStringEnum getEnumString() { return enumString; } @@ -209,9 +209,9 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) { * Get enumStringRequired * @return enumStringRequired */ - @JsonProperty("enum_string_required") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("enum_string_required") public EnumStringRequiredEnum getEnumStringRequired() { return enumStringRequired; } @@ -229,9 +229,9 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) { * Get enumInteger * @return enumInteger */ - @JsonProperty("enum_integer") @ApiModelProperty(value = "") + @JsonProperty("enum_integer") public EnumIntegerEnum getEnumInteger() { return enumInteger; } @@ -249,9 +249,9 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) { * Get enumNumber * @return enumNumber */ - @JsonProperty("enum_number") @ApiModelProperty(value = "") + @JsonProperty("enum_number") public EnumNumberEnum getEnumNumber() { return enumNumber; } @@ -269,9 +269,9 @@ public EnumTest outerEnum(OuterEnum outerEnum) { * Get outerEnum * @return outerEnum */ - @JsonProperty("outerEnum") @Valid @ApiModelProperty(value = "") + @JsonProperty("outerEnum") public OuterEnum getOuterEnum() { return outerEnum; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/File.java index 43c44fd344bb..fedeea1c6389 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/File.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/File.java @@ -34,9 +34,9 @@ public File sourceURI(String sourceURI) { * Test capitalization * @return sourceURI */ - @JsonProperty("sourceURI") @ApiModelProperty(value = "Test capitalization") + @JsonProperty("sourceURI") public String getSourceURI() { return sourceURI; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java index d7815943b774..81fc87926e00 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -39,9 +39,9 @@ public FileSchemaTestClass file(File file) { * Get file * @return file */ - @JsonProperty("file") @Valid @ApiModelProperty(value = "") + @JsonProperty("file") public File getFile() { return file; } @@ -67,9 +67,9 @@ public FileSchemaTestClass addFilesItem(File filesItem) { * Get files * @return files */ - @JsonProperty("files") @Valid @ApiModelProperty(value = "") + @JsonProperty("files") public List getFiles() { return files; } 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 ffd18f0ce221..e8697b47182b 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 @@ -71,9 +71,9 @@ public FormatTest integer(Integer integer) { * maximum: 100 * @return integer */ - @JsonProperty("integer") @Min(10) @Max(100) @ApiModelProperty(value = "") + @JsonProperty("integer") public Integer getInteger() { return integer; } @@ -93,9 +93,9 @@ public FormatTest int32(Integer int32) { * maximum: 200 * @return int32 */ - @JsonProperty("int32") @Min(20) @Max(200) @ApiModelProperty(value = "") + @JsonProperty("int32") public Integer getInt32() { return int32; } @@ -113,9 +113,9 @@ public FormatTest int64(Long int64) { * Get int64 * @return int64 */ - @JsonProperty("int64") @ApiModelProperty(value = "") + @JsonProperty("int64") public Long getInt64() { return int64; } @@ -135,9 +135,9 @@ public FormatTest number(BigDecimal number) { * maximum: 543.2 * @return number */ - @JsonProperty("number") @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") @ApiModelProperty(required = true, value = "") + @JsonProperty("number") public BigDecimal getNumber() { return number; } @@ -157,9 +157,9 @@ public FormatTest _float(Float _float) { * maximum: 987.6 * @return _float */ - @JsonProperty("float") @DecimalMin("54.3") @DecimalMax("987.6") @ApiModelProperty(value = "") + @JsonProperty("float") public Float getFloat() { return _float; } @@ -179,9 +179,9 @@ public FormatTest _double(Double _double) { * maximum: 123.4 * @return _double */ - @JsonProperty("double") @DecimalMin("67.8") @DecimalMax("123.4") @ApiModelProperty(value = "") + @JsonProperty("double") public Double getDouble() { return _double; } @@ -199,9 +199,9 @@ public FormatTest string(String string) { * Get string * @return string */ - @JsonProperty("string") @Pattern(regexp = "/[a-z]/i") @ApiModelProperty(value = "") + @JsonProperty("string") public String getString() { return string; } @@ -219,9 +219,9 @@ public FormatTest _byte(byte[] _byte) { * Get _byte * @return _byte */ - @JsonProperty("byte") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("byte") public byte[] getByte() { return _byte; } @@ -239,9 +239,9 @@ public FormatTest binary(org.springframework.core.io.Resource binary) { * Get binary * @return binary */ - @JsonProperty("binary") @Valid @ApiModelProperty(value = "") + @JsonProperty("binary") public org.springframework.core.io.Resource getBinary() { return binary; } @@ -259,9 +259,9 @@ public FormatTest date(LocalDate date) { * Get date * @return date */ - @JsonProperty("date") @NotNull @Valid @ApiModelProperty(required = true, value = "") + @JsonProperty("date") public LocalDate getDate() { return date; } @@ -279,9 +279,9 @@ public FormatTest dateTime(OffsetDateTime dateTime) { * Get dateTime * @return dateTime */ - @JsonProperty("dateTime") @Valid @ApiModelProperty(value = "") + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -299,9 +299,9 @@ public FormatTest uuid(UUID uuid) { * Get uuid * @return uuid */ - @JsonProperty("uuid") @Valid @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -319,9 +319,9 @@ public FormatTest password(String password) { * Get password * @return password */ - @JsonProperty("password") @NotNull @Size(min = 10, max = 64) @ApiModelProperty(required = true, value = "") + @JsonProperty("password") public String getPassword() { return password; } @@ -339,9 +339,9 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) { * Get bigDecimal * @return bigDecimal */ - @JsonProperty("BigDecimal") @Valid @ApiModelProperty(value = "") + @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { return bigDecimal; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index 948ed9a0731d..21a424459798 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -37,9 +37,9 @@ public HasOnlyReadOnly bar(String bar) { * Get bar * @return bar */ - @JsonProperty("bar") @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("bar") public String getBar() { return bar; } @@ -57,9 +57,9 @@ public HasOnlyReadOnly foo(String foo) { * Get foo * @return foo */ - @JsonProperty("foo") @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("foo") public String getFoo() { return foo; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MapTest.java index 94d4ae9a9d56..76c6bee7adcb 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MapTest.java @@ -89,9 +89,9 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapMapOfString * @return mapMapOfString */ - @JsonProperty("map_map_of_string") @Valid @ApiModelProperty(value = "") + @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { return mapMapOfString; } @@ -117,9 +117,9 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) * Get mapOfEnumString * @return mapOfEnumString */ - @JsonProperty("map_of_enum_string") @ApiModelProperty(value = "") + @JsonProperty("map_of_enum_string") public Map getMapOfEnumString() { return mapOfEnumString; } @@ -145,9 +145,9 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) { * Get directMap * @return directMap */ - @JsonProperty("direct_map") @ApiModelProperty(value = "") + @JsonProperty("direct_map") public Map getDirectMap() { return directMap; } @@ -173,9 +173,9 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) { * Get indirectMap * @return indirectMap */ - @JsonProperty("indirect_map") @ApiModelProperty(value = "") + @JsonProperty("indirect_map") public Map getIndirectMap() { return indirectMap; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 89a2475d82fb..f9e2230eba97 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -45,9 +45,9 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { * Get uuid * @return uuid */ - @JsonProperty("uuid") @Valid @ApiModelProperty(value = "") + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -65,9 +65,9 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT * Get dateTime * @return dateTime */ - @JsonProperty("dateTime") @Valid @ApiModelProperty(value = "") + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -93,9 +93,9 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * Get map * @return map */ - @JsonProperty("map") @Valid @ApiModelProperty(value = "") + @JsonProperty("map") public Map getMap() { return map; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Model200Response.java index 220b6493f31a..193231f85457 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Model200Response.java @@ -38,9 +38,9 @@ public Model200Response name(Integer name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public Integer getName() { return name; } @@ -58,9 +58,9 @@ public Model200Response propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ - @JsonProperty("class") @ApiModelProperty(value = "") + @JsonProperty("class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelApiResponse.java index 29f3f43cf20e..693e1669879c 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -39,9 +39,9 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ - @JsonProperty("code") @ApiModelProperty(value = "") + @JsonProperty("code") public Integer getCode() { return code; } @@ -59,9 +59,9 @@ public ModelApiResponse type(String type) { * Get type * @return type */ - @JsonProperty("type") @ApiModelProperty(value = "") + @JsonProperty("type") public String getType() { return type; } @@ -79,9 +79,9 @@ public ModelApiResponse message(String message) { * Get message * @return message */ - @JsonProperty("message") @ApiModelProperty(value = "") + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelList.java index a374fe83d52a..7853f3d408a0 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelList.java @@ -35,9 +35,9 @@ public ModelList _123list(String _123list) { * Get _123list * @return _123list */ - @JsonProperty("123-list") @ApiModelProperty(value = "") + @JsonProperty("123-list") public String get123list() { return _123list; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelReturn.java index d8fc618d9dfb..b6f106cea222 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelReturn.java @@ -36,9 +36,9 @@ public ModelReturn _return(Integer _return) { * Get _return * @return _return */ - @JsonProperty("return") @ApiModelProperty(value = "") + @JsonProperty("return") public Integer getReturn() { return _return; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Name.java index 054901b488d6..32403fe65891 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Name.java @@ -40,9 +40,9 @@ public Name name(Integer name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("name") public Integer getName() { return name; } @@ -60,9 +60,9 @@ public Name snakeCase(Integer snakeCase) { * Get snakeCase * @return snakeCase */ - @JsonProperty("snake_case") @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("snake_case") public Integer getSnakeCase() { return snakeCase; } @@ -80,9 +80,9 @@ public Name property(String property) { * Get property * @return property */ - @JsonProperty("property") @ApiModelProperty(value = "") + @JsonProperty("property") public String getProperty() { return property; } @@ -100,9 +100,9 @@ public Name _123number(Integer _123number) { * Get _123number * @return _123number */ - @JsonProperty("123Number") @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("123Number") public Integer get123number() { return _123number; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NumberOnly.java index 8f2f2b19b191..1e3f9e15421d 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NumberOnly.java @@ -34,9 +34,9 @@ public NumberOnly justNumber(BigDecimal justNumber) { * Get justNumber * @return justNumber */ - @JsonProperty("JustNumber") @Valid @ApiModelProperty(value = "") + @JsonProperty("JustNumber") public BigDecimal getJustNumber() { return justNumber; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Order.java index feac4d2cad8d..b24c70c07808 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Order.java @@ -84,9 +84,9 @@ public Order id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -104,9 +104,9 @@ public Order petId(Long petId) { * Get petId * @return petId */ - @JsonProperty("petId") @ApiModelProperty(value = "") + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -124,9 +124,9 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ - @JsonProperty("quantity") @ApiModelProperty(value = "") + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -144,9 +144,9 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ - @JsonProperty("shipDate") @Valid @ApiModelProperty(value = "") + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -164,9 +164,9 @@ public Order status(StatusEnum status) { * Order Status * @return status */ - @JsonProperty("status") @ApiModelProperty(value = "Order Status") + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -184,9 +184,9 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ - @JsonProperty("complete") @ApiModelProperty(value = "") + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/OuterComposite.java index 00cce99097d7..ade2b9150190 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/OuterComposite.java @@ -38,9 +38,9 @@ public OuterComposite myNumber(BigDecimal myNumber) { * Get myNumber * @return myNumber */ - @JsonProperty("my_number") @Valid @ApiModelProperty(value = "") + @JsonProperty("my_number") public BigDecimal getMyNumber() { return myNumber; } @@ -58,9 +58,9 @@ public OuterComposite myString(String myString) { * Get myString * @return myString */ - @JsonProperty("my_string") @ApiModelProperty(value = "") + @JsonProperty("my_string") public String getMyString() { return myString; } @@ -78,9 +78,9 @@ public OuterComposite myBoolean(Boolean myBoolean) { * Get myBoolean * @return myBoolean */ - @JsonProperty("my_boolean") @ApiModelProperty(value = "") + @JsonProperty("my_boolean") public Boolean getMyBoolean() { return myBoolean; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java index e39c22373324..b9358e2b1e87 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java @@ -90,9 +90,9 @@ public Pet id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -110,9 +110,9 @@ public Pet category(Category category) { * Get category * @return category */ - @JsonProperty("category") @Valid @ApiModelProperty(value = "") + @JsonProperty("category") public Category getCategory() { return category; } @@ -130,9 +130,9 @@ public Pet name(String name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") + @JsonProperty("name") public String getName() { return name; } @@ -155,9 +155,9 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ - @JsonProperty("photoUrls") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("photoUrls") public Set getPhotoUrls() { return photoUrls; } @@ -184,9 +184,9 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @JsonProperty("tags") @Valid @ApiModelProperty(value = "") + @JsonProperty("tags") public List getTags() { return tags; } @@ -204,9 +204,9 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ - @JsonProperty("status") @ApiModelProperty(value = "pet status in the store") + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ReadOnlyFirst.java index d02b8c8cfd53..3eb0ebe069c1 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -35,9 +35,9 @@ public ReadOnlyFirst bar(String bar) { * Get bar * @return bar */ - @JsonProperty("bar") @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("bar") public String getBar() { return bar; } @@ -55,9 +55,9 @@ public ReadOnlyFirst baz(String baz) { * Get baz * @return baz */ - @JsonProperty("baz") @ApiModelProperty(value = "") + @JsonProperty("baz") public String getBaz() { return baz; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/SpecialModelName.java index 8f176362e027..668035becd14 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/SpecialModelName.java @@ -35,9 +35,9 @@ public class SpecialModelName { * Get $specialPropertyName * @return $specialPropertyName */ - @JsonProperty("$special[property.name]") @ApiModelProperty(value = "") + @JsonProperty("$special[property.name]") public Long get$SpecialPropertyName() { return $specialPropertyName; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Tag.java index f7797bef2f19..527e777278e2 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Tag.java @@ -35,9 +35,9 @@ public Tag id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -55,9 +55,9 @@ public Tag name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java index 506efbf431c1..41ba1c5bf1f3 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -45,9 +45,9 @@ public TypeHolderDefault stringItem(String stringItem) { * Get stringItem * @return stringItem */ - @JsonProperty("string_item") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -65,9 +65,9 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ - @JsonProperty("number_item") @NotNull @Valid @ApiModelProperty(required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -85,9 +85,9 @@ public TypeHolderDefault integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ - @JsonProperty("integer_item") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -105,9 +105,9 @@ public TypeHolderDefault boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ - @JsonProperty("bool_item") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -130,9 +130,9 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ - @JsonProperty("array_item") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java index 806c0c90fa18..8e1a76f88fdc 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -47,9 +47,9 @@ public TypeHolderExample stringItem(String stringItem) { * Get stringItem * @return stringItem */ - @JsonProperty("string_item") @NotNull @ApiModelProperty(example = "what", required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -67,9 +67,9 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ - @JsonProperty("number_item") @NotNull @Valid @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -87,9 +87,9 @@ public TypeHolderExample floatItem(Float floatItem) { * Get floatItem * @return floatItem */ - @JsonProperty("float_item") @NotNull @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("float_item") public Float getFloatItem() { return floatItem; } @@ -107,9 +107,9 @@ public TypeHolderExample integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ - @JsonProperty("integer_item") @NotNull @ApiModelProperty(example = "-2", required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -127,9 +127,9 @@ public TypeHolderExample boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ - @JsonProperty("bool_item") @NotNull @ApiModelProperty(example = "true", required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -152,9 +152,9 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ - @JsonProperty("array_item") @NotNull @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/User.java index f42832389ffe..36d29ba307d0 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/User.java @@ -47,9 +47,9 @@ public User id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -67,9 +67,9 @@ public User username(String username) { * Get username * @return username */ - @JsonProperty("username") @ApiModelProperty(value = "") + @JsonProperty("username") public String getUsername() { return username; } @@ -87,9 +87,9 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ - @JsonProperty("firstName") @ApiModelProperty(value = "") + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -107,9 +107,9 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ - @JsonProperty("lastName") @ApiModelProperty(value = "") + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -127,9 +127,9 @@ public User email(String email) { * Get email * @return email */ - @JsonProperty("email") @ApiModelProperty(value = "") + @JsonProperty("email") public String getEmail() { return email; } @@ -147,9 +147,9 @@ public User password(String password) { * Get password * @return password */ - @JsonProperty("password") @ApiModelProperty(value = "") + @JsonProperty("password") public String getPassword() { return password; } @@ -167,9 +167,9 @@ public User phone(String phone) { * Get phone * @return phone */ - @JsonProperty("phone") @ApiModelProperty(value = "") + @JsonProperty("phone") public String getPhone() { return phone; } @@ -187,9 +187,9 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ - @JsonProperty("userStatus") @ApiModelProperty(value = "User Status") + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java index c795b4b85e6d..3a8d108bdbce 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java @@ -101,9 +101,9 @@ public XmlItem attributeString(String attributeString) { * Get attributeString * @return attributeString */ - @JsonProperty("attribute_string") @ApiModelProperty(example = "string", value = "") + @JsonProperty("attribute_string") public String getAttributeString() { return attributeString; } @@ -121,9 +121,9 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) { * Get attributeNumber * @return attributeNumber */ - @JsonProperty("attribute_number") @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("attribute_number") public BigDecimal getAttributeNumber() { return attributeNumber; } @@ -141,9 +141,9 @@ public XmlItem attributeInteger(Integer attributeInteger) { * Get attributeInteger * @return attributeInteger */ - @JsonProperty("attribute_integer") @ApiModelProperty(example = "-2", value = "") + @JsonProperty("attribute_integer") public Integer getAttributeInteger() { return attributeInteger; } @@ -161,9 +161,9 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) { * Get attributeBoolean * @return attributeBoolean */ - @JsonProperty("attribute_boolean") @ApiModelProperty(example = "true", value = "") + @JsonProperty("attribute_boolean") public Boolean getAttributeBoolean() { return attributeBoolean; } @@ -189,9 +189,9 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) { * Get wrappedArray * @return wrappedArray */ - @JsonProperty("wrapped_array") @ApiModelProperty(value = "") + @JsonProperty("wrapped_array") public List getWrappedArray() { return wrappedArray; } @@ -209,9 +209,9 @@ public XmlItem nameString(String nameString) { * Get nameString * @return nameString */ - @JsonProperty("name_string") @ApiModelProperty(example = "string", value = "") + @JsonProperty("name_string") public String getNameString() { return nameString; } @@ -229,9 +229,9 @@ public XmlItem nameNumber(BigDecimal nameNumber) { * Get nameNumber * @return nameNumber */ - @JsonProperty("name_number") @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("name_number") public BigDecimal getNameNumber() { return nameNumber; } @@ -249,9 +249,9 @@ public XmlItem nameInteger(Integer nameInteger) { * Get nameInteger * @return nameInteger */ - @JsonProperty("name_integer") @ApiModelProperty(example = "-2", value = "") + @JsonProperty("name_integer") public Integer getNameInteger() { return nameInteger; } @@ -269,9 +269,9 @@ public XmlItem nameBoolean(Boolean nameBoolean) { * Get nameBoolean * @return nameBoolean */ - @JsonProperty("name_boolean") @ApiModelProperty(example = "true", value = "") + @JsonProperty("name_boolean") public Boolean getNameBoolean() { return nameBoolean; } @@ -297,9 +297,9 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) { * Get nameArray * @return nameArray */ - @JsonProperty("name_array") @ApiModelProperty(value = "") + @JsonProperty("name_array") public List getNameArray() { return nameArray; } @@ -325,9 +325,9 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) { * Get nameWrappedArray * @return nameWrappedArray */ - @JsonProperty("name_wrapped_array") @ApiModelProperty(value = "") + @JsonProperty("name_wrapped_array") public List getNameWrappedArray() { return nameWrappedArray; } @@ -345,9 +345,9 @@ public XmlItem prefixString(String prefixString) { * Get prefixString * @return prefixString */ - @JsonProperty("prefix_string") @ApiModelProperty(example = "string", value = "") + @JsonProperty("prefix_string") public String getPrefixString() { return prefixString; } @@ -365,9 +365,9 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) { * Get prefixNumber * @return prefixNumber */ - @JsonProperty("prefix_number") @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("prefix_number") public BigDecimal getPrefixNumber() { return prefixNumber; } @@ -385,9 +385,9 @@ public XmlItem prefixInteger(Integer prefixInteger) { * Get prefixInteger * @return prefixInteger */ - @JsonProperty("prefix_integer") @ApiModelProperty(example = "-2", value = "") + @JsonProperty("prefix_integer") public Integer getPrefixInteger() { return prefixInteger; } @@ -405,9 +405,9 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) { * Get prefixBoolean * @return prefixBoolean */ - @JsonProperty("prefix_boolean") @ApiModelProperty(example = "true", value = "") + @JsonProperty("prefix_boolean") public Boolean getPrefixBoolean() { return prefixBoolean; } @@ -433,9 +433,9 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) { * Get prefixArray * @return prefixArray */ - @JsonProperty("prefix_array") @ApiModelProperty(value = "") + @JsonProperty("prefix_array") public List getPrefixArray() { return prefixArray; } @@ -461,9 +461,9 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) { * Get prefixWrappedArray * @return prefixWrappedArray */ - @JsonProperty("prefix_wrapped_array") @ApiModelProperty(value = "") + @JsonProperty("prefix_wrapped_array") public List getPrefixWrappedArray() { return prefixWrappedArray; } @@ -481,9 +481,9 @@ public XmlItem namespaceString(String namespaceString) { * Get namespaceString * @return namespaceString */ - @JsonProperty("namespace_string") @ApiModelProperty(example = "string", value = "") + @JsonProperty("namespace_string") public String getNamespaceString() { return namespaceString; } @@ -501,9 +501,9 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) { * Get namespaceNumber * @return namespaceNumber */ - @JsonProperty("namespace_number") @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("namespace_number") public BigDecimal getNamespaceNumber() { return namespaceNumber; } @@ -521,9 +521,9 @@ public XmlItem namespaceInteger(Integer namespaceInteger) { * Get namespaceInteger * @return namespaceInteger */ - @JsonProperty("namespace_integer") @ApiModelProperty(example = "-2", value = "") + @JsonProperty("namespace_integer") public Integer getNamespaceInteger() { return namespaceInteger; } @@ -541,9 +541,9 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) { * Get namespaceBoolean * @return namespaceBoolean */ - @JsonProperty("namespace_boolean") @ApiModelProperty(example = "true", value = "") + @JsonProperty("namespace_boolean") public Boolean getNamespaceBoolean() { return namespaceBoolean; } @@ -569,9 +569,9 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) { * Get namespaceArray * @return namespaceArray */ - @JsonProperty("namespace_array") @ApiModelProperty(value = "") + @JsonProperty("namespace_array") public List getNamespaceArray() { return namespaceArray; } @@ -597,9 +597,9 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) { * Get namespaceWrappedArray * @return namespaceWrappedArray */ - @JsonProperty("namespace_wrapped_array") @ApiModelProperty(value = "") + @JsonProperty("namespace_wrapped_array") public List getNamespaceWrappedArray() { return namespaceWrappedArray; } @@ -617,9 +617,9 @@ public XmlItem prefixNsString(String prefixNsString) { * Get prefixNsString * @return prefixNsString */ - @JsonProperty("prefix_ns_string") @ApiModelProperty(example = "string", value = "") + @JsonProperty("prefix_ns_string") public String getPrefixNsString() { return prefixNsString; } @@ -637,9 +637,9 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) { * Get prefixNsNumber * @return prefixNsNumber */ - @JsonProperty("prefix_ns_number") @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("prefix_ns_number") public BigDecimal getPrefixNsNumber() { return prefixNsNumber; } @@ -657,9 +657,9 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) { * Get prefixNsInteger * @return prefixNsInteger */ - @JsonProperty("prefix_ns_integer") @ApiModelProperty(example = "-2", value = "") + @JsonProperty("prefix_ns_integer") public Integer getPrefixNsInteger() { return prefixNsInteger; } @@ -677,9 +677,9 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) { * Get prefixNsBoolean * @return prefixNsBoolean */ - @JsonProperty("prefix_ns_boolean") @ApiModelProperty(example = "true", value = "") + @JsonProperty("prefix_ns_boolean") public Boolean getPrefixNsBoolean() { return prefixNsBoolean; } @@ -705,9 +705,9 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) { * Get prefixNsArray * @return prefixNsArray */ - @JsonProperty("prefix_ns_array") @ApiModelProperty(value = "") + @JsonProperty("prefix_ns_array") public List getPrefixNsArray() { return prefixNsArray; } @@ -733,9 +733,9 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) { * Get prefixNsWrappedArray * @return prefixNsWrappedArray */ - @JsonProperty("prefix_ns_wrapped_array") @ApiModelProperty(value = "") + @JsonProperty("prefix_ns_wrapped_array") public List getPrefixNsWrappedArray() { return prefixNsWrappedArray; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-useoptional/src/main/resources/openapi.yaml index 2999e6f2f8d6..5fdcfc33eada 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-useoptional/src/main/resources/openapi.yaml @@ -2111,7 +2111,6 @@ components: status: description: Updated status of the pet type: string - type: object uploadFile_request: properties: additionalMetadata: @@ -2121,7 +2120,6 @@ components: description: file to upload format: binary type: string - type: object testEnumParameters_request: properties: enum_form_string_array: @@ -2141,7 +2139,6 @@ components: - -efg - (xyz) type: string - type: object testEndpointParameters_request: properties: integer: @@ -2214,7 +2211,6 @@ components: - double - number - pattern_without_delimiter - type: object testJsonFormData_request: properties: param: @@ -2226,7 +2222,6 @@ components: required: - param - param2 - type: object uploadFileWithRequiredFile_request: properties: additionalMetadata: @@ -2238,7 +2233,6 @@ components: type: string required: - requiredFile - type: object Dog_allOf: properties: breed: diff --git a/samples/server/petstore/springboot-virtualan/.openapi-generator/FILES b/samples/server/petstore/springboot-virtualan/.openapi-generator/FILES index 408f3973f3ee..242b5258470c 100644 --- a/samples/server/petstore/springboot-virtualan/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-virtualan/.openapi-generator/FILES @@ -2,7 +2,6 @@ README.md pom.xml src/main/java/org/openapitools/OpenApiGeneratorApplication.java src/main/java/org/openapitools/RFC3339DateFormat.java -src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/configuration/SpringDocConfiguration.java src/main/java/org/openapitools/virtualan/api/AnotherFakeApi.java diff --git a/samples/server/petstore/springboot-virtualan/.openapi-generator/VERSION b/samples/server/petstore/springboot-virtualan/.openapi-generator/VERSION index d6b4ec4aa783..ed829dbcddec 100644 --- a/samples/server/petstore/springboot-virtualan/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-virtualan/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0-SNAPSHOT \ No newline at end of file +6.2.1-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApi.java index cb271de88171..7253f3acaca0 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApiController.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApiController.java index dd5594acb67b..8430d80bd925 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApiController.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApiController.java @@ -28,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class AnotherFakeApiController implements AnotherFakeApi { private final NativeWebRequest request; 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 d610b3cc014d..6503e457d226 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApiController.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApiController.java index d33842e20df7..d733bfab3a46 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApiController.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApiController.java @@ -38,7 +38,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeApiController implements FakeApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApi.java index a95cbe23b7ab..d8ad5bf1321d 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApiController.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApiController.java index f4d0eedc19c9..4db741afee9d 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApiController.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApiController.java @@ -28,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeClassnameTestApiController implements FakeClassnameTestApi { private final NativeWebRequest request; 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 e37f6b77f608..2bf118046c4a 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApiController.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApiController.java index 94ea48fcc818..0b171a217de1 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApiController.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApiController.java @@ -30,7 +30,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class PetApiController implements PetApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java index 9f5d667b14ed..35a8114198ad 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApiController.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApiController.java index bc986cbdf0a1..1d865458002d 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApiController.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApiController.java @@ -29,7 +29,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class StoreApiController implements StoreApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApi.java index e9dfc2dcfbfd..b64fb351d9c0 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApiController.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApiController.java index 65303c96a8a5..10575bc75fb0 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApiController.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApiController.java @@ -30,7 +30,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class UserApiController implements UserApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesAnyType.java index 1264511924a3..fd266efd3413 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesAnyType.java @@ -34,9 +34,9 @@ public AdditionalPropertiesAnyType name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesArray.java index 9854173bdb10..13f71f989e1f 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesArray.java @@ -35,9 +35,9 @@ public AdditionalPropertiesArray name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesBoolean.java index dbf5f68bef99..f5ffd587b40b 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesBoolean.java @@ -34,9 +34,9 @@ public AdditionalPropertiesBoolean name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesClass.java index aff98b03f1ab..6261df2d814f 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesClass.java @@ -72,9 +72,9 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt * Get mapString * @return mapString */ - @JsonProperty("map_string") @Schema(name = "map_string", required = false) + @JsonProperty("map_string") public Map getMapString() { return mapString; } @@ -100,9 +100,9 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * Get mapNumber * @return mapNumber */ - @JsonProperty("map_number") @Valid @Schema(name = "map_number", required = false) + @JsonProperty("map_number") public Map getMapNumber() { return mapNumber; } @@ -128,9 +128,9 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege * Get mapInteger * @return mapInteger */ - @JsonProperty("map_integer") @Schema(name = "map_integer", required = false) + @JsonProperty("map_integer") public Map getMapInteger() { return mapInteger; } @@ -156,9 +156,9 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea * Get mapBoolean * @return mapBoolean */ - @JsonProperty("map_boolean") @Schema(name = "map_boolean", required = false) + @JsonProperty("map_boolean") public Map getMapBoolean() { return mapBoolean; } @@ -184,9 +184,9 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { return mapArrayInteger; } @@ -212,9 +212,9 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * Get mapArrayAnytype * @return mapArrayAnytype */ - @JsonProperty("map_array_anytype") @Valid @Schema(name = "map_array_anytype", required = false) + @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { return mapArrayAnytype; } @@ -240,9 +240,9 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { return mapMapString; } @@ -268,9 +268,9 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { return mapMapAnytype; } @@ -288,9 +288,9 @@ public AdditionalPropertiesClass anytype1(Object anytype1) { * Get anytype1 * @return anytype1 */ - @JsonProperty("anytype_1") @Schema(name = "anytype_1", required = false) + @JsonProperty("anytype_1") public Object getAnytype1() { return anytype1; } @@ -308,9 +308,9 @@ public AdditionalPropertiesClass anytype2(Object anytype2) { * Get anytype2 * @return anytype2 */ - @JsonProperty("anytype_2") @Schema(name = "anytype_2", required = false) + @JsonProperty("anytype_2") public Object getAnytype2() { return anytype2; } @@ -328,9 +328,9 @@ public AdditionalPropertiesClass anytype3(Object anytype3) { * Get anytype3 * @return anytype3 */ - @JsonProperty("anytype_3") @Schema(name = "anytype_3", required = false) + @JsonProperty("anytype_3") public Object getAnytype3() { return anytype3; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesInteger.java index 83646477dcd2..b08c342ccba2 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesInteger.java @@ -34,9 +34,9 @@ public AdditionalPropertiesInteger name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesNumber.java index 513f1b778995..235a1075fef3 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesNumber.java @@ -35,9 +35,9 @@ public AdditionalPropertiesNumber name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesObject.java index 73455c9b6265..9242e1c214e5 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesObject.java @@ -34,9 +34,9 @@ public AdditionalPropertiesObject name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesString.java index a173f4bc1f38..48724771e1ba 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesString.java @@ -34,9 +34,9 @@ public AdditionalPropertiesString name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Animal.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Animal.java index 601b2c51c171..9bcddceb0ab9 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Animal.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Animal.java @@ -51,9 +51,9 @@ public Animal className(String className) { * Get className * @return className */ - @JsonProperty("className") @NotNull @Schema(name = "className", required = true) + @JsonProperty("className") public String getClassName() { return className; } @@ -71,9 +71,9 @@ public Animal color(String color) { * Get color * @return color */ - @JsonProperty("color") @Schema(name = "color", required = false) + @JsonProperty("color") public String getColor() { return color; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfArrayOfNumberOnly.java index 4bfcbdd77550..57e9dd93fbb6 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfArrayOfNumberOnly.java @@ -44,9 +44,9 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * Get arrayArrayNumber * @return arrayArrayNumber */ - @JsonProperty("ArrayArrayNumber") @Valid @Schema(name = "ArrayArrayNumber", required = false) + @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfNumberOnly.java index 6ddc96cd598f..3f7f968674fa 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfNumberOnly.java @@ -44,9 +44,9 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ - @JsonProperty("ArrayNumber") @Valid @Schema(name = "ArrayNumber", required = false) + @JsonProperty("ArrayNumber") public List getArrayNumber() { return arrayNumber; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayTest.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayTest.java index 02b98c9f3244..735c47eff6b1 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayTest.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayTest.java @@ -50,9 +50,9 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) { * Get arrayOfString * @return arrayOfString */ - @JsonProperty("array_of_string") @Schema(name = "array_of_string", required = false) + @JsonProperty("array_of_string") public List getArrayOfString() { return arrayOfString; } @@ -78,9 +78,9 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ - @JsonProperty("array_array_of_integer") @Valid @Schema(name = "array_array_of_integer", required = false) + @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; } @@ -106,9 +106,9 @@ public ArrayTest addArrayArrayOfModelItem(List arrayArrayOfModelI * Get arrayArrayOfModel * @return arrayArrayOfModel */ - @JsonProperty("array_array_of_model") @Valid @Schema(name = "array_array_of_model", required = false) + @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/BigCat.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/BigCat.java index 9a6a3a0d8e06..5d781044ad52 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/BigCat.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/BigCat.java @@ -77,9 +77,9 @@ public BigCat kind(KindEnum kind) { * Get kind * @return kind */ - @JsonProperty("kind") @Schema(name = "kind", required = false) + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/BigCatAllOf.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/BigCatAllOf.java index d21e45d7b86c..e167eccee50c 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/BigCatAllOf.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/BigCatAllOf.java @@ -74,9 +74,9 @@ public BigCatAllOf kind(KindEnum kind) { * Get kind * @return kind */ - @JsonProperty("kind") @Schema(name = "kind", required = false) + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Capitalization.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Capitalization.java index 324588999dd8..6167e585e493 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Capitalization.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Capitalization.java @@ -42,9 +42,9 @@ public Capitalization smallCamel(String smallCamel) { * Get smallCamel * @return smallCamel */ - @JsonProperty("smallCamel") @Schema(name = "smallCamel", required = false) + @JsonProperty("smallCamel") public String getSmallCamel() { return smallCamel; } @@ -62,9 +62,9 @@ public Capitalization capitalCamel(String capitalCamel) { * Get capitalCamel * @return capitalCamel */ - @JsonProperty("CapitalCamel") @Schema(name = "CapitalCamel", required = false) + @JsonProperty("CapitalCamel") public String getCapitalCamel() { return capitalCamel; } @@ -82,9 +82,9 @@ public Capitalization smallSnake(String smallSnake) { * Get smallSnake * @return smallSnake */ - @JsonProperty("small_Snake") @Schema(name = "small_Snake", required = false) + @JsonProperty("small_Snake") public String getSmallSnake() { return smallSnake; } @@ -102,9 +102,9 @@ public Capitalization capitalSnake(String capitalSnake) { * Get capitalSnake * @return capitalSnake */ - @JsonProperty("Capital_Snake") @Schema(name = "Capital_Snake", required = false) + @JsonProperty("Capital_Snake") public String getCapitalSnake() { return capitalSnake; } @@ -122,9 +122,9 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) { * Get scAETHFlowPoints * @return scAETHFlowPoints */ - @JsonProperty("SCA_ETH_Flow_Points") @Schema(name = "SCA_ETH_Flow_Points", required = false) + @JsonProperty("SCA_ETH_Flow_Points") public String getScAETHFlowPoints() { return scAETHFlowPoints; } @@ -142,9 +142,9 @@ public Capitalization ATT_NAME(String ATT_NAME) { * Name of the pet * @return ATT_NAME */ - @JsonProperty("ATT_NAME") @Schema(name = "ATT_NAME", description = "Name of the pet ", required = false) + @JsonProperty("ATT_NAME") public String getATTNAME() { return ATT_NAME; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Cat.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Cat.java index 58bea11e9a6b..13eb17c0a22a 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Cat.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Cat.java @@ -46,9 +46,9 @@ public Cat declawed(Boolean declawed) { * Get declawed * @return declawed */ - @JsonProperty("declawed") @Schema(name = "declawed", required = false) + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/CatAllOf.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/CatAllOf.java index 248b96ec7a39..c381087cebec 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/CatAllOf.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/CatAllOf.java @@ -34,9 +34,9 @@ public CatAllOf declawed(Boolean declawed) { * Get declawed * @return declawed */ - @JsonProperty("declawed") @Schema(name = "declawed", required = false) + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Category.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Category.java index c2f43d03bb2a..7d66231e4fa0 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Category.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Category.java @@ -34,9 +34,9 @@ public Category id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -54,9 +54,9 @@ public Category name(String name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @Schema(name = "name", required = true) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ClassModel.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ClassModel.java index ca39fd04f7ee..1e859883b632 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ClassModel.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ClassModel.java @@ -33,9 +33,9 @@ public ClassModel propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ - @JsonProperty("_class") @Schema(name = "_class", required = false) + @JsonProperty("_class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Client.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Client.java index 427399764aa5..01c22a6074f8 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Client.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Client.java @@ -32,9 +32,9 @@ public Client client(String client) { * Get client * @return client */ - @JsonProperty("client") @Schema(name = "client", required = false) + @JsonProperty("client") public String getClient() { return client; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Dog.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Dog.java index fc3951e0e563..3ace2ed9b78f 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Dog.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Dog.java @@ -37,9 +37,9 @@ public Dog breed(String breed) { * Get breed * @return breed */ - @JsonProperty("breed") @Schema(name = "breed", required = false) + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/DogAllOf.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/DogAllOf.java index b5c04183e07e..5d35b9293a1c 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/DogAllOf.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/DogAllOf.java @@ -34,9 +34,9 @@ public DogAllOf breed(String breed) { * Get breed * @return breed */ - @JsonProperty("breed") @Schema(name = "breed", required = false) + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumArrays.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumArrays.java index c341bbad13d4..945bfc8e07b4 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumArrays.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumArrays.java @@ -108,9 +108,9 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) { * Get justSymbol * @return justSymbol */ - @JsonProperty("just_symbol") @Schema(name = "just_symbol", required = false) + @JsonProperty("just_symbol") public JustSymbolEnum getJustSymbol() { return justSymbol; } @@ -136,9 +136,9 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) { * Get arrayEnum * @return arrayEnum */ - @JsonProperty("array_enum") @Schema(name = "array_enum", required = false) + @JsonProperty("array_enum") public List getArrayEnum() { return arrayEnum; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumTest.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumTest.java index e9862cc8314b..9bc905d0afae 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumTest.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumTest.java @@ -188,9 +188,9 @@ public EnumTest enumString(EnumStringEnum enumString) { * Get enumString * @return enumString */ - @JsonProperty("enum_string") @Schema(name = "enum_string", required = false) + @JsonProperty("enum_string") public EnumStringEnum getEnumString() { return enumString; } @@ -208,9 +208,9 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) { * Get enumStringRequired * @return enumStringRequired */ - @JsonProperty("enum_string_required") @NotNull @Schema(name = "enum_string_required", required = true) + @JsonProperty("enum_string_required") public EnumStringRequiredEnum getEnumStringRequired() { return enumStringRequired; } @@ -228,9 +228,9 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) { * Get enumInteger * @return enumInteger */ - @JsonProperty("enum_integer") @Schema(name = "enum_integer", required = false) + @JsonProperty("enum_integer") public EnumIntegerEnum getEnumInteger() { return enumInteger; } @@ -248,9 +248,9 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) { * Get enumNumber * @return enumNumber */ - @JsonProperty("enum_number") @Schema(name = "enum_number", required = false) + @JsonProperty("enum_number") public EnumNumberEnum getEnumNumber() { return enumNumber; } @@ -268,9 +268,9 @@ public EnumTest outerEnum(OuterEnum outerEnum) { * Get outerEnum * @return outerEnum */ - @JsonProperty("outerEnum") @Valid @Schema(name = "outerEnum", required = false) + @JsonProperty("outerEnum") public OuterEnum getOuterEnum() { return outerEnum; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/File.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/File.java index cd590f9f2f62..624c59ede1f7 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/File.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/File.java @@ -33,9 +33,9 @@ public File sourceURI(String sourceURI) { * Test capitalization * @return sourceURI */ - @JsonProperty("sourceURI") @Schema(name = "sourceURI", description = "Test capitalization", required = false) + @JsonProperty("sourceURI") public String getSourceURI() { return sourceURI; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FileSchemaTestClass.java index d4c3f6255ae8..22b7964083b2 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FileSchemaTestClass.java @@ -38,9 +38,9 @@ public FileSchemaTestClass file(File file) { * Get file * @return file */ - @JsonProperty("file") @Valid @Schema(name = "file", required = false) + @JsonProperty("file") public File getFile() { return file; } @@ -66,9 +66,9 @@ public FileSchemaTestClass addFilesItem(File filesItem) { * Get files * @return files */ - @JsonProperty("files") @Valid @Schema(name = "files", required = false) + @JsonProperty("files") public List getFiles() { return files; } 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 0f4173abd29b..16f24bbfcc3e 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 @@ -70,9 +70,9 @@ public FormatTest integer(Integer integer) { * maximum: 100 * @return integer */ - @JsonProperty("integer") @Min(10) @Max(100) @Schema(name = "integer", required = false) + @JsonProperty("integer") public Integer getInteger() { return integer; } @@ -92,9 +92,9 @@ public FormatTest int32(Integer int32) { * maximum: 200 * @return int32 */ - @JsonProperty("int32") @Min(20) @Max(200) @Schema(name = "int32", required = false) + @JsonProperty("int32") public Integer getInt32() { return int32; } @@ -112,9 +112,9 @@ public FormatTest int64(Long int64) { * Get int64 * @return int64 */ - @JsonProperty("int64") @Schema(name = "int64", required = false) + @JsonProperty("int64") public Long getInt64() { return int64; } @@ -134,9 +134,9 @@ public FormatTest number(BigDecimal number) { * maximum: 543.2 * @return number */ - @JsonProperty("number") @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") @Schema(name = "number", required = true) + @JsonProperty("number") public BigDecimal getNumber() { return number; } @@ -156,9 +156,9 @@ public FormatTest _float(Float _float) { * maximum: 987.6 * @return _float */ - @JsonProperty("float") @DecimalMin("54.3") @DecimalMax("987.6") @Schema(name = "float", required = false) + @JsonProperty("float") public Float getFloat() { return _float; } @@ -178,9 +178,9 @@ public FormatTest _double(Double _double) { * maximum: 123.4 * @return _double */ - @JsonProperty("double") @DecimalMin("67.8") @DecimalMax("123.4") @Schema(name = "double", required = false) + @JsonProperty("double") public Double getDouble() { return _double; } @@ -198,9 +198,9 @@ public FormatTest string(String string) { * Get string * @return string */ - @JsonProperty("string") @Pattern(regexp = "/[a-z]/i") @Schema(name = "string", required = false) + @JsonProperty("string") public String getString() { return string; } @@ -218,9 +218,9 @@ public FormatTest _byte(byte[] _byte) { * Get _byte * @return _byte */ - @JsonProperty("byte") @NotNull @Schema(name = "byte", required = true) + @JsonProperty("byte") public byte[] getByte() { return _byte; } @@ -238,9 +238,9 @@ public FormatTest binary(org.springframework.core.io.Resource binary) { * Get binary * @return binary */ - @JsonProperty("binary") @Valid @Schema(name = "binary", required = false) + @JsonProperty("binary") public org.springframework.core.io.Resource getBinary() { return binary; } @@ -258,9 +258,9 @@ public FormatTest date(LocalDate date) { * Get date * @return date */ - @JsonProperty("date") @NotNull @Valid @Schema(name = "date", required = true) + @JsonProperty("date") public LocalDate getDate() { return date; } @@ -278,9 +278,9 @@ public FormatTest dateTime(OffsetDateTime dateTime) { * Get dateTime * @return dateTime */ - @JsonProperty("dateTime") @Valid @Schema(name = "dateTime", required = false) + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -298,9 +298,9 @@ public FormatTest uuid(UUID uuid) { * Get uuid * @return uuid */ - @JsonProperty("uuid") @Valid @Schema(name = "uuid", example = "72f98069-206d-4f12-9f12-3d1e525a8e84", required = false) + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -318,9 +318,9 @@ public FormatTest password(String password) { * Get password * @return password */ - @JsonProperty("password") @NotNull @Size(min = 10, max = 64) @Schema(name = "password", required = true) + @JsonProperty("password") public String getPassword() { return password; } @@ -338,9 +338,9 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) { * Get bigDecimal * @return bigDecimal */ - @JsonProperty("BigDecimal") @Valid @Schema(name = "BigDecimal", required = false) + @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { return bigDecimal; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/HasOnlyReadOnly.java index 84f13a291a80..6937492d1f6c 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/HasOnlyReadOnly.java @@ -36,9 +36,9 @@ public HasOnlyReadOnly bar(String bar) { * Get bar * @return bar */ - @JsonProperty("bar") @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, required = false) + @JsonProperty("bar") public String getBar() { return bar; } @@ -56,9 +56,9 @@ public HasOnlyReadOnly foo(String foo) { * Get foo * @return foo */ - @JsonProperty("foo") @Schema(name = "foo", accessMode = Schema.AccessMode.READ_ONLY, required = false) + @JsonProperty("foo") public String getFoo() { return foo; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MapTest.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MapTest.java index aed48db27b48..93443e41f0b1 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MapTest.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MapTest.java @@ -88,9 +88,9 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapMapOfString * @return mapMapOfString */ - @JsonProperty("map_map_of_string") @Valid @Schema(name = "map_map_of_string", required = false) + @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { return mapMapOfString; } @@ -116,9 +116,9 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) * Get mapOfEnumString * @return mapOfEnumString */ - @JsonProperty("map_of_enum_string") @Schema(name = "map_of_enum_string", required = false) + @JsonProperty("map_of_enum_string") public Map getMapOfEnumString() { return mapOfEnumString; } @@ -144,9 +144,9 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) { * Get directMap * @return directMap */ - @JsonProperty("direct_map") @Schema(name = "direct_map", required = false) + @JsonProperty("direct_map") public Map getDirectMap() { return directMap; } @@ -172,9 +172,9 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) { * Get indirectMap * @return indirectMap */ - @JsonProperty("indirect_map") @Schema(name = "indirect_map", required = false) + @JsonProperty("indirect_map") public Map getIndirectMap() { return indirectMap; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MixedPropertiesAndAdditionalPropertiesClass.java index 146e6ec15f29..dc92207dc2ac 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -44,9 +44,9 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { * Get uuid * @return uuid */ - @JsonProperty("uuid") @Valid @Schema(name = "uuid", required = false) + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -64,9 +64,9 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT * Get dateTime * @return dateTime */ - @JsonProperty("dateTime") @Valid @Schema(name = "dateTime", required = false) + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -92,9 +92,9 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * Get map * @return map */ - @JsonProperty("map") @Valid @Schema(name = "map", required = false) + @JsonProperty("map") public Map getMap() { return map; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Model200Response.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Model200Response.java index fb66f7341953..04ad3c85cf76 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Model200Response.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Model200Response.java @@ -37,9 +37,9 @@ public Model200Response name(Integer name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public Integer getName() { return name; } @@ -57,9 +57,9 @@ public Model200Response propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ - @JsonProperty("class") @Schema(name = "class", required = false) + @JsonProperty("class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelApiResponse.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelApiResponse.java index 1827391b22bf..452bc7d131cb 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelApiResponse.java @@ -38,9 +38,9 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ - @JsonProperty("code") @Schema(name = "code", required = false) + @JsonProperty("code") public Integer getCode() { return code; } @@ -58,9 +58,9 @@ public ModelApiResponse type(String type) { * Get type * @return type */ - @JsonProperty("type") @Schema(name = "type", required = false) + @JsonProperty("type") public String getType() { return type; } @@ -78,9 +78,9 @@ public ModelApiResponse message(String message) { * Get message * @return message */ - @JsonProperty("message") @Schema(name = "message", required = false) + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelList.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelList.java index 98832ee2d6ca..c6cf398984b4 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelList.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelList.java @@ -34,9 +34,9 @@ public ModelList _123list(String _123list) { * Get _123list * @return _123list */ - @JsonProperty("123-list") @Schema(name = "123-list", required = false) + @JsonProperty("123-list") public String get123list() { return _123list; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelReturn.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelReturn.java index 8f9650f16a3e..13cd7663c5e2 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelReturn.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelReturn.java @@ -35,9 +35,9 @@ public ModelReturn _return(Integer _return) { * Get _return * @return _return */ - @JsonProperty("return") @Schema(name = "return", required = false) + @JsonProperty("return") public Integer getReturn() { return _return; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Name.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Name.java index 775a9f6b15ac..b9e7e2b7f8a7 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Name.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Name.java @@ -39,9 +39,9 @@ public Name name(Integer name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @Schema(name = "name", required = true) + @JsonProperty("name") public Integer getName() { return name; } @@ -59,9 +59,9 @@ public Name snakeCase(Integer snakeCase) { * Get snakeCase * @return snakeCase */ - @JsonProperty("snake_case") @Schema(name = "snake_case", accessMode = Schema.AccessMode.READ_ONLY, required = false) + @JsonProperty("snake_case") public Integer getSnakeCase() { return snakeCase; } @@ -79,9 +79,9 @@ public Name property(String property) { * Get property * @return property */ - @JsonProperty("property") @Schema(name = "property", required = false) + @JsonProperty("property") public String getProperty() { return property; } @@ -99,9 +99,9 @@ public Name _123number(Integer _123number) { * Get _123number * @return _123number */ - @JsonProperty("123Number") @Schema(name = "123Number", accessMode = Schema.AccessMode.READ_ONLY, required = false) + @JsonProperty("123Number") public Integer get123number() { return _123number; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/NumberOnly.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/NumberOnly.java index 4f3075751469..01571e444623 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/NumberOnly.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/NumberOnly.java @@ -33,9 +33,9 @@ public NumberOnly justNumber(BigDecimal justNumber) { * Get justNumber * @return justNumber */ - @JsonProperty("JustNumber") @Valid @Schema(name = "JustNumber", required = false) + @JsonProperty("JustNumber") public BigDecimal getJustNumber() { return justNumber; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Order.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Order.java index ab9f818fdd93..8ebb4085a2af 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Order.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Order.java @@ -83,9 +83,9 @@ public Order id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -103,9 +103,9 @@ public Order petId(Long petId) { * Get petId * @return petId */ - @JsonProperty("petId") @Schema(name = "petId", required = false) + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -123,9 +123,9 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ - @JsonProperty("quantity") @Schema(name = "quantity", required = false) + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -143,9 +143,9 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ - @JsonProperty("shipDate") @Valid @Schema(name = "shipDate", required = false) + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -163,9 +163,9 @@ public Order status(StatusEnum status) { * Order Status * @return status */ - @JsonProperty("status") @Schema(name = "status", description = "Order Status", required = false) + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -183,9 +183,9 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ - @JsonProperty("complete") @Schema(name = "complete", required = false) + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/OuterComposite.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/OuterComposite.java index 34947d07d086..cc24e67dea6f 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/OuterComposite.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/OuterComposite.java @@ -37,9 +37,9 @@ public OuterComposite myNumber(BigDecimal myNumber) { * Get myNumber * @return myNumber */ - @JsonProperty("my_number") @Valid @Schema(name = "my_number", required = false) + @JsonProperty("my_number") public BigDecimal getMyNumber() { return myNumber; } @@ -57,9 +57,9 @@ public OuterComposite myString(String myString) { * Get myString * @return myString */ - @JsonProperty("my_string") @Schema(name = "my_string", required = false) + @JsonProperty("my_string") public String getMyString() { return myString; } @@ -77,9 +77,9 @@ public OuterComposite myBoolean(Boolean myBoolean) { * Get myBoolean * @return myBoolean */ - @JsonProperty("my_boolean") @Schema(name = "my_boolean", required = false) + @JsonProperty("my_boolean") public Boolean getMyBoolean() { return myBoolean; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Pet.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Pet.java index da80bf6f8a45..824a476441f9 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Pet.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Pet.java @@ -89,9 +89,9 @@ public Pet id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -109,9 +109,9 @@ public Pet category(Category category) { * Get category * @return category */ - @JsonProperty("category") @Valid @Schema(name = "category", required = false) + @JsonProperty("category") public Category getCategory() { return category; } @@ -129,9 +129,9 @@ public Pet name(String name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @Schema(name = "name", example = "doggie", required = true) + @JsonProperty("name") public String getName() { return name; } @@ -154,9 +154,9 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ - @JsonProperty("photoUrls") @NotNull @Schema(name = "photoUrls", required = true) + @JsonProperty("photoUrls") public Set getPhotoUrls() { return photoUrls; } @@ -183,9 +183,9 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @JsonProperty("tags") @Valid @Schema(name = "tags", required = false) + @JsonProperty("tags") public List getTags() { return tags; } @@ -203,9 +203,9 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ - @JsonProperty("status") @Schema(name = "status", description = "pet status in the store", required = false) + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ReadOnlyFirst.java index d54017b27cd5..d541a9eb596d 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ReadOnlyFirst.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ReadOnlyFirst.java @@ -34,9 +34,9 @@ public ReadOnlyFirst bar(String bar) { * Get bar * @return bar */ - @JsonProperty("bar") @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, required = false) + @JsonProperty("bar") public String getBar() { return bar; } @@ -54,9 +54,9 @@ public ReadOnlyFirst baz(String baz) { * Get baz * @return baz */ - @JsonProperty("baz") @Schema(name = "baz", required = false) + @JsonProperty("baz") public String getBaz() { return baz; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/SpecialModelName.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/SpecialModelName.java index 7fafc3d9f703..a734a8aea096 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/SpecialModelName.java @@ -34,9 +34,9 @@ public class SpecialModelName { * Get $specialPropertyName * @return $specialPropertyName */ - @JsonProperty("$special[property.name]") @Schema(name = "$special[property.name]", required = false) + @JsonProperty("$special[property.name]") public Long get$SpecialPropertyName() { return $specialPropertyName; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Tag.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Tag.java index baf617a35b78..b8c66ce8cd84 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Tag.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Tag.java @@ -34,9 +34,9 @@ public Tag id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -54,9 +54,9 @@ public Tag name(String name) { * Get name * @return name */ - @JsonProperty("name") @Schema(name = "name", required = false) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderDefault.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderDefault.java index 87985a0bf1a4..8861b19110e4 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderDefault.java @@ -44,9 +44,9 @@ public TypeHolderDefault stringItem(String stringItem) { * Get stringItem * @return stringItem */ - @JsonProperty("string_item") @NotNull @Schema(name = "string_item", required = true) + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -64,9 +64,9 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ - @JsonProperty("number_item") @NotNull @Valid @Schema(name = "number_item", required = true) + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -84,9 +84,9 @@ public TypeHolderDefault integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ - @JsonProperty("integer_item") @NotNull @Schema(name = "integer_item", required = true) + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -104,9 +104,9 @@ public TypeHolderDefault boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ - @JsonProperty("bool_item") @NotNull @Schema(name = "bool_item", required = true) + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -129,9 +129,9 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ - @JsonProperty("array_item") @NotNull @Schema(name = "array_item", required = true) + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderExample.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderExample.java index 3d6c875251e2..247bcab6f1e6 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderExample.java @@ -46,9 +46,9 @@ public TypeHolderExample stringItem(String stringItem) { * Get stringItem * @return stringItem */ - @JsonProperty("string_item") @NotNull @Schema(name = "string_item", example = "what", required = true) + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -66,9 +66,9 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ - @JsonProperty("number_item") @NotNull @Valid @Schema(name = "number_item", example = "1.234", required = true) + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -86,9 +86,9 @@ public TypeHolderExample floatItem(Float floatItem) { * Get floatItem * @return floatItem */ - @JsonProperty("float_item") @NotNull @Schema(name = "float_item", example = "1.234", required = true) + @JsonProperty("float_item") public Float getFloatItem() { return floatItem; } @@ -106,9 +106,9 @@ public TypeHolderExample integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ - @JsonProperty("integer_item") @NotNull @Schema(name = "integer_item", example = "-2", required = true) + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -126,9 +126,9 @@ public TypeHolderExample boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ - @JsonProperty("bool_item") @NotNull @Schema(name = "bool_item", example = "true", required = true) + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -151,9 +151,9 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ - @JsonProperty("array_item") @NotNull @Schema(name = "array_item", example = "[0, 1, 2, 3]", required = true) + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/User.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/User.java index 0e66e0d90459..451ffc93daca 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/User.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/User.java @@ -46,9 +46,9 @@ public User id(Long id) { * Get id * @return id */ - @JsonProperty("id") @Schema(name = "id", required = false) + @JsonProperty("id") public Long getId() { return id; } @@ -66,9 +66,9 @@ public User username(String username) { * Get username * @return username */ - @JsonProperty("username") @Schema(name = "username", required = false) + @JsonProperty("username") public String getUsername() { return username; } @@ -86,9 +86,9 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ - @JsonProperty("firstName") @Schema(name = "firstName", required = false) + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -106,9 +106,9 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ - @JsonProperty("lastName") @Schema(name = "lastName", required = false) + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -126,9 +126,9 @@ public User email(String email) { * Get email * @return email */ - @JsonProperty("email") @Schema(name = "email", required = false) + @JsonProperty("email") public String getEmail() { return email; } @@ -146,9 +146,9 @@ public User password(String password) { * Get password * @return password */ - @JsonProperty("password") @Schema(name = "password", required = false) + @JsonProperty("password") public String getPassword() { return password; } @@ -166,9 +166,9 @@ public User phone(String phone) { * Get phone * @return phone */ - @JsonProperty("phone") @Schema(name = "phone", required = false) + @JsonProperty("phone") public String getPhone() { return phone; } @@ -186,9 +186,9 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ - @JsonProperty("userStatus") @Schema(name = "userStatus", description = "User Status", required = false) + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/XmlItem.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/XmlItem.java index 2a82ab34e39d..cb3cda34b879 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/XmlItem.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/XmlItem.java @@ -100,9 +100,9 @@ public XmlItem attributeString(String attributeString) { * Get attributeString * @return attributeString */ - @JsonProperty("attribute_string") @Schema(name = "attribute_string", example = "string", required = false) + @JsonProperty("attribute_string") public String getAttributeString() { return attributeString; } @@ -120,9 +120,9 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) { * Get attributeNumber * @return attributeNumber */ - @JsonProperty("attribute_number") @Valid @Schema(name = "attribute_number", example = "1.234", required = false) + @JsonProperty("attribute_number") public BigDecimal getAttributeNumber() { return attributeNumber; } @@ -140,9 +140,9 @@ public XmlItem attributeInteger(Integer attributeInteger) { * Get attributeInteger * @return attributeInteger */ - @JsonProperty("attribute_integer") @Schema(name = "attribute_integer", example = "-2", required = false) + @JsonProperty("attribute_integer") public Integer getAttributeInteger() { return attributeInteger; } @@ -160,9 +160,9 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) { * Get attributeBoolean * @return attributeBoolean */ - @JsonProperty("attribute_boolean") @Schema(name = "attribute_boolean", example = "true", required = false) + @JsonProperty("attribute_boolean") public Boolean getAttributeBoolean() { return attributeBoolean; } @@ -188,9 +188,9 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) { * Get wrappedArray * @return wrappedArray */ - @JsonProperty("wrapped_array") @Schema(name = "wrapped_array", required = false) + @JsonProperty("wrapped_array") public List getWrappedArray() { return wrappedArray; } @@ -208,9 +208,9 @@ public XmlItem nameString(String nameString) { * Get nameString * @return nameString */ - @JsonProperty("name_string") @Schema(name = "name_string", example = "string", required = false) + @JsonProperty("name_string") public String getNameString() { return nameString; } @@ -228,9 +228,9 @@ public XmlItem nameNumber(BigDecimal nameNumber) { * Get nameNumber * @return nameNumber */ - @JsonProperty("name_number") @Valid @Schema(name = "name_number", example = "1.234", required = false) + @JsonProperty("name_number") public BigDecimal getNameNumber() { return nameNumber; } @@ -248,9 +248,9 @@ public XmlItem nameInteger(Integer nameInteger) { * Get nameInteger * @return nameInteger */ - @JsonProperty("name_integer") @Schema(name = "name_integer", example = "-2", required = false) + @JsonProperty("name_integer") public Integer getNameInteger() { return nameInteger; } @@ -268,9 +268,9 @@ public XmlItem nameBoolean(Boolean nameBoolean) { * Get nameBoolean * @return nameBoolean */ - @JsonProperty("name_boolean") @Schema(name = "name_boolean", example = "true", required = false) + @JsonProperty("name_boolean") public Boolean getNameBoolean() { return nameBoolean; } @@ -296,9 +296,9 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) { * Get nameArray * @return nameArray */ - @JsonProperty("name_array") @Schema(name = "name_array", required = false) + @JsonProperty("name_array") public List getNameArray() { return nameArray; } @@ -324,9 +324,9 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) { * Get nameWrappedArray * @return nameWrappedArray */ - @JsonProperty("name_wrapped_array") @Schema(name = "name_wrapped_array", required = false) + @JsonProperty("name_wrapped_array") public List getNameWrappedArray() { return nameWrappedArray; } @@ -344,9 +344,9 @@ public XmlItem prefixString(String prefixString) { * Get prefixString * @return prefixString */ - @JsonProperty("prefix_string") @Schema(name = "prefix_string", example = "string", required = false) + @JsonProperty("prefix_string") public String getPrefixString() { return prefixString; } @@ -364,9 +364,9 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) { * Get prefixNumber * @return prefixNumber */ - @JsonProperty("prefix_number") @Valid @Schema(name = "prefix_number", example = "1.234", required = false) + @JsonProperty("prefix_number") public BigDecimal getPrefixNumber() { return prefixNumber; } @@ -384,9 +384,9 @@ public XmlItem prefixInteger(Integer prefixInteger) { * Get prefixInteger * @return prefixInteger */ - @JsonProperty("prefix_integer") @Schema(name = "prefix_integer", example = "-2", required = false) + @JsonProperty("prefix_integer") public Integer getPrefixInteger() { return prefixInteger; } @@ -404,9 +404,9 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) { * Get prefixBoolean * @return prefixBoolean */ - @JsonProperty("prefix_boolean") @Schema(name = "prefix_boolean", example = "true", required = false) + @JsonProperty("prefix_boolean") public Boolean getPrefixBoolean() { return prefixBoolean; } @@ -432,9 +432,9 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) { * Get prefixArray * @return prefixArray */ - @JsonProperty("prefix_array") @Schema(name = "prefix_array", required = false) + @JsonProperty("prefix_array") public List getPrefixArray() { return prefixArray; } @@ -460,9 +460,9 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) { * Get prefixWrappedArray * @return prefixWrappedArray */ - @JsonProperty("prefix_wrapped_array") @Schema(name = "prefix_wrapped_array", required = false) + @JsonProperty("prefix_wrapped_array") public List getPrefixWrappedArray() { return prefixWrappedArray; } @@ -480,9 +480,9 @@ public XmlItem namespaceString(String namespaceString) { * Get namespaceString * @return namespaceString */ - @JsonProperty("namespace_string") @Schema(name = "namespace_string", example = "string", required = false) + @JsonProperty("namespace_string") public String getNamespaceString() { return namespaceString; } @@ -500,9 +500,9 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) { * Get namespaceNumber * @return namespaceNumber */ - @JsonProperty("namespace_number") @Valid @Schema(name = "namespace_number", example = "1.234", required = false) + @JsonProperty("namespace_number") public BigDecimal getNamespaceNumber() { return namespaceNumber; } @@ -520,9 +520,9 @@ public XmlItem namespaceInteger(Integer namespaceInteger) { * Get namespaceInteger * @return namespaceInteger */ - @JsonProperty("namespace_integer") @Schema(name = "namespace_integer", example = "-2", required = false) + @JsonProperty("namespace_integer") public Integer getNamespaceInteger() { return namespaceInteger; } @@ -540,9 +540,9 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) { * Get namespaceBoolean * @return namespaceBoolean */ - @JsonProperty("namespace_boolean") @Schema(name = "namespace_boolean", example = "true", required = false) + @JsonProperty("namespace_boolean") public Boolean getNamespaceBoolean() { return namespaceBoolean; } @@ -568,9 +568,9 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) { * Get namespaceArray * @return namespaceArray */ - @JsonProperty("namespace_array") @Schema(name = "namespace_array", required = false) + @JsonProperty("namespace_array") public List getNamespaceArray() { return namespaceArray; } @@ -596,9 +596,9 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) { * Get namespaceWrappedArray * @return namespaceWrappedArray */ - @JsonProperty("namespace_wrapped_array") @Schema(name = "namespace_wrapped_array", required = false) + @JsonProperty("namespace_wrapped_array") public List getNamespaceWrappedArray() { return namespaceWrappedArray; } @@ -616,9 +616,9 @@ public XmlItem prefixNsString(String prefixNsString) { * Get prefixNsString * @return prefixNsString */ - @JsonProperty("prefix_ns_string") @Schema(name = "prefix_ns_string", example = "string", required = false) + @JsonProperty("prefix_ns_string") public String getPrefixNsString() { return prefixNsString; } @@ -636,9 +636,9 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) { * Get prefixNsNumber * @return prefixNsNumber */ - @JsonProperty("prefix_ns_number") @Valid @Schema(name = "prefix_ns_number", example = "1.234", required = false) + @JsonProperty("prefix_ns_number") public BigDecimal getPrefixNsNumber() { return prefixNsNumber; } @@ -656,9 +656,9 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) { * Get prefixNsInteger * @return prefixNsInteger */ - @JsonProperty("prefix_ns_integer") @Schema(name = "prefix_ns_integer", example = "-2", required = false) + @JsonProperty("prefix_ns_integer") public Integer getPrefixNsInteger() { return prefixNsInteger; } @@ -676,9 +676,9 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) { * Get prefixNsBoolean * @return prefixNsBoolean */ - @JsonProperty("prefix_ns_boolean") @Schema(name = "prefix_ns_boolean", example = "true", required = false) + @JsonProperty("prefix_ns_boolean") public Boolean getPrefixNsBoolean() { return prefixNsBoolean; } @@ -704,9 +704,9 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) { * Get prefixNsArray * @return prefixNsArray */ - @JsonProperty("prefix_ns_array") @Schema(name = "prefix_ns_array", required = false) + @JsonProperty("prefix_ns_array") public List getPrefixNsArray() { return prefixNsArray; } @@ -732,9 +732,9 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) { * Get prefixNsWrappedArray * @return prefixNsWrappedArray */ - @JsonProperty("prefix_ns_wrapped_array") @Schema(name = "prefix_ns_wrapped_array", required = false) + @JsonProperty("prefix_ns_wrapped_array") public List getPrefixNsWrappedArray() { return prefixNsWrappedArray; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-virtualan/src/main/resources/openapi.yaml index 2999e6f2f8d6..5fdcfc33eada 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-virtualan/src/main/resources/openapi.yaml @@ -2111,7 +2111,6 @@ components: status: description: Updated status of the pet type: string - type: object uploadFile_request: properties: additionalMetadata: @@ -2121,7 +2120,6 @@ components: description: file to upload format: binary type: string - type: object testEnumParameters_request: properties: enum_form_string_array: @@ -2141,7 +2139,6 @@ components: - -efg - (xyz) type: string - type: object testEndpointParameters_request: properties: integer: @@ -2214,7 +2211,6 @@ components: - double - number - pattern_without_delimiter - type: object testJsonFormData_request: properties: param: @@ -2226,7 +2222,6 @@ components: required: - param - param2 - type: object uploadFileWithRequiredFile_request: properties: additionalMetadata: @@ -2238,7 +2233,6 @@ components: type: string required: - requiredFile - type: object Dog_allOf: properties: breed: diff --git a/samples/server/petstore/springboot/.openapi-generator/FILES b/samples/server/petstore/springboot/.openapi-generator/FILES index 3c2e959bec02..32fdc6a9409b 100644 --- a/samples/server/petstore/springboot/.openapi-generator/FILES +++ b/samples/server/petstore/springboot/.openapi-generator/FILES @@ -15,7 +15,6 @@ src/main/java/org/openapitools/api/StoreApi.java src/main/java/org/openapitools/api/StoreApiController.java src/main/java/org/openapitools/api/UserApi.java src/main/java/org/openapitools/api/UserApiController.java -src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/configuration/SpringFoxConfiguration.java src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java diff --git a/samples/server/petstore/springboot/.openapi-generator/VERSION b/samples/server/petstore/springboot/.openapi-generator/VERSION index d6b4ec4aa783..ed829dbcddec 100644 --- a/samples/server/petstore/springboot/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0-SNAPSHOT \ No newline at end of file +6.2.1-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java index b45fcc5dc16c..9ecd403de93c 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApiController.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApiController.java index c2db7ca5a815..65c9de6908c2 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApiController.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApiController.java @@ -28,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class AnotherFakeApiController implements AnotherFakeApi { private final NativeWebRequest request; 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 1220ac16e008..4b87b2def473 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApiController.java index 5ae5d5fed985..b30f53bb595c 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApiController.java @@ -38,7 +38,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeApiController implements FakeApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index d54c2670f8e2..decd021376d6 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java index 65b695629d43..05196793d4c2 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java @@ -28,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeClassnameTestApiController implements FakeClassnameTestApi { private final NativeWebRequest request; 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 60ccea3635bc..6247af5faa7b 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApiController.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApiController.java index ea6c56e02c11..0b88e5980bf1 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApiController.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApiController.java @@ -30,7 +30,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class PetApiController implements PetApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java index 1afb547b40ee..f4319f650f50 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApiController.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApiController.java index 1292dc0b721d..f8c784ff3838 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApiController.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApiController.java @@ -29,7 +29,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class StoreApiController implements StoreApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java index 981e3a95cbe6..e458b4a0b8bf 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApiController.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApiController.java index ca00184d2a56..894bf6db762e 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApiController.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApiController.java @@ -30,7 +30,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class UserApiController implements UserApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index cb51920a8c28..686fafb2faaf 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -35,9 +35,9 @@ public AdditionalPropertiesAnyType name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 1c66a636116f..a2c3df24a2df 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -36,9 +36,9 @@ public AdditionalPropertiesArray name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 1dcc607639bf..82fcada6f56a 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -35,9 +35,9 @@ public AdditionalPropertiesBoolean name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 74250eb564ad..7b720b30d83a 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -73,9 +73,9 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt * Get mapString * @return mapString */ - @JsonProperty("map_string") @ApiModelProperty(value = "") + @JsonProperty("map_string") public Map getMapString() { return mapString; } @@ -101,9 +101,9 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * Get mapNumber * @return mapNumber */ - @JsonProperty("map_number") @Valid @ApiModelProperty(value = "") + @JsonProperty("map_number") public Map getMapNumber() { return mapNumber; } @@ -129,9 +129,9 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege * Get mapInteger * @return mapInteger */ - @JsonProperty("map_integer") @ApiModelProperty(value = "") + @JsonProperty("map_integer") public Map getMapInteger() { return mapInteger; } @@ -157,9 +157,9 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea * Get mapBoolean * @return mapBoolean */ - @JsonProperty("map_boolean") @ApiModelProperty(value = "") + @JsonProperty("map_boolean") public Map getMapBoolean() { return mapBoolean; } @@ -185,9 +185,9 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { return mapArrayInteger; } @@ -213,9 +213,9 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * Get mapArrayAnytype * @return mapArrayAnytype */ - @JsonProperty("map_array_anytype") @Valid @ApiModelProperty(value = "") + @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { return mapArrayAnytype; } @@ -241,9 +241,9 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { return mapMapString; } @@ -269,9 +269,9 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { return mapMapAnytype; } @@ -289,9 +289,9 @@ public AdditionalPropertiesClass anytype1(Object anytype1) { * Get anytype1 * @return anytype1 */ - @JsonProperty("anytype_1") @ApiModelProperty(value = "") + @JsonProperty("anytype_1") public Object getAnytype1() { return anytype1; } @@ -309,9 +309,9 @@ public AdditionalPropertiesClass anytype2(Object anytype2) { * Get anytype2 * @return anytype2 */ - @JsonProperty("anytype_2") @ApiModelProperty(value = "") + @JsonProperty("anytype_2") public Object getAnytype2() { return anytype2; } @@ -329,9 +329,9 @@ public AdditionalPropertiesClass anytype3(Object anytype3) { * Get anytype3 * @return anytype3 */ - @JsonProperty("anytype_3") @ApiModelProperty(value = "") + @JsonProperty("anytype_3") public Object getAnytype3() { return anytype3; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index ce8b8d62436c..ea2ec5365edc 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -35,9 +35,9 @@ public AdditionalPropertiesInteger name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index dec791e0a273..4ca4b5a2f509 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -36,9 +36,9 @@ public AdditionalPropertiesNumber name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 546d0ab9216f..7b9d8ef0b0b2 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -35,9 +35,9 @@ public AdditionalPropertiesObject name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index c1f95cf62e81..fdc4baa9de7b 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -35,9 +35,9 @@ public AdditionalPropertiesString name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Animal.java index e880f829164c..dfb303255b3b 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Animal.java @@ -52,9 +52,9 @@ public Animal className(String className) { * Get className * @return className */ - @JsonProperty("className") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("className") public String getClassName() { return className; } @@ -72,9 +72,9 @@ public Animal color(String color) { * Get color * @return color */ - @JsonProperty("color") @ApiModelProperty(value = "") + @JsonProperty("color") public String getColor() { return color; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 46ab3b631960..42b8443e9be2 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -45,9 +45,9 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * Get arrayArrayNumber * @return arrayArrayNumber */ - @JsonProperty("ArrayArrayNumber") @Valid @ApiModelProperty(value = "") + @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index cb5358905469..f60290a4d8ad 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -45,9 +45,9 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ - @JsonProperty("ArrayNumber") @Valid @ApiModelProperty(value = "") + @JsonProperty("ArrayNumber") public List getArrayNumber() { return arrayNumber; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayTest.java index 55cc431ecde6..8bb3f76ca666 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayTest.java @@ -51,9 +51,9 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) { * Get arrayOfString * @return arrayOfString */ - @JsonProperty("array_of_string") @ApiModelProperty(value = "") + @JsonProperty("array_of_string") public List getArrayOfString() { return arrayOfString; } @@ -79,9 +79,9 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ - @JsonProperty("array_array_of_integer") @Valid @ApiModelProperty(value = "") + @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; } @@ -107,9 +107,9 @@ public ArrayTest addArrayArrayOfModelItem(List arrayArrayOfModelI * Get arrayArrayOfModel * @return arrayArrayOfModel */ - @JsonProperty("array_array_of_model") @Valid @ApiModelProperty(value = "") + @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCat.java index 70bbb0b93532..16372fb10406 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCat.java @@ -78,9 +78,9 @@ public BigCat kind(KindEnum kind) { * Get kind * @return kind */ - @JsonProperty("kind") @ApiModelProperty(value = "") + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCatAllOf.java index 1a86665050e6..59ab1d8d2bf8 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCatAllOf.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCatAllOf.java @@ -75,9 +75,9 @@ public BigCatAllOf kind(KindEnum kind) { * Get kind * @return kind */ - @JsonProperty("kind") @ApiModelProperty(value = "") + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Capitalization.java index e0fdbe78bae2..feb0d643c5e5 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Capitalization.java @@ -43,9 +43,9 @@ public Capitalization smallCamel(String smallCamel) { * Get smallCamel * @return smallCamel */ - @JsonProperty("smallCamel") @ApiModelProperty(value = "") + @JsonProperty("smallCamel") public String getSmallCamel() { return smallCamel; } @@ -63,9 +63,9 @@ public Capitalization capitalCamel(String capitalCamel) { * Get capitalCamel * @return capitalCamel */ - @JsonProperty("CapitalCamel") @ApiModelProperty(value = "") + @JsonProperty("CapitalCamel") public String getCapitalCamel() { return capitalCamel; } @@ -83,9 +83,9 @@ public Capitalization smallSnake(String smallSnake) { * Get smallSnake * @return smallSnake */ - @JsonProperty("small_Snake") @ApiModelProperty(value = "") + @JsonProperty("small_Snake") public String getSmallSnake() { return smallSnake; } @@ -103,9 +103,9 @@ public Capitalization capitalSnake(String capitalSnake) { * Get capitalSnake * @return capitalSnake */ - @JsonProperty("Capital_Snake") @ApiModelProperty(value = "") + @JsonProperty("Capital_Snake") public String getCapitalSnake() { return capitalSnake; } @@ -123,9 +123,9 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) { * Get scAETHFlowPoints * @return scAETHFlowPoints */ - @JsonProperty("SCA_ETH_Flow_Points") @ApiModelProperty(value = "") + @JsonProperty("SCA_ETH_Flow_Points") public String getScAETHFlowPoints() { return scAETHFlowPoints; } @@ -143,9 +143,9 @@ public Capitalization ATT_NAME(String ATT_NAME) { * Name of the pet * @return ATT_NAME */ - @JsonProperty("ATT_NAME") @ApiModelProperty(value = "Name of the pet ") + @JsonProperty("ATT_NAME") public String getATTNAME() { return ATT_NAME; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Cat.java index 958fcb2298e0..04fd58e2e14a 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Cat.java @@ -47,9 +47,9 @@ public Cat declawed(Boolean declawed) { * Get declawed * @return declawed */ - @JsonProperty("declawed") @ApiModelProperty(value = "") + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CatAllOf.java index 63de2ad8818e..85c6885ae000 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CatAllOf.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CatAllOf.java @@ -35,9 +35,9 @@ public CatAllOf declawed(Boolean declawed) { * Get declawed * @return declawed */ - @JsonProperty("declawed") @ApiModelProperty(value = "") + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Category.java index b63268b2c8ce..3b813dcea538 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Category.java @@ -35,9 +35,9 @@ public Category id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -55,9 +55,9 @@ public Category name(String name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ClassModel.java index 976f0b01d071..2c511abe3ecb 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ClassModel.java @@ -34,9 +34,9 @@ public ClassModel propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ - @JsonProperty("_class") @ApiModelProperty(value = "") + @JsonProperty("_class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Client.java index a3c4731f3339..a6bfdf58db7f 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Client.java @@ -33,9 +33,9 @@ public Client client(String client) { * Get client * @return client */ - @JsonProperty("client") @ApiModelProperty(value = "") + @JsonProperty("client") public String getClient() { return client; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Dog.java index 593562fabb42..a75ee6095e33 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Dog.java @@ -38,9 +38,9 @@ public Dog breed(String breed) { * Get breed * @return breed */ - @JsonProperty("breed") @ApiModelProperty(value = "") + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/DogAllOf.java index 7ddb24717737..5784d207b4d2 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/DogAllOf.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/DogAllOf.java @@ -35,9 +35,9 @@ public DogAllOf breed(String breed) { * Get breed * @return breed */ - @JsonProperty("breed") @ApiModelProperty(value = "") + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumArrays.java index 04e850b1cf17..43a28057b120 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumArrays.java @@ -109,9 +109,9 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) { * Get justSymbol * @return justSymbol */ - @JsonProperty("just_symbol") @ApiModelProperty(value = "") + @JsonProperty("just_symbol") public JustSymbolEnum getJustSymbol() { return justSymbol; } @@ -137,9 +137,9 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) { * Get arrayEnum * @return arrayEnum */ - @JsonProperty("array_enum") @ApiModelProperty(value = "") + @JsonProperty("array_enum") public List getArrayEnum() { return arrayEnum; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumTest.java index 49747f67dccf..3f7af66d4ce7 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumTest.java @@ -189,9 +189,9 @@ public EnumTest enumString(EnumStringEnum enumString) { * Get enumString * @return enumString */ - @JsonProperty("enum_string") @ApiModelProperty(value = "") + @JsonProperty("enum_string") public EnumStringEnum getEnumString() { return enumString; } @@ -209,9 +209,9 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) { * Get enumStringRequired * @return enumStringRequired */ - @JsonProperty("enum_string_required") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("enum_string_required") public EnumStringRequiredEnum getEnumStringRequired() { return enumStringRequired; } @@ -229,9 +229,9 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) { * Get enumInteger * @return enumInteger */ - @JsonProperty("enum_integer") @ApiModelProperty(value = "") + @JsonProperty("enum_integer") public EnumIntegerEnum getEnumInteger() { return enumInteger; } @@ -249,9 +249,9 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) { * Get enumNumber * @return enumNumber */ - @JsonProperty("enum_number") @ApiModelProperty(value = "") + @JsonProperty("enum_number") public EnumNumberEnum getEnumNumber() { return enumNumber; } @@ -269,9 +269,9 @@ public EnumTest outerEnum(OuterEnum outerEnum) { * Get outerEnum * @return outerEnum */ - @JsonProperty("outerEnum") @Valid @ApiModelProperty(value = "") + @JsonProperty("outerEnum") public OuterEnum getOuterEnum() { return outerEnum; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/File.java index 43c44fd344bb..fedeea1c6389 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/File.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/File.java @@ -34,9 +34,9 @@ public File sourceURI(String sourceURI) { * Test capitalization * @return sourceURI */ - @JsonProperty("sourceURI") @ApiModelProperty(value = "Test capitalization") + @JsonProperty("sourceURI") public String getSourceURI() { return sourceURI; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileSchemaTestClass.java index d7815943b774..81fc87926e00 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -39,9 +39,9 @@ public FileSchemaTestClass file(File file) { * Get file * @return file */ - @JsonProperty("file") @Valid @ApiModelProperty(value = "") + @JsonProperty("file") public File getFile() { return file; } @@ -67,9 +67,9 @@ public FileSchemaTestClass addFilesItem(File filesItem) { * Get files * @return files */ - @JsonProperty("files") @Valid @ApiModelProperty(value = "") + @JsonProperty("files") public List getFiles() { return files; } 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 ffd18f0ce221..e8697b47182b 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 @@ -71,9 +71,9 @@ public FormatTest integer(Integer integer) { * maximum: 100 * @return integer */ - @JsonProperty("integer") @Min(10) @Max(100) @ApiModelProperty(value = "") + @JsonProperty("integer") public Integer getInteger() { return integer; } @@ -93,9 +93,9 @@ public FormatTest int32(Integer int32) { * maximum: 200 * @return int32 */ - @JsonProperty("int32") @Min(20) @Max(200) @ApiModelProperty(value = "") + @JsonProperty("int32") public Integer getInt32() { return int32; } @@ -113,9 +113,9 @@ public FormatTest int64(Long int64) { * Get int64 * @return int64 */ - @JsonProperty("int64") @ApiModelProperty(value = "") + @JsonProperty("int64") public Long getInt64() { return int64; } @@ -135,9 +135,9 @@ public FormatTest number(BigDecimal number) { * maximum: 543.2 * @return number */ - @JsonProperty("number") @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") @ApiModelProperty(required = true, value = "") + @JsonProperty("number") public BigDecimal getNumber() { return number; } @@ -157,9 +157,9 @@ public FormatTest _float(Float _float) { * maximum: 987.6 * @return _float */ - @JsonProperty("float") @DecimalMin("54.3") @DecimalMax("987.6") @ApiModelProperty(value = "") + @JsonProperty("float") public Float getFloat() { return _float; } @@ -179,9 +179,9 @@ public FormatTest _double(Double _double) { * maximum: 123.4 * @return _double */ - @JsonProperty("double") @DecimalMin("67.8") @DecimalMax("123.4") @ApiModelProperty(value = "") + @JsonProperty("double") public Double getDouble() { return _double; } @@ -199,9 +199,9 @@ public FormatTest string(String string) { * Get string * @return string */ - @JsonProperty("string") @Pattern(regexp = "/[a-z]/i") @ApiModelProperty(value = "") + @JsonProperty("string") public String getString() { return string; } @@ -219,9 +219,9 @@ public FormatTest _byte(byte[] _byte) { * Get _byte * @return _byte */ - @JsonProperty("byte") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("byte") public byte[] getByte() { return _byte; } @@ -239,9 +239,9 @@ public FormatTest binary(org.springframework.core.io.Resource binary) { * Get binary * @return binary */ - @JsonProperty("binary") @Valid @ApiModelProperty(value = "") + @JsonProperty("binary") public org.springframework.core.io.Resource getBinary() { return binary; } @@ -259,9 +259,9 @@ public FormatTest date(LocalDate date) { * Get date * @return date */ - @JsonProperty("date") @NotNull @Valid @ApiModelProperty(required = true, value = "") + @JsonProperty("date") public LocalDate getDate() { return date; } @@ -279,9 +279,9 @@ public FormatTest dateTime(OffsetDateTime dateTime) { * Get dateTime * @return dateTime */ - @JsonProperty("dateTime") @Valid @ApiModelProperty(value = "") + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -299,9 +299,9 @@ public FormatTest uuid(UUID uuid) { * Get uuid * @return uuid */ - @JsonProperty("uuid") @Valid @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -319,9 +319,9 @@ public FormatTest password(String password) { * Get password * @return password */ - @JsonProperty("password") @NotNull @Size(min = 10, max = 64) @ApiModelProperty(required = true, value = "") + @JsonProperty("password") public String getPassword() { return password; } @@ -339,9 +339,9 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) { * Get bigDecimal * @return bigDecimal */ - @JsonProperty("BigDecimal") @Valid @ApiModelProperty(value = "") + @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { return bigDecimal; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index 948ed9a0731d..21a424459798 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -37,9 +37,9 @@ public HasOnlyReadOnly bar(String bar) { * Get bar * @return bar */ - @JsonProperty("bar") @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("bar") public String getBar() { return bar; } @@ -57,9 +57,9 @@ public HasOnlyReadOnly foo(String foo) { * Get foo * @return foo */ - @JsonProperty("foo") @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("foo") public String getFoo() { return foo; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MapTest.java index 94d4ae9a9d56..76c6bee7adcb 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MapTest.java @@ -89,9 +89,9 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapMapOfString * @return mapMapOfString */ - @JsonProperty("map_map_of_string") @Valid @ApiModelProperty(value = "") + @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { return mapMapOfString; } @@ -117,9 +117,9 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) * Get mapOfEnumString * @return mapOfEnumString */ - @JsonProperty("map_of_enum_string") @ApiModelProperty(value = "") + @JsonProperty("map_of_enum_string") public Map getMapOfEnumString() { return mapOfEnumString; } @@ -145,9 +145,9 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) { * Get directMap * @return directMap */ - @JsonProperty("direct_map") @ApiModelProperty(value = "") + @JsonProperty("direct_map") public Map getDirectMap() { return directMap; } @@ -173,9 +173,9 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) { * Get indirectMap * @return indirectMap */ - @JsonProperty("indirect_map") @ApiModelProperty(value = "") + @JsonProperty("indirect_map") public Map getIndirectMap() { return indirectMap; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 89a2475d82fb..f9e2230eba97 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -45,9 +45,9 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { * Get uuid * @return uuid */ - @JsonProperty("uuid") @Valid @ApiModelProperty(value = "") + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -65,9 +65,9 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT * Get dateTime * @return dateTime */ - @JsonProperty("dateTime") @Valid @ApiModelProperty(value = "") + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -93,9 +93,9 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * Get map * @return map */ - @JsonProperty("map") @Valid @ApiModelProperty(value = "") + @JsonProperty("map") public Map getMap() { return map; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Model200Response.java index c3c3bba996d8..193231f85457 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Model200Response.java @@ -38,9 +38,9 @@ public Model200Response name(Integer name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public Integer getName() { return name; } @@ -58,9 +58,9 @@ public Model200Response propertyClass(String propertyClass) { * Get propertyClass * @return propertyClass */ - @JsonProperty("class") @ApiModelProperty(value = "") + @JsonProperty("class") public String getPropertyClass() { return propertyClass; } @@ -77,9 +77,9 @@ public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) { return false; } - Model200Response _200Response = (Model200Response) o; - return Objects.equals(this.name, _200Response.name) && - Objects.equals(this.propertyClass, _200Response.propertyClass); + Model200Response _200response = (Model200Response) o; + return Objects.equals(this.name, _200response.name) && + Objects.equals(this.propertyClass, _200response.propertyClass); } @Override diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ModelApiResponse.java index 29f3f43cf20e..693e1669879c 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -39,9 +39,9 @@ public ModelApiResponse code(Integer code) { * Get code * @return code */ - @JsonProperty("code") @ApiModelProperty(value = "") + @JsonProperty("code") public Integer getCode() { return code; } @@ -59,9 +59,9 @@ public ModelApiResponse type(String type) { * Get type * @return type */ - @JsonProperty("type") @ApiModelProperty(value = "") + @JsonProperty("type") public String getType() { return type; } @@ -79,9 +79,9 @@ public ModelApiResponse message(String message) { * Get message * @return message */ - @JsonProperty("message") @ApiModelProperty(value = "") + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ModelList.java index 4bb0e66c8673..7853f3d408a0 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ModelList.java @@ -24,26 +24,26 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelList { - @JsonProperty("123-list") - private String _123List; + private String _123list; - public ModelList _123List(String _123List) { - this._123List = _123List; + public ModelList _123list(String _123list) { + this._123list = _123list; return this; } /** - * Get _123List - * @return _123List + * Get _123list + * @return _123list */ @ApiModelProperty(value = "") - public String get123List() { - return _123List; + @JsonProperty("123-list") + public String get123list() { + return _123list; } - public void set123List(String _123List) { - this._123List = _123List; + public void set123list(String _123list) { + this._123list = _123list; } @Override @@ -55,19 +55,19 @@ public boolean equals(Object o) { return false; } ModelList _list = (ModelList) o; - return Objects.equals(this._123List, _list._123List); + return Objects.equals(this._123list, _list._123list); } @Override public int hashCode() { - return Objects.hash(_123List); + return Objects.hash(_123list); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class ModelList {\n"); - sb.append(" _123List: ").append(toIndentedString(_123List)).append("\n"); + sb.append(" _123list: ").append(toIndentedString(_123list)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ModelReturn.java index d8fc618d9dfb..b6f106cea222 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ModelReturn.java @@ -36,9 +36,9 @@ public ModelReturn _return(Integer _return) { * Get _return * @return _return */ - @JsonProperty("return") @ApiModelProperty(value = "") + @JsonProperty("return") public Integer getReturn() { return _return; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Name.java index 41a7593f0efc..32403fe65891 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Name.java @@ -23,17 +23,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Name { - @JsonProperty("name") private Integer name; - @JsonProperty("snake_case") private Integer snakeCase; - @JsonProperty("property") private String property; - @JsonProperty("123Number") - private Integer _123Number; + private Integer _123number; public Name name(Integer name) { this.name = name; @@ -46,6 +42,7 @@ public Name name(Integer name) { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("name") public Integer getName() { return name; } @@ -65,6 +62,7 @@ public Name snakeCase(Integer snakeCase) { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("snake_case") public Integer getSnakeCase() { return snakeCase; } @@ -84,6 +82,7 @@ public Name property(String property) { */ @ApiModelProperty(value = "") + @JsonProperty("property") public String getProperty() { return property; } @@ -92,23 +91,24 @@ public void setProperty(String property) { this.property = property; } - public Name _123Number(Integer _123Number) { - this._123Number = _123Number; + public Name _123number(Integer _123number) { + this._123number = _123number; return this; } /** - * Get _123Number - * @return _123Number + * Get _123number + * @return _123number */ @ApiModelProperty(readOnly = true, value = "") - public Integer get123Number() { - return _123Number; + @JsonProperty("123Number") + public Integer get123number() { + return _123number; } - public void set123Number(Integer _123Number) { - this._123Number = _123Number; + public void set123number(Integer _123number) { + this._123number = _123number; } @Override @@ -123,12 +123,12 @@ public boolean equals(Object o) { return Objects.equals(this.name, name.name) && Objects.equals(this.snakeCase, name.snakeCase) && Objects.equals(this.property, name.property) && - Objects.equals(this._123Number, name._123Number); + Objects.equals(this._123number, name._123number); } @Override public int hashCode() { - return Objects.hash(name, snakeCase, property, _123Number); + return Objects.hash(name, snakeCase, property, _123number); } @Override @@ -138,7 +138,7 @@ public String toString() { sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" snakeCase: ").append(toIndentedString(snakeCase)).append("\n"); sb.append(" property: ").append(toIndentedString(property)).append("\n"); - sb.append(" _123Number: ").append(toIndentedString(_123Number)).append("\n"); + sb.append(" _123number: ").append(toIndentedString(_123number)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NumberOnly.java index 8f2f2b19b191..1e3f9e15421d 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NumberOnly.java @@ -34,9 +34,9 @@ public NumberOnly justNumber(BigDecimal justNumber) { * Get justNumber * @return justNumber */ - @JsonProperty("JustNumber") @Valid @ApiModelProperty(value = "") + @JsonProperty("JustNumber") public BigDecimal getJustNumber() { return justNumber; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Order.java index feac4d2cad8d..b24c70c07808 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Order.java @@ -84,9 +84,9 @@ public Order id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -104,9 +104,9 @@ public Order petId(Long petId) { * Get petId * @return petId */ - @JsonProperty("petId") @ApiModelProperty(value = "") + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -124,9 +124,9 @@ public Order quantity(Integer quantity) { * Get quantity * @return quantity */ - @JsonProperty("quantity") @ApiModelProperty(value = "") + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -144,9 +144,9 @@ public Order shipDate(OffsetDateTime shipDate) { * Get shipDate * @return shipDate */ - @JsonProperty("shipDate") @Valid @ApiModelProperty(value = "") + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -164,9 +164,9 @@ public Order status(StatusEnum status) { * Order Status * @return status */ - @JsonProperty("status") @ApiModelProperty(value = "Order Status") + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -184,9 +184,9 @@ public Order complete(Boolean complete) { * Get complete * @return complete */ - @JsonProperty("complete") @ApiModelProperty(value = "") + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OuterComposite.java index 00cce99097d7..ade2b9150190 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OuterComposite.java @@ -38,9 +38,9 @@ public OuterComposite myNumber(BigDecimal myNumber) { * Get myNumber * @return myNumber */ - @JsonProperty("my_number") @Valid @ApiModelProperty(value = "") + @JsonProperty("my_number") public BigDecimal getMyNumber() { return myNumber; } @@ -58,9 +58,9 @@ public OuterComposite myString(String myString) { * Get myString * @return myString */ - @JsonProperty("my_string") @ApiModelProperty(value = "") + @JsonProperty("my_string") public String getMyString() { return myString; } @@ -78,9 +78,9 @@ public OuterComposite myBoolean(Boolean myBoolean) { * Get myBoolean * @return myBoolean */ - @JsonProperty("my_boolean") @ApiModelProperty(value = "") + @JsonProperty("my_boolean") public Boolean getMyBoolean() { return myBoolean; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java index e39c22373324..b9358e2b1e87 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java @@ -90,9 +90,9 @@ public Pet id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -110,9 +110,9 @@ public Pet category(Category category) { * Get category * @return category */ - @JsonProperty("category") @Valid @ApiModelProperty(value = "") + @JsonProperty("category") public Category getCategory() { return category; } @@ -130,9 +130,9 @@ public Pet name(String name) { * Get name * @return name */ - @JsonProperty("name") @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") + @JsonProperty("name") public String getName() { return name; } @@ -155,9 +155,9 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls */ - @JsonProperty("photoUrls") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("photoUrls") public Set getPhotoUrls() { return photoUrls; } @@ -184,9 +184,9 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @JsonProperty("tags") @Valid @ApiModelProperty(value = "") + @JsonProperty("tags") public List getTags() { return tags; } @@ -204,9 +204,9 @@ public Pet status(StatusEnum status) { * pet status in the store * @return status */ - @JsonProperty("status") @ApiModelProperty(value = "pet status in the store") + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ReadOnlyFirst.java index d02b8c8cfd53..3eb0ebe069c1 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -35,9 +35,9 @@ public ReadOnlyFirst bar(String bar) { * Get bar * @return bar */ - @JsonProperty("bar") @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("bar") public String getBar() { return bar; } @@ -55,9 +55,9 @@ public ReadOnlyFirst baz(String baz) { * Get baz * @return baz */ - @JsonProperty("baz") @ApiModelProperty(value = "") + @JsonProperty("baz") public String getBaz() { return baz; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/SpecialModelName.java index 62a433154987..668035becd14 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/SpecialModelName.java @@ -24,26 +24,26 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class SpecialModelName { - @JsonProperty("$special[property.name]") - private Long $SpecialPropertyName; + private Long $specialPropertyName; - public SpecialModelName $SpecialPropertyName(Long $SpecialPropertyName) { - this.$SpecialPropertyName = $SpecialPropertyName; + public SpecialModelName $specialPropertyName(Long $specialPropertyName) { + this.$specialPropertyName = $specialPropertyName; return this; } /** - * Get $SpecialPropertyName - * @return $SpecialPropertyName + * Get $specialPropertyName + * @return $specialPropertyName */ @ApiModelProperty(value = "") + @JsonProperty("$special[property.name]") public Long get$SpecialPropertyName() { - return $SpecialPropertyName; + return $specialPropertyName; } - public void set$SpecialPropertyName(Long $SpecialPropertyName) { - this.$SpecialPropertyName = $SpecialPropertyName; + public void set$SpecialPropertyName(Long $specialPropertyName) { + this.$specialPropertyName = $specialPropertyName; } @Override @@ -54,20 +54,20 @@ public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) { return false; } - SpecialModelName $SpecialModelName = (SpecialModelName) o; - return Objects.equals(this.$SpecialPropertyName, $SpecialModelName.$SpecialPropertyName); + SpecialModelName $specialModelName = (SpecialModelName) o; + return Objects.equals(this.$specialPropertyName, $specialModelName.$specialPropertyName); } @Override public int hashCode() { - return Objects.hash($SpecialPropertyName); + return Objects.hash($specialPropertyName); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class SpecialModelName {\n"); - sb.append(" $SpecialPropertyName: ").append(toIndentedString($SpecialPropertyName)).append("\n"); + sb.append(" $specialPropertyName: ").append(toIndentedString($specialPropertyName)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Tag.java index f7797bef2f19..527e777278e2 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Tag.java @@ -35,9 +35,9 @@ public Tag id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -55,9 +55,9 @@ public Tag name(String name) { * Get name * @return name */ - @JsonProperty("name") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderDefault.java index 506efbf431c1..41ba1c5bf1f3 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -45,9 +45,9 @@ public TypeHolderDefault stringItem(String stringItem) { * Get stringItem * @return stringItem */ - @JsonProperty("string_item") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -65,9 +65,9 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ - @JsonProperty("number_item") @NotNull @Valid @ApiModelProperty(required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -85,9 +85,9 @@ public TypeHolderDefault integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ - @JsonProperty("integer_item") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -105,9 +105,9 @@ public TypeHolderDefault boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ - @JsonProperty("bool_item") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -130,9 +130,9 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ - @JsonProperty("array_item") @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderExample.java index 806c0c90fa18..8e1a76f88fdc 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -47,9 +47,9 @@ public TypeHolderExample stringItem(String stringItem) { * Get stringItem * @return stringItem */ - @JsonProperty("string_item") @NotNull @ApiModelProperty(example = "what", required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -67,9 +67,9 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem */ - @JsonProperty("number_item") @NotNull @Valid @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -87,9 +87,9 @@ public TypeHolderExample floatItem(Float floatItem) { * Get floatItem * @return floatItem */ - @JsonProperty("float_item") @NotNull @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("float_item") public Float getFloatItem() { return floatItem; } @@ -107,9 +107,9 @@ public TypeHolderExample integerItem(Integer integerItem) { * Get integerItem * @return integerItem */ - @JsonProperty("integer_item") @NotNull @ApiModelProperty(example = "-2", required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -127,9 +127,9 @@ public TypeHolderExample boolItem(Boolean boolItem) { * Get boolItem * @return boolItem */ - @JsonProperty("bool_item") @NotNull @ApiModelProperty(example = "true", required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -152,9 +152,9 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem */ - @JsonProperty("array_item") @NotNull @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/User.java index f42832389ffe..36d29ba307d0 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/User.java @@ -47,9 +47,9 @@ public User id(Long id) { * Get id * @return id */ - @JsonProperty("id") @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -67,9 +67,9 @@ public User username(String username) { * Get username * @return username */ - @JsonProperty("username") @ApiModelProperty(value = "") + @JsonProperty("username") public String getUsername() { return username; } @@ -87,9 +87,9 @@ public User firstName(String firstName) { * Get firstName * @return firstName */ - @JsonProperty("firstName") @ApiModelProperty(value = "") + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -107,9 +107,9 @@ public User lastName(String lastName) { * Get lastName * @return lastName */ - @JsonProperty("lastName") @ApiModelProperty(value = "") + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -127,9 +127,9 @@ public User email(String email) { * Get email * @return email */ - @JsonProperty("email") @ApiModelProperty(value = "") + @JsonProperty("email") public String getEmail() { return email; } @@ -147,9 +147,9 @@ public User password(String password) { * Get password * @return password */ - @JsonProperty("password") @ApiModelProperty(value = "") + @JsonProperty("password") public String getPassword() { return password; } @@ -167,9 +167,9 @@ public User phone(String phone) { * Get phone * @return phone */ - @JsonProperty("phone") @ApiModelProperty(value = "") + @JsonProperty("phone") public String getPhone() { return phone; } @@ -187,9 +187,9 @@ public User userStatus(Integer userStatus) { * User Status * @return userStatus */ - @JsonProperty("userStatus") @ApiModelProperty(value = "User Status") + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/XmlItem.java index c795b4b85e6d..3a8d108bdbce 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/XmlItem.java @@ -101,9 +101,9 @@ public XmlItem attributeString(String attributeString) { * Get attributeString * @return attributeString */ - @JsonProperty("attribute_string") @ApiModelProperty(example = "string", value = "") + @JsonProperty("attribute_string") public String getAttributeString() { return attributeString; } @@ -121,9 +121,9 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) { * Get attributeNumber * @return attributeNumber */ - @JsonProperty("attribute_number") @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("attribute_number") public BigDecimal getAttributeNumber() { return attributeNumber; } @@ -141,9 +141,9 @@ public XmlItem attributeInteger(Integer attributeInteger) { * Get attributeInteger * @return attributeInteger */ - @JsonProperty("attribute_integer") @ApiModelProperty(example = "-2", value = "") + @JsonProperty("attribute_integer") public Integer getAttributeInteger() { return attributeInteger; } @@ -161,9 +161,9 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) { * Get attributeBoolean * @return attributeBoolean */ - @JsonProperty("attribute_boolean") @ApiModelProperty(example = "true", value = "") + @JsonProperty("attribute_boolean") public Boolean getAttributeBoolean() { return attributeBoolean; } @@ -189,9 +189,9 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) { * Get wrappedArray * @return wrappedArray */ - @JsonProperty("wrapped_array") @ApiModelProperty(value = "") + @JsonProperty("wrapped_array") public List getWrappedArray() { return wrappedArray; } @@ -209,9 +209,9 @@ public XmlItem nameString(String nameString) { * Get nameString * @return nameString */ - @JsonProperty("name_string") @ApiModelProperty(example = "string", value = "") + @JsonProperty("name_string") public String getNameString() { return nameString; } @@ -229,9 +229,9 @@ public XmlItem nameNumber(BigDecimal nameNumber) { * Get nameNumber * @return nameNumber */ - @JsonProperty("name_number") @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("name_number") public BigDecimal getNameNumber() { return nameNumber; } @@ -249,9 +249,9 @@ public XmlItem nameInteger(Integer nameInteger) { * Get nameInteger * @return nameInteger */ - @JsonProperty("name_integer") @ApiModelProperty(example = "-2", value = "") + @JsonProperty("name_integer") public Integer getNameInteger() { return nameInteger; } @@ -269,9 +269,9 @@ public XmlItem nameBoolean(Boolean nameBoolean) { * Get nameBoolean * @return nameBoolean */ - @JsonProperty("name_boolean") @ApiModelProperty(example = "true", value = "") + @JsonProperty("name_boolean") public Boolean getNameBoolean() { return nameBoolean; } @@ -297,9 +297,9 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) { * Get nameArray * @return nameArray */ - @JsonProperty("name_array") @ApiModelProperty(value = "") + @JsonProperty("name_array") public List getNameArray() { return nameArray; } @@ -325,9 +325,9 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) { * Get nameWrappedArray * @return nameWrappedArray */ - @JsonProperty("name_wrapped_array") @ApiModelProperty(value = "") + @JsonProperty("name_wrapped_array") public List getNameWrappedArray() { return nameWrappedArray; } @@ -345,9 +345,9 @@ public XmlItem prefixString(String prefixString) { * Get prefixString * @return prefixString */ - @JsonProperty("prefix_string") @ApiModelProperty(example = "string", value = "") + @JsonProperty("prefix_string") public String getPrefixString() { return prefixString; } @@ -365,9 +365,9 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) { * Get prefixNumber * @return prefixNumber */ - @JsonProperty("prefix_number") @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("prefix_number") public BigDecimal getPrefixNumber() { return prefixNumber; } @@ -385,9 +385,9 @@ public XmlItem prefixInteger(Integer prefixInteger) { * Get prefixInteger * @return prefixInteger */ - @JsonProperty("prefix_integer") @ApiModelProperty(example = "-2", value = "") + @JsonProperty("prefix_integer") public Integer getPrefixInteger() { return prefixInteger; } @@ -405,9 +405,9 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) { * Get prefixBoolean * @return prefixBoolean */ - @JsonProperty("prefix_boolean") @ApiModelProperty(example = "true", value = "") + @JsonProperty("prefix_boolean") public Boolean getPrefixBoolean() { return prefixBoolean; } @@ -433,9 +433,9 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) { * Get prefixArray * @return prefixArray */ - @JsonProperty("prefix_array") @ApiModelProperty(value = "") + @JsonProperty("prefix_array") public List getPrefixArray() { return prefixArray; } @@ -461,9 +461,9 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) { * Get prefixWrappedArray * @return prefixWrappedArray */ - @JsonProperty("prefix_wrapped_array") @ApiModelProperty(value = "") + @JsonProperty("prefix_wrapped_array") public List getPrefixWrappedArray() { return prefixWrappedArray; } @@ -481,9 +481,9 @@ public XmlItem namespaceString(String namespaceString) { * Get namespaceString * @return namespaceString */ - @JsonProperty("namespace_string") @ApiModelProperty(example = "string", value = "") + @JsonProperty("namespace_string") public String getNamespaceString() { return namespaceString; } @@ -501,9 +501,9 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) { * Get namespaceNumber * @return namespaceNumber */ - @JsonProperty("namespace_number") @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("namespace_number") public BigDecimal getNamespaceNumber() { return namespaceNumber; } @@ -521,9 +521,9 @@ public XmlItem namespaceInteger(Integer namespaceInteger) { * Get namespaceInteger * @return namespaceInteger */ - @JsonProperty("namespace_integer") @ApiModelProperty(example = "-2", value = "") + @JsonProperty("namespace_integer") public Integer getNamespaceInteger() { return namespaceInteger; } @@ -541,9 +541,9 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) { * Get namespaceBoolean * @return namespaceBoolean */ - @JsonProperty("namespace_boolean") @ApiModelProperty(example = "true", value = "") + @JsonProperty("namespace_boolean") public Boolean getNamespaceBoolean() { return namespaceBoolean; } @@ -569,9 +569,9 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) { * Get namespaceArray * @return namespaceArray */ - @JsonProperty("namespace_array") @ApiModelProperty(value = "") + @JsonProperty("namespace_array") public List getNamespaceArray() { return namespaceArray; } @@ -597,9 +597,9 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) { * Get namespaceWrappedArray * @return namespaceWrappedArray */ - @JsonProperty("namespace_wrapped_array") @ApiModelProperty(value = "") + @JsonProperty("namespace_wrapped_array") public List getNamespaceWrappedArray() { return namespaceWrappedArray; } @@ -617,9 +617,9 @@ public XmlItem prefixNsString(String prefixNsString) { * Get prefixNsString * @return prefixNsString */ - @JsonProperty("prefix_ns_string") @ApiModelProperty(example = "string", value = "") + @JsonProperty("prefix_ns_string") public String getPrefixNsString() { return prefixNsString; } @@ -637,9 +637,9 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) { * Get prefixNsNumber * @return prefixNsNumber */ - @JsonProperty("prefix_ns_number") @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("prefix_ns_number") public BigDecimal getPrefixNsNumber() { return prefixNsNumber; } @@ -657,9 +657,9 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) { * Get prefixNsInteger * @return prefixNsInteger */ - @JsonProperty("prefix_ns_integer") @ApiModelProperty(example = "-2", value = "") + @JsonProperty("prefix_ns_integer") public Integer getPrefixNsInteger() { return prefixNsInteger; } @@ -677,9 +677,9 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) { * Get prefixNsBoolean * @return prefixNsBoolean */ - @JsonProperty("prefix_ns_boolean") @ApiModelProperty(example = "true", value = "") + @JsonProperty("prefix_ns_boolean") public Boolean getPrefixNsBoolean() { return prefixNsBoolean; } @@ -705,9 +705,9 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) { * Get prefixNsArray * @return prefixNsArray */ - @JsonProperty("prefix_ns_array") @ApiModelProperty(value = "") + @JsonProperty("prefix_ns_array") public List getPrefixNsArray() { return prefixNsArray; } @@ -733,9 +733,9 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) { * Get prefixNsWrappedArray * @return prefixNsWrappedArray */ - @JsonProperty("prefix_ns_wrapped_array") @ApiModelProperty(value = "") + @JsonProperty("prefix_ns_wrapped_array") public List getPrefixNsWrappedArray() { return prefixNsWrappedArray; } diff --git a/samples/server/petstore/springboot/src/main/resources/openapi.yaml b/samples/server/petstore/springboot/src/main/resources/openapi.yaml index 2999e6f2f8d6..5fdcfc33eada 100644 --- a/samples/server/petstore/springboot/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot/src/main/resources/openapi.yaml @@ -2111,7 +2111,6 @@ components: status: description: Updated status of the pet type: string - type: object uploadFile_request: properties: additionalMetadata: @@ -2121,7 +2120,6 @@ components: description: file to upload format: binary type: string - type: object testEnumParameters_request: properties: enum_form_string_array: @@ -2141,7 +2139,6 @@ components: - -efg - (xyz) type: string - type: object testEndpointParameters_request: properties: integer: @@ -2214,7 +2211,6 @@ components: - double - number - pattern_without_delimiter - type: object testJsonFormData_request: properties: param: @@ -2226,7 +2222,6 @@ components: required: - param - param2 - type: object uploadFileWithRequiredFile_request: properties: additionalMetadata: @@ -2238,7 +2233,6 @@ components: type: string required: - requiredFile - type: object Dog_allOf: properties: breed: From 92de85a5df8fed543ad3e4955b3382c98b7db2f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9sar=20Revert?= Date: Thu, 3 Nov 2022 16:17:22 +0100 Subject: [PATCH 6/8] Fix test --- .../openapitools/codegen/java/spring/SpringCodegenTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 d1cebaa8ac32..80f6a4a75644 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 @@ -1678,8 +1678,8 @@ public void shouldGenerateJsonPropertyAnnotationLocatedInGetters() throws IOExce DefaultGenerator generator = new DefaultGenerator(); generator.opts(input).generate(); - String jsonPropertyInGetClassName = "@JsonProperty(\"className\") @NotNull @Schema(name = \"className\", required = true) public String getClassName() {"; - String jsonPropertyInGetColor = "@JsonProperty(\"color\") @Schema(name = \"color\", required = false) public String getColor() {"; + String jsonPropertyInGetClassName = "@NotNull @Schema(name = \"className\", required = true) @JsonProperty(\"className\") public String getClassName() {"; + String jsonPropertyInGetColor = "@Schema(name = \"color\", required = false) @JsonProperty(\"color\") public String getColor() {"; assertFileContains(Paths.get(output.getAbsolutePath() + "/src/main/java/org/openapitools/model/Animal.java"), jsonPropertyInGetClassName, jsonPropertyInGetColor); } } From 0f9ae2560f91095513cd863857c5af1ba97d9f02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9sar=20Revert?= Date: Thu, 3 Nov 2022 17:34:35 +0100 Subject: [PATCH 7/8] Fix version --- .../.openapi-generator/VERSION | 2 +- .../java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/UserApi.java | 2 +- .../.openapi-generator/VERSION | 2 +- .../java/org/openapitools/api/DefaultApi.java | 2 +- .../.openapi-generator/VERSION | 2 +- .../java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/UserApi.java | 2 +- .../.openapi-generator/VERSION | 2 +- .../java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/UserApi.java | 2 +- .../spring-cloud/.openapi-generator/VERSION | 2 +- .../java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/UserApi.java | 2 +- .../spring-cloud-3/.openapi-generator/VERSION | 2 +- .../java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/UserApi.java | 2 +- .../.openapi-generator/VERSION | 2 +- .../java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/UserApi.java | 2 +- .../.openapi-generator/VERSION | 2 +- .../java/org/openapitools/api/DefaultApi.java | 2 +- .../.openapi-generator/VERSION | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 2 +- .../api/FakeClassnameTags123Api.java | 2 +- .../java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/UserApi.java | 2 +- .../.openapi-generator/VERSION | 2 +- .../java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/UserApi.java | 2 +- .../spring-cloud/.openapi-generator/VERSION | 2 +- .../java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/UserApi.java | 2 +- .../.openapi-generator/VERSION | 2 +- .../java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/UserApi.java | 2 +- .../spring-stubs/.openapi-generator/VERSION | 2 +- .../java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/UserApi.java | 2 +- .../.openapi-generator/VERSION | 2 +- .../java/org/openapitools/api/BarApi.java | 2 +- .../openapitools/api/BarApiController.java | 1 + .../java/org/openapitools/api/FooApi.java | 2 +- .../openapitools/api/FooApiController.java | 1 + .../.openapi-generator/VERSION | 2 +- .../java/org/openapitools/api/PetApi.java | 2 +- .../openapitools/api/PetApiController.java | 1 + .../java/org/openapitools/api/StoreApi.java | 2 +- .../openapitools/api/StoreApiController.java | 1 + .../java/org/openapitools/api/UserApi.java | 2 +- .../openapitools/api/UserApiController.java | 1 + .../springboot-3/.openapi-generator/VERSION | 2 +- .../java/org/openapitools/api/PetApi.java | 2 +- .../openapitools/api/PetApiController.java | 1 + .../java/org/openapitools/api/StoreApi.java | 2 +- .../openapitools/api/StoreApiController.java | 1 + .../java/org/openapitools/api/UserApi.java | 2 +- .../openapitools/api/UserApiController.java | 1 + .../.openapi-generator/FILES | 1 + .../.openapi-generator/VERSION | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../api/AnotherFakeApiController.java | 1 + .../java/org/openapitools/api/FakeApi.java | 2 +- .../openapitools/api/FakeApiController.java | 1 + .../api/FakeClassnameTestApi.java | 2 +- .../api/FakeClassnameTestApiController.java | 1 + .../java/org/openapitools/api/PetApi.java | 2 +- .../openapitools/api/PetApiController.java | 1 + .../java/org/openapitools/api/StoreApi.java | 2 +- .../openapitools/api/StoreApiController.java | 1 + .../java/org/openapitools/api/UserApi.java | 2 +- .../openapitools/api/UserApiController.java | 1 + .../src/main/resources/openapi.yaml | 6 +++++ .../.openapi-generator/FILES | 1 + .../.openapi-generator/VERSION | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../api/AnotherFakeApiController.java | 1 + .../java/org/openapitools/api/FakeApi.java | 2 +- .../openapitools/api/FakeApiController.java | 1 + .../api/FakeClassnameTestApi.java | 2 +- .../api/FakeClassnameTestApiController.java | 1 + .../java/org/openapitools/api/PetApi.java | 2 +- .../openapitools/api/PetApiController.java | 1 + .../java/org/openapitools/api/StoreApi.java | 2 +- .../openapitools/api/StoreApiController.java | 1 + .../java/org/openapitools/api/UserApi.java | 2 +- .../openapitools/api/UserApiController.java | 1 + .../src/main/resources/openapi.yaml | 6 +++++ .../.openapi-generator/FILES | 1 + .../.openapi-generator/VERSION | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../api/AnotherFakeApiController.java | 1 + .../java/org/openapitools/api/FakeApi.java | 2 +- .../openapitools/api/FakeApiController.java | 1 + .../api/FakeClassnameTestApi.java | 2 +- .../api/FakeClassnameTestApiController.java | 1 + .../java/org/openapitools/api/PetApi.java | 2 +- .../openapitools/api/PetApiController.java | 1 + .../java/org/openapitools/api/StoreApi.java | 2 +- .../openapitools/api/StoreApiController.java | 1 + .../java/org/openapitools/api/UserApi.java | 2 +- .../openapitools/api/UserApiController.java | 1 + .../src/main/resources/openapi.yaml | 6 +++++ .../.openapi-generator/FILES | 1 + .../.openapi-generator/VERSION | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../api/AnotherFakeApiController.java | 1 + .../java/org/openapitools/api/FakeApi.java | 2 +- .../openapitools/api/FakeApiController.java | 1 + .../api/FakeClassnameTestApi.java | 2 +- .../api/FakeClassnameTestApiController.java | 1 + .../java/org/openapitools/api/PetApi.java | 2 +- .../openapitools/api/PetApiController.java | 1 + .../java/org/openapitools/api/StoreApi.java | 2 +- .../openapitools/api/StoreApiController.java | 1 + .../java/org/openapitools/api/UserApi.java | 2 +- .../openapitools/api/UserApiController.java | 1 + .../src/main/resources/openapi.yaml | 6 +++++ .../.openapi-generator/VERSION | 2 +- .../java/org/openapitools/api/PetApi.java | 2 +- .../openapitools/api/PetApiController.java | 1 + .../java/org/openapitools/api/StoreApi.java | 2 +- .../openapitools/api/StoreApiController.java | 1 + .../java/org/openapitools/api/UserApi.java | 2 +- .../openapitools/api/UserApiController.java | 1 + .../.openapi-generator/FILES | 1 + .../.openapi-generator/VERSION | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../api/AnotherFakeApiController.java | 1 + .../java/org/openapitools/api/FakeApi.java | 2 +- .../openapitools/api/FakeApiController.java | 1 + .../api/FakeClassnameTestApi.java | 2 +- .../api/FakeClassnameTestApiController.java | 1 + .../java/org/openapitools/api/PetApi.java | 2 +- .../openapitools/api/PetApiController.java | 1 + .../java/org/openapitools/api/StoreApi.java | 2 +- .../openapitools/api/StoreApiController.java | 1 + .../java/org/openapitools/api/UserApi.java | 2 +- .../openapitools/api/UserApiController.java | 1 + .../src/main/resources/openapi.yaml | 6 +++++ .../springboot/.openapi-generator/VERSION | 2 +- .../java/org/openapitools/api/PetApi.java | 3 ++- .../java/org/openapitools/api/StoreApi.java | 3 ++- .../java/org/openapitools/api/UserApi.java | 3 ++- .../.openapi-generator/VERSION | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 2 +- .../api/FakeClassnameTestApi.java | 2 +- .../java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/UserApi.java | 2 +- .../.openapi-generator/VERSION | 2 +- .../org/openapitools/api/NullableApi.java | 2 +- .../spring-stubs/.openapi-generator/VERSION | 2 +- .../java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/UserApi.java | 2 +- .../.openapi-generator/FILES | 1 + .../.openapi-generator/VERSION | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../api/AnotherFakeApiController.java | 1 + .../java/org/openapitools/api/FakeApi.java | 2 +- .../openapitools/api/FakeApiController.java | 1 + .../api/FakeClassnameTestApi.java | 2 +- .../api/FakeClassnameTestApiController.java | 1 + .../java/org/openapitools/api/PetApi.java | 2 +- .../openapitools/api/PetApiController.java | 1 + .../java/org/openapitools/api/StoreApi.java | 2 +- .../openapitools/api/StoreApiController.java | 1 + .../java/org/openapitools/api/UserApi.java | 2 +- .../openapitools/api/UserApiController.java | 1 + .../src/main/resources/openapi.yaml | 6 +++++ .../.openapi-generator/FILES | 1 + .../.openapi-generator/VERSION | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../api/AnotherFakeApiController.java | 1 + .../java/org/openapitools/api/FakeApi.java | 2 +- .../openapitools/api/FakeApiController.java | 1 + .../api/FakeClassnameTestApi.java | 2 +- .../api/FakeClassnameTestApiController.java | 1 + .../java/org/openapitools/api/PetApi.java | 2 +- .../openapitools/api/PetApiController.java | 1 + .../java/org/openapitools/api/StoreApi.java | 2 +- .../openapitools/api/StoreApiController.java | 1 + .../java/org/openapitools/api/UserApi.java | 2 +- .../openapitools/api/UserApiController.java | 1 + .../src/main/resources/openapi.yaml | 6 +++++ .../.openapi-generator/FILES | 1 + .../.openapi-generator/VERSION | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../api/AnotherFakeApiController.java | 1 + .../java/org/openapitools/api/FakeApi.java | 2 +- .../openapitools/api/FakeApiController.java | 1 + .../api/FakeClassnameTestApi.java | 2 +- .../api/FakeClassnameTestApiController.java | 1 + .../java/org/openapitools/api/PetApi.java | 2 +- .../openapitools/api/PetApiController.java | 1 + .../java/org/openapitools/api/StoreApi.java | 2 +- .../openapitools/api/StoreApiController.java | 1 + .../java/org/openapitools/api/UserApi.java | 2 +- .../openapitools/api/UserApiController.java | 1 + .../src/main/resources/openapi.yaml | 6 +++++ .../.openapi-generator/FILES | 1 + .../.openapi-generator/VERSION | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../api/AnotherFakeApiController.java | 1 + .../java/org/openapitools/api/FakeApi.java | 2 +- .../openapitools/api/FakeApiController.java | 1 + .../api/FakeClassnameTestApi.java | 2 +- .../api/FakeClassnameTestApiController.java | 1 + .../java/org/openapitools/api/PetApi.java | 2 +- .../openapitools/api/PetApiController.java | 1 + .../java/org/openapitools/api/StoreApi.java | 2 +- .../openapitools/api/StoreApiController.java | 1 + .../java/org/openapitools/api/UserApi.java | 2 +- .../openapitools/api/UserApiController.java | 1 + .../src/main/resources/openapi.yaml | 6 +++++ .../.openapi-generator/VERSION | 2 +- .../java/org/openapitools/api/PetApi.java | 2 +- .../openapitools/api/PetApiController.java | 1 + .../java/org/openapitools/api/StoreApi.java | 2 +- .../openapitools/api/StoreApiController.java | 1 + .../java/org/openapitools/api/UserApi.java | 2 +- .../openapitools/api/UserApiController.java | 1 + .../.openapi-generator/FILES | 1 + .../.openapi-generator/VERSION | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../api/AnotherFakeApiController.java | 1 + .../java/org/openapitools/api/FakeApi.java | 2 +- .../openapitools/api/FakeApiController.java | 1 + .../api/FakeClassnameTestApi.java | 2 +- .../api/FakeClassnameTestApiController.java | 1 + .../java/org/openapitools/api/PetApi.java | 2 +- .../openapitools/api/PetApiController.java | 1 + .../java/org/openapitools/api/StoreApi.java | 2 +- .../openapitools/api/StoreApiController.java | 1 + .../java/org/openapitools/api/UserApi.java | 2 +- .../openapitools/api/UserApiController.java | 1 + .../src/main/resources/openapi.yaml | 6 +++++ .../.openapi-generator/FILES | 1 + .../.openapi-generator/VERSION | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../api/AnotherFakeApiController.java | 1 + .../java/org/openapitools/api/FakeApi.java | 2 +- .../openapitools/api/FakeApiController.java | 1 + .../api/FakeClassnameTestApi.java | 2 +- .../api/FakeClassnameTestApiController.java | 1 + .../java/org/openapitools/api/PetApi.java | 2 +- .../openapitools/api/PetApiController.java | 1 + .../java/org/openapitools/api/StoreApi.java | 2 +- .../openapitools/api/StoreApiController.java | 1 + .../java/org/openapitools/api/UserApi.java | 2 +- .../openapitools/api/UserApiController.java | 1 + .../src/main/resources/openapi.yaml | 6 +++++ .../.openapi-generator/FILES | 1 + .../.openapi-generator/VERSION | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../api/AnotherFakeApiController.java | 1 + .../java/org/openapitools/api/FakeApi.java | 2 +- .../openapitools/api/FakeApiController.java | 1 + .../api/FakeClassnameTestApi.java | 2 +- .../api/FakeClassnameTestApiController.java | 1 + .../java/org/openapitools/api/PetApi.java | 2 +- .../openapitools/api/PetApiController.java | 1 + .../java/org/openapitools/api/StoreApi.java | 2 +- .../openapitools/api/StoreApiController.java | 1 + .../java/org/openapitools/api/UserApi.java | 2 +- .../openapitools/api/UserApiController.java | 1 + .../src/main/resources/openapi.yaml | 6 +++++ .../.openapi-generator/FILES | 1 + .../.openapi-generator/VERSION | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../api/AnotherFakeApiController.java | 1 + .../java/org/openapitools/api/FakeApi.java | 2 +- .../openapitools/api/FakeApiController.java | 1 + .../api/FakeClassnameTestApi.java | 2 +- .../api/FakeClassnameTestApiController.java | 1 + .../java/org/openapitools/api/PetApi.java | 2 +- .../openapitools/api/PetApiController.java | 1 + .../java/org/openapitools/api/StoreApi.java | 2 +- .../openapitools/api/StoreApiController.java | 1 + .../java/org/openapitools/api/UserApi.java | 2 +- .../openapitools/api/UserApiController.java | 1 + .../src/main/resources/openapi.yaml | 6 +++++ .../.openapi-generator/FILES | 1 + .../.openapi-generator/VERSION | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../api/AnotherFakeApiController.java | 1 + .../java/org/openapitools/api/FakeApi.java | 2 +- .../openapitools/api/FakeApiController.java | 1 + .../api/FakeClassnameTestApi.java | 2 +- .../api/FakeClassnameTestApiController.java | 1 + .../java/org/openapitools/api/PetApi.java | 2 +- .../openapitools/api/PetApiController.java | 1 + .../java/org/openapitools/api/StoreApi.java | 2 +- .../openapitools/api/StoreApiController.java | 1 + .../java/org/openapitools/api/UserApi.java | 2 +- .../openapitools/api/UserApiController.java | 1 + .../src/main/resources/openapi.yaml | 6 +++++ .../.openapi-generator/FILES | 1 + .../.openapi-generator/VERSION | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../api/AnotherFakeApiController.java | 1 + .../java/org/openapitools/api/FakeApi.java | 2 +- .../openapitools/api/FakeApiController.java | 1 + .../api/FakeClassnameTestApi.java | 2 +- .../api/FakeClassnameTestApiController.java | 1 + .../java/org/openapitools/api/PetApi.java | 2 +- .../openapitools/api/PetApiController.java | 1 + .../java/org/openapitools/api/StoreApi.java | 2 +- .../openapitools/api/StoreApiController.java | 1 + .../java/org/openapitools/api/UserApi.java | 2 +- .../openapitools/api/UserApiController.java | 1 + .../src/main/resources/openapi.yaml | 6 +++++ .../.openapi-generator/FILES | 1 + .../.openapi-generator/VERSION | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../api/AnotherFakeApiController.java | 1 + .../java/org/openapitools/api/FakeApi.java | 2 +- .../openapitools/api/FakeApiController.java | 1 + .../api/FakeClassnameTestApi.java | 2 +- .../api/FakeClassnameTestApiController.java | 1 + .../java/org/openapitools/api/PetApi.java | 2 +- .../openapitools/api/PetApiController.java | 1 + .../java/org/openapitools/api/StoreApi.java | 2 +- .../openapitools/api/StoreApiController.java | 1 + .../java/org/openapitools/api/UserApi.java | 2 +- .../openapitools/api/UserApiController.java | 1 + .../src/main/resources/openapi.yaml | 6 +++++ .../.openapi-generator/FILES | 1 + .../.openapi-generator/VERSION | 2 +- .../virtualan/api/AnotherFakeApi.java | 2 +- .../api/AnotherFakeApiController.java | 1 + .../openapitools/virtualan/api/FakeApi.java | 2 +- .../virtualan/api/FakeApiController.java | 1 + .../virtualan/api/FakeClassnameTestApi.java | 2 +- .../api/FakeClassnameTestApiController.java | 1 + .../openapitools/virtualan/api/PetApi.java | 2 +- .../virtualan/api/PetApiController.java | 1 + .../openapitools/virtualan/api/StoreApi.java | 2 +- .../virtualan/api/StoreApiController.java | 1 + .../openapitools/virtualan/api/UserApi.java | 2 +- .../virtualan/api/UserApiController.java | 1 + .../src/main/resources/openapi.yaml | 6 +++++ .../springboot/.openapi-generator/FILES | 1 + .../springboot/.openapi-generator/VERSION | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../api/AnotherFakeApiController.java | 1 + .../java/org/openapitools/api/FakeApi.java | 2 +- .../openapitools/api/FakeApiController.java | 1 + .../api/FakeClassnameTestApi.java | 2 +- .../api/FakeClassnameTestApiController.java | 1 + .../java/org/openapitools/api/PetApi.java | 2 +- .../openapitools/api/PetApiController.java | 1 + .../java/org/openapitools/api/StoreApi.java | 2 +- .../openapitools/api/StoreApiController.java | 1 + .../java/org/openapitools/api/UserApi.java | 2 +- .../openapitools/api/UserApiController.java | 1 + .../openapitools/model/Model200Response.java | 6 ++--- .../org/openapitools/model/ModelList.java | 24 +++++++++---------- .../java/org/openapitools/model/Name.java | 24 +++++++++---------- .../openapitools/model/SpecialModelName.java | 24 +++++++++---------- .../src/main/resources/openapi.yaml | 6 +++++ 375 files changed, 503 insertions(+), 252 deletions(-) diff --git a/samples/client/petstore/spring-cloud-async/.openapi-generator/VERSION b/samples/client/petstore/spring-cloud-async/.openapi-generator/VERSION index ed829dbcddec..d6b4ec4aa783 100644 --- a/samples/client/petstore/spring-cloud-async/.openapi-generator/VERSION +++ b/samples/client/petstore/spring-cloud-async/.openapi-generator/VERSION @@ -1 +1 @@ -6.2.1-SNAPSHOT \ No newline at end of file +6.3.0-SNAPSHOT \ No newline at end of file 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 680728a5b323..5e6b3e191b1e 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java index 473fc9104a93..9b1d6de4fe5b 100644 --- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java index 1661dfd48a1c..78f782e06dec 100644 --- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-cloud-date-time/.openapi-generator/VERSION b/samples/client/petstore/spring-cloud-date-time/.openapi-generator/VERSION index ed829dbcddec..d6b4ec4aa783 100644 --- a/samples/client/petstore/spring-cloud-date-time/.openapi-generator/VERSION +++ b/samples/client/petstore/spring-cloud-date-time/.openapi-generator/VERSION @@ -1 +1 @@ -6.2.1-SNAPSHOT \ No newline at end of file +6.3.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java b/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java index f171b092fd7c..8b46211dc20d 100644 --- a/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java +++ b/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-cloud-feign-without-url/.openapi-generator/VERSION b/samples/client/petstore/spring-cloud-feign-without-url/.openapi-generator/VERSION index ed829dbcddec..d6b4ec4aa783 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/.openapi-generator/VERSION +++ b/samples/client/petstore/spring-cloud-feign-without-url/.openapi-generator/VERSION @@ -1 +1 @@ -6.2.1-SNAPSHOT \ No newline at end of file +6.3.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/PetApi.java index e23a7399e384..933565438467 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/StoreApi.java index 168f1ac6abc2..26f7bb20bd0f 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/UserApi.java index 3a5a60204293..81b5380d35a9 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-cloud-spring-pageable/.openapi-generator/VERSION b/samples/client/petstore/spring-cloud-spring-pageable/.openapi-generator/VERSION index ed829dbcddec..d6b4ec4aa783 100644 --- a/samples/client/petstore/spring-cloud-spring-pageable/.openapi-generator/VERSION +++ b/samples/client/petstore/spring-cloud-spring-pageable/.openapi-generator/VERSION @@ -1 +1 @@ -6.2.1-SNAPSHOT \ No newline at end of file +6.3.0-SNAPSHOT \ No newline at end of file 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 8af4efcf77bc..c6cd35b9961d 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java index f5c279e035f4..b24e4da04e0b 100644 --- a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java index 0ed046824c74..8b910fd40493 100644 --- a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-cloud/.openapi-generator/VERSION b/samples/client/petstore/spring-cloud/.openapi-generator/VERSION index ed829dbcddec..d6b4ec4aa783 100644 --- a/samples/client/petstore/spring-cloud/.openapi-generator/VERSION +++ b/samples/client/petstore/spring-cloud/.openapi-generator/VERSION @@ -1 +1 @@ -6.2.1-SNAPSHOT \ No newline at end of file +6.3.0-SNAPSHOT \ No newline at end of file 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 e23a7399e384..933565438467 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java index 168f1ac6abc2..26f7bb20bd0f 100644 --- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java index 3a5a60204293..81b5380d35a9 100644 --- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud-3/.openapi-generator/VERSION b/samples/openapi3/client/petstore/spring-cloud-3/.openapi-generator/VERSION index ed829dbcddec..d6b4ec4aa783 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/spring-cloud-3/.openapi-generator/VERSION @@ -1 +1 @@ -6.2.1-SNAPSHOT \ No newline at end of file +6.3.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/PetApi.java index 68bff6de7246..0b132252a8c6 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/StoreApi.java index 9b6d98c54ba4..5e41c5337328 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/UserApi.java index 9383e4f4ffdb..5aa08f0954b6 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud-async/.openapi-generator/VERSION b/samples/openapi3/client/petstore/spring-cloud-async/.openapi-generator/VERSION index ed829dbcddec..d6b4ec4aa783 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/spring-cloud-async/.openapi-generator/VERSION @@ -1 +1 @@ -6.2.1-SNAPSHOT \ No newline at end of file +6.3.0-SNAPSHOT \ No newline at end of file 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 ebc57d183901..2e2c28c2557a 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java index b272e5c2d5f4..ce3ad7a5eb62 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java index b63d077b4c49..7ae58d7ef0b8 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud-date-time/.openapi-generator/VERSION b/samples/openapi3/client/petstore/spring-cloud-date-time/.openapi-generator/VERSION index ed829dbcddec..d6b4ec4aa783 100644 --- a/samples/openapi3/client/petstore/spring-cloud-date-time/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/spring-cloud-date-time/.openapi-generator/VERSION @@ -1 +1 @@ -6.2.1-SNAPSHOT \ No newline at end of file +6.3.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java b/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java index 35f0e9495e4e..ee84e42d4c22 100644 --- a/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/.openapi-generator/VERSION b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/.openapi-generator/VERSION index ed829dbcddec..d6b4ec4aa783 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/.openapi-generator/VERSION @@ -1 +1 @@ -6.2.1-SNAPSHOT \ No newline at end of file +6.3.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/AnotherFakeApi.java index 45d4eada9380..47e3335edeee 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ 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 4f7bb9ca1931..3cee3811ffb6 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java index 343f753a464e..d41f06b6c2ad 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ 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 134004e591a4..d63709b82b08 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/StoreApi.java index bb80398ecb27..4aa4a703929d 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/UserApi.java index 504ea50dfdc2..27e4a0660530 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/.openapi-generator/VERSION b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/.openapi-generator/VERSION index ed829dbcddec..d6b4ec4aa783 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/.openapi-generator/VERSION @@ -1 +1 @@ -6.2.1-SNAPSHOT \ No newline at end of file +6.3.0-SNAPSHOT \ No newline at end of file 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 302e425ce016..ea5537110469 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java index 454a99e71af0..816e870e6b9d 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java index bc108c48ee85..6f51045b260e 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud/.openapi-generator/VERSION b/samples/openapi3/client/petstore/spring-cloud/.openapi-generator/VERSION index ed829dbcddec..d6b4ec4aa783 100644 --- a/samples/openapi3/client/petstore/spring-cloud/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/spring-cloud/.openapi-generator/VERSION @@ -1 +1 @@ -6.2.1-SNAPSHOT \ No newline at end of file +6.3.0-SNAPSHOT \ No newline at end of file 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 93218653c910..649a08904c13 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java index 711517d2697b..c7ad76d69914 100644 --- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java index b03cb69bdc15..2c0455262138 100644 --- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/.openapi-generator/VERSION b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/.openapi-generator/VERSION index ed829dbcddec..d6b4ec4aa783 100644 --- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/.openapi-generator/VERSION @@ -1 +1 @@ -6.2.1-SNAPSHOT \ No newline at end of file +6.3.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/PetApi.java index 3f0e2e2fa5a5..c74ca0c0a501 100644 --- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/StoreApi.java index 415522427d13..b58dbd9bafce 100644 --- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/UserApi.java index 0112b65d413e..aecc9b4b1ab4 100644 --- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-stubs/.openapi-generator/VERSION b/samples/openapi3/client/petstore/spring-stubs/.openapi-generator/VERSION index ed829dbcddec..d6b4ec4aa783 100644 --- a/samples/openapi3/client/petstore/spring-stubs/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/spring-stubs/.openapi-generator/VERSION @@ -1 +1 @@ -6.2.1-SNAPSHOT \ No newline at end of file +6.3.0-SNAPSHOT \ No newline at end of file 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 e5dfe4c2183b..67c4a8d4dcd9 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java index f46e16df6a63..765941e6ab2a 100644 --- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java index 0d2f39b99a9c..274d3b37f345 100644 --- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/.openapi-generator/VERSION b/samples/openapi3/server/petstore/spring-boot-oneof/.openapi-generator/VERSION index ed829dbcddec..d6b4ec4aa783 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/.openapi-generator/VERSION +++ b/samples/openapi3/server/petstore/spring-boot-oneof/.openapi-generator/VERSION @@ -1 +1 @@ -6.2.1-SNAPSHOT \ No newline at end of file +6.3.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/BarApi.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/BarApi.java index 91f7ce028e93..db8023afc889 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/BarApi.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/BarApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/BarApiController.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/BarApiController.java index 4ff7051020f5..7d23950718d3 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/BarApiController.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/BarApiController.java @@ -29,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.byRefOrValue.base-path:}") public class BarApiController implements BarApi { private final NativeWebRequest request; diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/FooApi.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/FooApi.java index 2102c7c12abf..3a8c99e15abd 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/FooApi.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/FooApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/FooApiController.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/FooApiController.java index c5a099e7aedb..ea240bf97a97 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/FooApiController.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/FooApiController.java @@ -29,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.byRefOrValue.base-path:}") public class FooApiController implements FooApi { private final NativeWebRequest request; diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/.openapi-generator/VERSION b/samples/openapi3/server/petstore/spring-boot-springdoc/.openapi-generator/VERSION index ed829dbcddec..d6b4ec4aa783 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/.openapi-generator/VERSION +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/.openapi-generator/VERSION @@ -1 +1 @@ -6.2.1-SNAPSHOT \ No newline at end of file +6.3.0-SNAPSHOT \ No newline at end of file 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 7896258136fe..469a5e322efe 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/PetApiController.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/PetApiController.java index 7713fe93c419..b8fa3720a211 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/PetApiController.java +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/PetApiController.java @@ -29,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class PetApiController implements PetApi { private final NativeWebRequest request; diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/StoreApi.java index abcdd7143a47..6d2330a325ad 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/StoreApiController.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/StoreApiController.java index f8c784ff3838..1292dc0b721d 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/StoreApiController.java +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/StoreApiController.java @@ -29,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class StoreApiController implements StoreApi { private final NativeWebRequest request; diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/UserApi.java index c3dbc04ca2b9..a82dfc1734e6 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/UserApiController.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/UserApiController.java index 894bf6db762e..ca00184d2a56 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/UserApiController.java +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/UserApiController.java @@ -30,6 +30,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class UserApiController implements UserApi { private final NativeWebRequest request; diff --git a/samples/openapi3/server/petstore/springboot-3/.openapi-generator/VERSION b/samples/openapi3/server/petstore/springboot-3/.openapi-generator/VERSION index ed829dbcddec..d6b4ec4aa783 100644 --- a/samples/openapi3/server/petstore/springboot-3/.openapi-generator/VERSION +++ b/samples/openapi3/server/petstore/springboot-3/.openapi-generator/VERSION @@ -1 +1 @@ -6.2.1-SNAPSHOT \ No newline at end of file +6.3.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/PetApi.java index 6e1f58b51260..f1f70a9f8bf0 100644 --- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/PetApiController.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/PetApiController.java index d12543b50f45..119729502644 100644 --- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/PetApiController.java +++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/PetApiController.java @@ -29,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class PetApiController implements PetApi { private final NativeWebRequest request; diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/StoreApi.java index 0cbf568b0fe1..d0eed779fd05 100644 --- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/StoreApiController.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/StoreApiController.java index da7fe83d4489..eaca23c3f81f 100644 --- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/StoreApiController.java +++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/StoreApiController.java @@ -29,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class StoreApiController implements StoreApi { private final NativeWebRequest request; diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/UserApi.java index c03cdc2c42d0..d44b39e1354e 100644 --- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/UserApiController.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/UserApiController.java index a2e3c11d32fb..412a400d7d02 100644 --- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/UserApiController.java +++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/UserApiController.java @@ -30,6 +30,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class UserApiController implements UserApi { private final NativeWebRequest request; diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/FILES b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/FILES index cf9ab80cce1d..5d716a83385b 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/FILES +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/FILES @@ -15,6 +15,7 @@ src/main/java/org/openapitools/api/StoreApi.java src/main/java/org/openapitools/api/StoreApiController.java src/main/java/org/openapitools/api/UserApi.java src/main/java/org/openapitools/api/UserApiController.java +src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/configuration/SpringDocConfiguration.java src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/VERSION b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/VERSION index ed829dbcddec..d6b4ec4aa783 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/VERSION +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/VERSION @@ -1 +1 @@ -6.2.1-SNAPSHOT \ No newline at end of file +6.3.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java index 1e7e4c5a8f57..fba11ac08bb4 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApiController.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApiController.java index 65c9de6908c2..c2db7ca5a815 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApiController.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApiController.java @@ -28,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class AnotherFakeApiController implements AnotherFakeApi { private final NativeWebRequest request; 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 5b7440a38ee1..8dcbbff9a021 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ 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 b30f53bb595c..5ae5d5fed985 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 @@ -38,6 +38,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeApiController implements FakeApi { private final NativeWebRequest request; diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index c0a2a3ac70d2..8d87477c2b16 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java index 05196793d4c2..65b695629d43 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java @@ -28,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeClassnameTestApiController implements FakeClassnameTestApi { private final NativeWebRequest request; 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 701459bc5c7f..3542fcccb550 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ 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 0b88e5980bf1..ea6c56e02c11 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 @@ -30,6 +30,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class PetApiController implements PetApi { private final NativeWebRequest request; diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java index 4e91ff36d5c3..836aa2500f7f 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApiController.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApiController.java index f8c784ff3838..1292dc0b721d 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApiController.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApiController.java @@ -29,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class StoreApiController implements StoreApi { private final NativeWebRequest request; diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java index b0db1eddef46..09484728d829 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApiController.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApiController.java index 894bf6db762e..ca00184d2a56 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApiController.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApiController.java @@ -30,6 +30,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class UserApiController implements UserApi { private final NativeWebRequest request; diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/resources/openapi.yaml b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/resources/openapi.yaml index 5fdcfc33eada..2999e6f2f8d6 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/resources/openapi.yaml +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/resources/openapi.yaml @@ -2111,6 +2111,7 @@ components: status: description: Updated status of the pet type: string + type: object uploadFile_request: properties: additionalMetadata: @@ -2120,6 +2121,7 @@ components: description: file to upload format: binary type: string + type: object testEnumParameters_request: properties: enum_form_string_array: @@ -2139,6 +2141,7 @@ components: - -efg - (xyz) type: string + type: object testEndpointParameters_request: properties: integer: @@ -2211,6 +2214,7 @@ components: - double - number - pattern_without_delimiter + type: object testJsonFormData_request: properties: param: @@ -2222,6 +2226,7 @@ components: required: - param - param2 + type: object uploadFileWithRequiredFile_request: properties: additionalMetadata: @@ -2233,6 +2238,7 @@ components: type: string required: - requiredFile + type: object Dog_allOf: properties: breed: diff --git a/samples/openapi3/server/petstore/springboot-delegate/.openapi-generator/FILES b/samples/openapi3/server/petstore/springboot-delegate/.openapi-generator/FILES index 813eb7c338f8..3299b46a7b26 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/.openapi-generator/FILES +++ b/samples/openapi3/server/petstore/springboot-delegate/.openapi-generator/FILES @@ -21,6 +21,7 @@ src/main/java/org/openapitools/api/StoreApiDelegate.java src/main/java/org/openapitools/api/UserApi.java src/main/java/org/openapitools/api/UserApiController.java src/main/java/org/openapitools/api/UserApiDelegate.java +src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/configuration/SpringDocConfiguration.java src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java diff --git a/samples/openapi3/server/petstore/springboot-delegate/.openapi-generator/VERSION b/samples/openapi3/server/petstore/springboot-delegate/.openapi-generator/VERSION index ed829dbcddec..d6b4ec4aa783 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/.openapi-generator/VERSION +++ b/samples/openapi3/server/petstore/springboot-delegate/.openapi-generator/VERSION @@ -1 +1 @@ -6.2.1-SNAPSHOT \ No newline at end of file +6.3.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java index aea3984d43c2..122955b07beb 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApiController.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApiController.java index 7c3f20492479..e27e2fc20ea9 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApiController.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApiController.java @@ -27,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class AnotherFakeApiController implements AnotherFakeApi { private final AnotherFakeApiDelegate delegate; 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 512ab446af4b..21888ab0e8dd 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java index 8e624ba5fb59..726b17779f18 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java @@ -37,6 +37,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeApiController implements FakeApi { private final FakeApiDelegate delegate; diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 47d0ffd85854..a42bc82021dd 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java index 48a276daf130..21e28fe8b213 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java @@ -27,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeClassnameTestApiController implements FakeClassnameTestApi { private final FakeClassnameTestApiDelegate delegate; 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 c23460096286..8ef3dca5c9cb 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiController.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiController.java index e27c4c3b49d6..5ef3de965ff8 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiController.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiController.java @@ -29,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class PetApiController implements PetApi { private final PetApiDelegate delegate; diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java index cfa2597fd549..a54fc47aec06 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiController.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiController.java index 8c3b33a99af6..e9e29a41b4f9 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiController.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiController.java @@ -28,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class StoreApiController implements StoreApi { private final StoreApiDelegate delegate; diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java index fffbbee8793b..46f911754270 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApiController.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApiController.java index 58511a07291c..1b48d4a9444b 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApiController.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApiController.java @@ -29,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class UserApiController implements UserApi { private final UserApiDelegate delegate; diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/resources/openapi.yaml b/samples/openapi3/server/petstore/springboot-delegate/src/main/resources/openapi.yaml index 5fdcfc33eada..2999e6f2f8d6 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/resources/openapi.yaml +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/resources/openapi.yaml @@ -2111,6 +2111,7 @@ components: status: description: Updated status of the pet type: string + type: object uploadFile_request: properties: additionalMetadata: @@ -2120,6 +2121,7 @@ components: description: file to upload format: binary type: string + type: object testEnumParameters_request: properties: enum_form_string_array: @@ -2139,6 +2141,7 @@ components: - -efg - (xyz) type: string + type: object testEndpointParameters_request: properties: integer: @@ -2211,6 +2214,7 @@ components: - double - number - pattern_without_delimiter + type: object testJsonFormData_request: properties: param: @@ -2222,6 +2226,7 @@ components: required: - param - param2 + type: object uploadFileWithRequiredFile_request: properties: additionalMetadata: @@ -2233,6 +2238,7 @@ components: type: string required: - requiredFile + type: object Dog_allOf: properties: breed: diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/.openapi-generator/FILES b/samples/openapi3/server/petstore/springboot-implicitHeaders/.openapi-generator/FILES index cf9ab80cce1d..5d716a83385b 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/.openapi-generator/FILES +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/.openapi-generator/FILES @@ -15,6 +15,7 @@ src/main/java/org/openapitools/api/StoreApi.java src/main/java/org/openapitools/api/StoreApiController.java src/main/java/org/openapitools/api/UserApi.java src/main/java/org/openapitools/api/UserApiController.java +src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/configuration/SpringDocConfiguration.java src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/.openapi-generator/VERSION b/samples/openapi3/server/petstore/springboot-implicitHeaders/.openapi-generator/VERSION index ed829dbcddec..d6b4ec4aa783 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/.openapi-generator/VERSION +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/.openapi-generator/VERSION @@ -1 +1 @@ -6.2.1-SNAPSHOT \ No newline at end of file +6.3.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java index 1e7e4c5a8f57..fba11ac08bb4 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApiController.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApiController.java index 65c9de6908c2..c2db7ca5a815 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApiController.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApiController.java @@ -28,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class AnotherFakeApiController implements AnotherFakeApi { private final NativeWebRequest request; 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 dd2f374cb91d..b408fc5c062b 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApiController.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApiController.java index b30f53bb595c..5ae5d5fed985 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApiController.java @@ -38,6 +38,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeApiController implements FakeApi { private final NativeWebRequest request; diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index c0a2a3ac70d2..8d87477c2b16 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java index 05196793d4c2..65b695629d43 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java @@ -28,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeClassnameTestApiController implements FakeClassnameTestApi { private final NativeWebRequest request; 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 e3efdfdce81c..7fa1f66a018c 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApiController.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApiController.java index 0b88e5980bf1..ea6c56e02c11 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApiController.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApiController.java @@ -30,6 +30,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class PetApiController implements PetApi { private final NativeWebRequest request; diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java index 4e91ff36d5c3..836aa2500f7f 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApiController.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApiController.java index f8c784ff3838..1292dc0b721d 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApiController.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApiController.java @@ -29,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class StoreApiController implements StoreApi { private final NativeWebRequest request; diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java index b0db1eddef46..09484728d829 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApiController.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApiController.java index 894bf6db762e..ca00184d2a56 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApiController.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApiController.java @@ -30,6 +30,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class UserApiController implements UserApi { private final NativeWebRequest request; diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml index 5fdcfc33eada..2999e6f2f8d6 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml @@ -2111,6 +2111,7 @@ components: status: description: Updated status of the pet type: string + type: object uploadFile_request: properties: additionalMetadata: @@ -2120,6 +2121,7 @@ components: description: file to upload format: binary type: string + type: object testEnumParameters_request: properties: enum_form_string_array: @@ -2139,6 +2141,7 @@ components: - -efg - (xyz) type: string + type: object testEndpointParameters_request: properties: integer: @@ -2211,6 +2214,7 @@ components: - double - number - pattern_without_delimiter + type: object testJsonFormData_request: properties: param: @@ -2222,6 +2226,7 @@ components: required: - param - param2 + type: object uploadFileWithRequiredFile_request: properties: additionalMetadata: @@ -2233,6 +2238,7 @@ components: type: string required: - requiredFile + type: object Dog_allOf: properties: breed: diff --git a/samples/openapi3/server/petstore/springboot-reactive/.openapi-generator/FILES b/samples/openapi3/server/petstore/springboot-reactive/.openapi-generator/FILES index 0ed351e7bdaf..1fc07e54e680 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/.openapi-generator/FILES +++ b/samples/openapi3/server/petstore/springboot-reactive/.openapi-generator/FILES @@ -21,6 +21,7 @@ src/main/java/org/openapitools/api/StoreApiDelegate.java src/main/java/org/openapitools/api/UserApi.java src/main/java/org/openapitools/api/UserApiController.java src/main/java/org/openapitools/api/UserApiDelegate.java +src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java src/main/java/org/openapitools/model/AdditionalPropertiesArray.java diff --git a/samples/openapi3/server/petstore/springboot-reactive/.openapi-generator/VERSION b/samples/openapi3/server/petstore/springboot-reactive/.openapi-generator/VERSION index ed829dbcddec..d6b4ec4aa783 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/.openapi-generator/VERSION +++ b/samples/openapi3/server/petstore/springboot-reactive/.openapi-generator/VERSION @@ -1 +1 @@ -6.2.1-SNAPSHOT \ No newline at end of file +6.3.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java index 41a409aa15dd..66d3dc150993 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApiController.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApiController.java index 7c3f20492479..e27e2fc20ea9 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApiController.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApiController.java @@ -27,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class AnotherFakeApiController implements AnotherFakeApi { private final AnotherFakeApiDelegate delegate; 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 45345657e8fd..1a9631a15ada 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiController.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiController.java index 8e624ba5fb59..726b17779f18 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiController.java @@ -37,6 +37,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeApiController implements FakeApi { private final FakeApiDelegate delegate; diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 2f85e6df84de..2baae42af1b0 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java index 48a276daf130..21e28fe8b213 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java @@ -27,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeClassnameTestApiController implements FakeClassnameTestApi { private final FakeClassnameTestApiDelegate delegate; 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 859a0eec04dd..e5bb02ffaffc 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiController.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiController.java index e27c4c3b49d6..5ef3de965ff8 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiController.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiController.java @@ -29,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class PetApiController implements PetApi { private final PetApiDelegate delegate; diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java index 2bb36d80331c..3e9c0e7217e2 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiController.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiController.java index 8c3b33a99af6..e9e29a41b4f9 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiController.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiController.java @@ -28,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class StoreApiController implements StoreApi { private final StoreApiDelegate delegate; diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java index c2ca0b02dd40..fb9f62f466fe 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApiController.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApiController.java index 58511a07291c..1b48d4a9444b 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApiController.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApiController.java @@ -29,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class UserApiController implements UserApi { private final UserApiDelegate delegate; diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/resources/openapi.yaml b/samples/openapi3/server/petstore/springboot-reactive/src/main/resources/openapi.yaml index 5fdcfc33eada..2999e6f2f8d6 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/resources/openapi.yaml +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/resources/openapi.yaml @@ -2111,6 +2111,7 @@ components: status: description: Updated status of the pet type: string + type: object uploadFile_request: properties: additionalMetadata: @@ -2120,6 +2121,7 @@ components: description: file to upload format: binary type: string + type: object testEnumParameters_request: properties: enum_form_string_array: @@ -2139,6 +2141,7 @@ components: - -efg - (xyz) type: string + type: object testEndpointParameters_request: properties: integer: @@ -2211,6 +2214,7 @@ components: - double - number - pattern_without_delimiter + type: object testJsonFormData_request: properties: param: @@ -2222,6 +2226,7 @@ components: required: - param - param2 + type: object uploadFileWithRequiredFile_request: properties: additionalMetadata: @@ -2233,6 +2238,7 @@ components: type: string required: - requiredFile + type: object Dog_allOf: properties: breed: diff --git a/samples/openapi3/server/petstore/springboot-source/.openapi-generator/VERSION b/samples/openapi3/server/petstore/springboot-source/.openapi-generator/VERSION index ed829dbcddec..d6b4ec4aa783 100644 --- a/samples/openapi3/server/petstore/springboot-source/.openapi-generator/VERSION +++ b/samples/openapi3/server/petstore/springboot-source/.openapi-generator/VERSION @@ -1 +1 @@ -6.2.1-SNAPSHOT \ No newline at end of file +6.3.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/PetApi.java index 3a5b295e2e58..fd146f2bc8f5 100644 --- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/PetApiController.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/PetApiController.java index 7713fe93c419..b8fa3720a211 100644 --- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/PetApiController.java +++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/PetApiController.java @@ -29,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class PetApiController implements PetApi { private final NativeWebRequest request; diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/StoreApi.java index e149518ef0c5..3044b699b0d0 100644 --- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/StoreApiController.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/StoreApiController.java index f8c784ff3838..1292dc0b721d 100644 --- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/StoreApiController.java +++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/StoreApiController.java @@ -29,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class StoreApiController implements StoreApi { private final NativeWebRequest request; diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/UserApi.java index ebf5be7009ed..66fab2a5f573 100644 --- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/UserApiController.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/UserApiController.java index 894bf6db762e..ca00184d2a56 100644 --- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/UserApiController.java +++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/UserApiController.java @@ -30,6 +30,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class UserApiController implements UserApi { private final NativeWebRequest request; diff --git a/samples/openapi3/server/petstore/springboot-useoptional/.openapi-generator/FILES b/samples/openapi3/server/petstore/springboot-useoptional/.openapi-generator/FILES index cf9ab80cce1d..5d716a83385b 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/.openapi-generator/FILES +++ b/samples/openapi3/server/petstore/springboot-useoptional/.openapi-generator/FILES @@ -15,6 +15,7 @@ src/main/java/org/openapitools/api/StoreApi.java src/main/java/org/openapitools/api/StoreApiController.java src/main/java/org/openapitools/api/UserApi.java src/main/java/org/openapitools/api/UserApiController.java +src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/configuration/SpringDocConfiguration.java src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java diff --git a/samples/openapi3/server/petstore/springboot-useoptional/.openapi-generator/VERSION b/samples/openapi3/server/petstore/springboot-useoptional/.openapi-generator/VERSION index ed829dbcddec..d6b4ec4aa783 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/.openapi-generator/VERSION +++ b/samples/openapi3/server/petstore/springboot-useoptional/.openapi-generator/VERSION @@ -1 +1 @@ -6.2.1-SNAPSHOT \ No newline at end of file +6.3.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java index 1e7e4c5a8f57..fba11ac08bb4 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApiController.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApiController.java index 65c9de6908c2..c2db7ca5a815 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApiController.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApiController.java @@ -28,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class AnotherFakeApiController implements AnotherFakeApi { private final NativeWebRequest request; 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 8a59b5abb483..fcfa5b29f408 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApiController.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApiController.java index b30f53bb595c..5ae5d5fed985 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApiController.java @@ -38,6 +38,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeApiController implements FakeApi { private final NativeWebRequest request; diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index c0a2a3ac70d2..8d87477c2b16 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java index 05196793d4c2..65b695629d43 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java @@ -28,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeClassnameTestApiController implements FakeClassnameTestApi { private final NativeWebRequest request; 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 9f8af8e60dda..765556556729 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApiController.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApiController.java index 0b88e5980bf1..ea6c56e02c11 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApiController.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApiController.java @@ -30,6 +30,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class PetApiController implements PetApi { private final NativeWebRequest request; diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java index 4e91ff36d5c3..836aa2500f7f 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApiController.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApiController.java index f8c784ff3838..1292dc0b721d 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApiController.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApiController.java @@ -29,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class StoreApiController implements StoreApi { private final NativeWebRequest request; diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java index b0db1eddef46..09484728d829 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApiController.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApiController.java index 894bf6db762e..ca00184d2a56 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApiController.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApiController.java @@ -30,6 +30,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class UserApiController implements UserApi { private final NativeWebRequest request; diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/resources/openapi.yaml b/samples/openapi3/server/petstore/springboot-useoptional/src/main/resources/openapi.yaml index 5fdcfc33eada..2999e6f2f8d6 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/resources/openapi.yaml +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/resources/openapi.yaml @@ -2111,6 +2111,7 @@ components: status: description: Updated status of the pet type: string + type: object uploadFile_request: properties: additionalMetadata: @@ -2120,6 +2121,7 @@ components: description: file to upload format: binary type: string + type: object testEnumParameters_request: properties: enum_form_string_array: @@ -2139,6 +2141,7 @@ components: - -efg - (xyz) type: string + type: object testEndpointParameters_request: properties: integer: @@ -2211,6 +2214,7 @@ components: - double - number - pattern_without_delimiter + type: object testJsonFormData_request: properties: param: @@ -2222,6 +2226,7 @@ components: required: - param - param2 + type: object uploadFileWithRequiredFile_request: properties: additionalMetadata: @@ -2233,6 +2238,7 @@ components: type: string required: - requiredFile + type: object Dog_allOf: properties: breed: diff --git a/samples/openapi3/server/petstore/springboot/.openapi-generator/VERSION b/samples/openapi3/server/petstore/springboot/.openapi-generator/VERSION index ed829dbcddec..d6b4ec4aa783 100644 --- a/samples/openapi3/server/petstore/springboot/.openapi-generator/VERSION +++ b/samples/openapi3/server/petstore/springboot/.openapi-generator/VERSION @@ -1 +1 @@ -6.2.1-SNAPSHOT \ No newline at end of file +6.3.0-SNAPSHOT \ No newline at end of file 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 7896258136fe..0f7ff0628f2e 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ @@ -33,6 +33,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Validated @Tag(name = "pet", description = "Everything about your Pets") +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public interface PetApi { default Optional getRequest() { diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java index abcdd7143a47..6dec1f26bb13 100644 --- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ @@ -33,6 +33,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Validated @Tag(name = "store", description = "Access to Petstore orders") +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public interface StoreApi { default Optional getRequest() { diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java index c3dbc04ca2b9..5b734a75ab6d 100644 --- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ @@ -34,6 +34,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Validated @Tag(name = "user", description = "Operations about user") +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public interface UserApi { default Optional getRequest() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/.openapi-generator/VERSION b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/.openapi-generator/VERSION index ed829dbcddec..d6b4ec4aa783 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/.openapi-generator/VERSION +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/.openapi-generator/VERSION @@ -1 +1 @@ -6.2.1-SNAPSHOT \ No newline at end of file +6.3.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/AnotherFakeApi.java index 136c9ef51280..4e261bd44083 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeApi.java index ec10007eed09..eb2dd16ccd3e 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index ec2eb9f94e29..e2586f6f790f 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/PetApi.java index 7d794a050f58..e4f09ff62f91 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/StoreApi.java index 10ec6b2b86ae..32c6eda8560e 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/UserApi.java index fa91e4e025d5..c3bf4cafe03e 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-boot-nullable-set/.openapi-generator/VERSION b/samples/server/petstore/spring-boot-nullable-set/.openapi-generator/VERSION index ed829dbcddec..d6b4ec4aa783 100644 --- a/samples/server/petstore/spring-boot-nullable-set/.openapi-generator/VERSION +++ b/samples/server/petstore/spring-boot-nullable-set/.openapi-generator/VERSION @@ -1 +1 @@ -6.2.1-SNAPSHOT \ No newline at end of file +6.3.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/api/NullableApi.java b/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/api/NullableApi.java index 19062e18bd06..b361abf3ba39 100644 --- a/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/api/NullableApi.java +++ b/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/api/NullableApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-stubs/.openapi-generator/VERSION b/samples/server/petstore/spring-stubs/.openapi-generator/VERSION index ed829dbcddec..d6b4ec4aa783 100644 --- a/samples/server/petstore/spring-stubs/.openapi-generator/VERSION +++ b/samples/server/petstore/spring-stubs/.openapi-generator/VERSION @@ -1 +1 @@ -6.2.1-SNAPSHOT \ No newline at end of file +6.3.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java index 6f4044304b44..2c9a6dcf5b79 100644 --- a/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java index c2c5f9e7ef38..cc4d05b2bb41 100644 --- a/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java index f27432042ad4..e665e2cdbf97 100644 --- a/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/FILES b/samples/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/FILES index 32fdc6a9409b..3c2e959bec02 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/FILES @@ -15,6 +15,7 @@ src/main/java/org/openapitools/api/StoreApi.java src/main/java/org/openapitools/api/StoreApiController.java src/main/java/org/openapitools/api/UserApi.java src/main/java/org/openapitools/api/UserApiController.java +src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/configuration/SpringFoxConfiguration.java src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/VERSION b/samples/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/VERSION index ed829dbcddec..d6b4ec4aa783 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/VERSION @@ -1 +1 @@ -6.2.1-SNAPSHOT \ No newline at end of file +6.3.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java index 9ecd403de93c..b45fcc5dc16c 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApiController.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApiController.java index 65c9de6908c2..c2db7ca5a815 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApiController.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApiController.java @@ -28,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class AnotherFakeApiController implements AnotherFakeApi { private final NativeWebRequest request; 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 4b87b2def473..1220ac16e008 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ 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 b30f53bb595c..5ae5d5fed985 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 @@ -38,6 +38,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeApiController implements FakeApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index decd021376d6..d54c2670f8e2 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java index 05196793d4c2..65b695629d43 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java @@ -28,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeClassnameTestApiController implements FakeClassnameTestApi { private final NativeWebRequest request; 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 6247af5faa7b..60ccea3635bc 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ 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 0b88e5980bf1..ea6c56e02c11 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 @@ -30,6 +30,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class PetApiController implements PetApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java index f4319f650f50..1afb547b40ee 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApiController.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApiController.java index f8c784ff3838..1292dc0b721d 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApiController.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApiController.java @@ -29,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class StoreApiController implements StoreApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java index e458b4a0b8bf..981e3a95cbe6 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApiController.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApiController.java index 894bf6db762e..ca00184d2a56 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApiController.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApiController.java @@ -30,6 +30,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class UserApiController implements UserApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/resources/openapi.yaml index 5fdcfc33eada..2999e6f2f8d6 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/resources/openapi.yaml @@ -2111,6 +2111,7 @@ components: status: description: Updated status of the pet type: string + type: object uploadFile_request: properties: additionalMetadata: @@ -2120,6 +2121,7 @@ components: description: file to upload format: binary type: string + type: object testEnumParameters_request: properties: enum_form_string_array: @@ -2139,6 +2141,7 @@ components: - -efg - (xyz) type: string + type: object testEndpointParameters_request: properties: integer: @@ -2211,6 +2214,7 @@ components: - double - number - pattern_without_delimiter + type: object testJsonFormData_request: properties: param: @@ -2222,6 +2226,7 @@ components: required: - param - param2 + type: object uploadFileWithRequiredFile_request: properties: additionalMetadata: @@ -2233,6 +2238,7 @@ components: type: string required: - requiredFile + type: object Dog_allOf: properties: breed: diff --git a/samples/server/petstore/springboot-beanvalidation/.openapi-generator/FILES b/samples/server/petstore/springboot-beanvalidation/.openapi-generator/FILES index ff6da0b88a7c..d61b6cf83bfd 100644 --- a/samples/server/petstore/springboot-beanvalidation/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-beanvalidation/.openapi-generator/FILES @@ -15,6 +15,7 @@ src/main/java/org/openapitools/api/StoreApi.java src/main/java/org/openapitools/api/StoreApiController.java src/main/java/org/openapitools/api/UserApi.java src/main/java/org/openapitools/api/UserApiController.java +src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/configuration/SpringFoxConfiguration.java src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java diff --git a/samples/server/petstore/springboot-beanvalidation/.openapi-generator/VERSION b/samples/server/petstore/springboot-beanvalidation/.openapi-generator/VERSION index ed829dbcddec..d6b4ec4aa783 100644 --- a/samples/server/petstore/springboot-beanvalidation/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-beanvalidation/.openapi-generator/VERSION @@ -1 +1 @@ -6.2.1-SNAPSHOT \ No newline at end of file +6.3.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java index 9ecd403de93c..b45fcc5dc16c 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApiController.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApiController.java index 65c9de6908c2..c2db7ca5a815 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApiController.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApiController.java @@ -28,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class AnotherFakeApiController implements AnotherFakeApi { private final NativeWebRequest request; 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 4b87b2def473..1220ac16e008 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApiController.java index b30f53bb595c..5ae5d5fed985 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApiController.java @@ -38,6 +38,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeApiController implements FakeApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index decd021376d6..d54c2670f8e2 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java index 05196793d4c2..65b695629d43 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java @@ -28,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeClassnameTestApiController implements FakeClassnameTestApi { private final NativeWebRequest request; 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 6247af5faa7b..60ccea3635bc 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApiController.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApiController.java index 0b88e5980bf1..ea6c56e02c11 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApiController.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApiController.java @@ -30,6 +30,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class PetApiController implements PetApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java index f4319f650f50..1afb547b40ee 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApiController.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApiController.java index f8c784ff3838..1292dc0b721d 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApiController.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApiController.java @@ -29,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class StoreApiController implements StoreApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java index e458b4a0b8bf..981e3a95cbe6 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApiController.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApiController.java index 894bf6db762e..ca00184d2a56 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApiController.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApiController.java @@ -30,6 +30,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class UserApiController implements UserApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-beanvalidation/src/main/resources/openapi.yaml index 5fdcfc33eada..2999e6f2f8d6 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-beanvalidation/src/main/resources/openapi.yaml @@ -2111,6 +2111,7 @@ components: status: description: Updated status of the pet type: string + type: object uploadFile_request: properties: additionalMetadata: @@ -2120,6 +2121,7 @@ components: description: file to upload format: binary type: string + type: object testEnumParameters_request: properties: enum_form_string_array: @@ -2139,6 +2141,7 @@ components: - -efg - (xyz) type: string + type: object testEndpointParameters_request: properties: integer: @@ -2211,6 +2214,7 @@ components: - double - number - pattern_without_delimiter + type: object testJsonFormData_request: properties: param: @@ -2222,6 +2226,7 @@ components: required: - param - param2 + type: object uploadFileWithRequiredFile_request: properties: additionalMetadata: @@ -2233,6 +2238,7 @@ components: type: string required: - requiredFile + type: object Dog_allOf: properties: breed: diff --git a/samples/server/petstore/springboot-delegate-j8/.openapi-generator/FILES b/samples/server/petstore/springboot-delegate-j8/.openapi-generator/FILES index 84b7f1df792d..07f63a0e8be2 100644 --- a/samples/server/petstore/springboot-delegate-j8/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-delegate-j8/.openapi-generator/FILES @@ -21,6 +21,7 @@ src/main/java/org/openapitools/api/StoreApiDelegate.java src/main/java/org/openapitools/api/UserApi.java src/main/java/org/openapitools/api/UserApiController.java src/main/java/org/openapitools/api/UserApiDelegate.java +src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/configuration/SpringFoxConfiguration.java src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java diff --git a/samples/server/petstore/springboot-delegate-j8/.openapi-generator/VERSION b/samples/server/petstore/springboot-delegate-j8/.openapi-generator/VERSION index ed829dbcddec..d6b4ec4aa783 100644 --- a/samples/server/petstore/springboot-delegate-j8/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-delegate-j8/.openapi-generator/VERSION @@ -1 +1 @@ -6.2.1-SNAPSHOT \ No newline at end of file +6.3.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java index e364fcafe96a..ffa28f493727 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApiController.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApiController.java index 7c3f20492479..e27e2fc20ea9 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApiController.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApiController.java @@ -27,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class AnotherFakeApiController implements AnotherFakeApi { private final AnotherFakeApiDelegate delegate; 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 8099dd8fb43b..261a033dd80d 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiController.java index 8e624ba5fb59..726b17779f18 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiController.java @@ -37,6 +37,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeApiController implements FakeApi { private final FakeApiDelegate delegate; diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index b58eee9db9f4..ecc2a625ddfb 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java index 48a276daf130..21e28fe8b213 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java @@ -27,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeClassnameTestApiController implements FakeClassnameTestApi { private final FakeClassnameTestApiDelegate delegate; 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 0d3907293827..16b3566374e5 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApiController.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApiController.java index e27c4c3b49d6..5ef3de965ff8 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApiController.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApiController.java @@ -29,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class PetApiController implements PetApi { private final PetApiDelegate delegate; diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java index 8a1f4ea555b9..c9e8abe50bf6 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApiController.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApiController.java index 8c3b33a99af6..e9e29a41b4f9 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApiController.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApiController.java @@ -28,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class StoreApiController implements StoreApi { private final StoreApiDelegate delegate; diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java index 9d54717caa97..e960ec9acd6b 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApiController.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApiController.java index 58511a07291c..1b48d4a9444b 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApiController.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApiController.java @@ -29,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class UserApiController implements UserApi { private final UserApiDelegate delegate; diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-delegate-j8/src/main/resources/openapi.yaml index 5fdcfc33eada..2999e6f2f8d6 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-delegate-j8/src/main/resources/openapi.yaml @@ -2111,6 +2111,7 @@ components: status: description: Updated status of the pet type: string + type: object uploadFile_request: properties: additionalMetadata: @@ -2120,6 +2121,7 @@ components: description: file to upload format: binary type: string + type: object testEnumParameters_request: properties: enum_form_string_array: @@ -2139,6 +2141,7 @@ components: - -efg - (xyz) type: string + type: object testEndpointParameters_request: properties: integer: @@ -2211,6 +2214,7 @@ components: - double - number - pattern_without_delimiter + type: object testJsonFormData_request: properties: param: @@ -2222,6 +2226,7 @@ components: required: - param - param2 + type: object uploadFileWithRequiredFile_request: properties: additionalMetadata: @@ -2233,6 +2238,7 @@ components: type: string required: - requiredFile + type: object Dog_allOf: properties: breed: diff --git a/samples/server/petstore/springboot-delegate/.openapi-generator/FILES b/samples/server/petstore/springboot-delegate/.openapi-generator/FILES index 84b7f1df792d..07f63a0e8be2 100644 --- a/samples/server/petstore/springboot-delegate/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-delegate/.openapi-generator/FILES @@ -21,6 +21,7 @@ src/main/java/org/openapitools/api/StoreApiDelegate.java src/main/java/org/openapitools/api/UserApi.java src/main/java/org/openapitools/api/UserApiController.java src/main/java/org/openapitools/api/UserApiDelegate.java +src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/configuration/SpringFoxConfiguration.java src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java diff --git a/samples/server/petstore/springboot-delegate/.openapi-generator/VERSION b/samples/server/petstore/springboot-delegate/.openapi-generator/VERSION index ed829dbcddec..d6b4ec4aa783 100644 --- a/samples/server/petstore/springboot-delegate/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-delegate/.openapi-generator/VERSION @@ -1 +1 @@ -6.2.1-SNAPSHOT \ No newline at end of file +6.3.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java index e364fcafe96a..ffa28f493727 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApiController.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApiController.java index 7c3f20492479..e27e2fc20ea9 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApiController.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApiController.java @@ -27,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class AnotherFakeApiController implements AnotherFakeApi { private final AnotherFakeApiDelegate delegate; 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 8099dd8fb43b..261a033dd80d 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java index 8e624ba5fb59..726b17779f18 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java @@ -37,6 +37,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeApiController implements FakeApi { private final FakeApiDelegate delegate; diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index b58eee9db9f4..ecc2a625ddfb 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java index 48a276daf130..21e28fe8b213 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java @@ -27,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeClassnameTestApiController implements FakeClassnameTestApi { private final FakeClassnameTestApiDelegate delegate; 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 0d3907293827..16b3566374e5 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiController.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiController.java index e27c4c3b49d6..5ef3de965ff8 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiController.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiController.java @@ -29,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class PetApiController implements PetApi { private final PetApiDelegate delegate; diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java index 8a1f4ea555b9..c9e8abe50bf6 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiController.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiController.java index 8c3b33a99af6..e9e29a41b4f9 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiController.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiController.java @@ -28,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class StoreApiController implements StoreApi { private final StoreApiDelegate delegate; diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java index 9d54717caa97..e960ec9acd6b 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApiController.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApiController.java index 58511a07291c..1b48d4a9444b 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApiController.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApiController.java @@ -29,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class UserApiController implements UserApi { private final UserApiDelegate delegate; diff --git a/samples/server/petstore/springboot-delegate/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-delegate/src/main/resources/openapi.yaml index 5fdcfc33eada..2999e6f2f8d6 100644 --- a/samples/server/petstore/springboot-delegate/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-delegate/src/main/resources/openapi.yaml @@ -2111,6 +2111,7 @@ components: status: description: Updated status of the pet type: string + type: object uploadFile_request: properties: additionalMetadata: @@ -2120,6 +2121,7 @@ components: description: file to upload format: binary type: string + type: object testEnumParameters_request: properties: enum_form_string_array: @@ -2139,6 +2141,7 @@ components: - -efg - (xyz) type: string + type: object testEndpointParameters_request: properties: integer: @@ -2211,6 +2214,7 @@ components: - double - number - pattern_without_delimiter + type: object testJsonFormData_request: properties: param: @@ -2222,6 +2226,7 @@ components: required: - param - param2 + type: object uploadFileWithRequiredFile_request: properties: additionalMetadata: @@ -2233,6 +2238,7 @@ components: type: string required: - requiredFile + type: object Dog_allOf: properties: breed: diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/.openapi-generator/VERSION b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/.openapi-generator/VERSION index ed829dbcddec..d6b4ec4aa783 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/.openapi-generator/VERSION @@ -1 +1 @@ -6.2.1-SNAPSHOT \ No newline at end of file +6.3.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/PetApi.java index e4eec4c16809..9b66d42d3563 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/PetApiController.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/PetApiController.java index 7713fe93c419..b8fa3720a211 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/PetApiController.java +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/PetApiController.java @@ -29,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class PetApiController implements PetApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/StoreApi.java index e149518ef0c5..3044b699b0d0 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/StoreApiController.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/StoreApiController.java index f8c784ff3838..1292dc0b721d 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/StoreApiController.java +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/StoreApiController.java @@ -29,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class StoreApiController implements StoreApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/UserApi.java index ebf5be7009ed..66fab2a5f573 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/UserApiController.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/UserApiController.java index 894bf6db762e..ca00184d2a56 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/UserApiController.java +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/UserApiController.java @@ -30,6 +30,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class UserApiController implements UserApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/FILES b/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/FILES index 32fdc6a9409b..3c2e959bec02 100644 --- a/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/FILES @@ -15,6 +15,7 @@ src/main/java/org/openapitools/api/StoreApi.java src/main/java/org/openapitools/api/StoreApiController.java src/main/java/org/openapitools/api/UserApi.java src/main/java/org/openapitools/api/UserApiController.java +src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/configuration/SpringFoxConfiguration.java src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java diff --git a/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/VERSION b/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/VERSION index ed829dbcddec..d6b4ec4aa783 100644 --- a/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/VERSION @@ -1 +1 @@ -6.2.1-SNAPSHOT \ No newline at end of file +6.3.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java index 9ecd403de93c..b45fcc5dc16c 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApiController.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApiController.java index 65c9de6908c2..c2db7ca5a815 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApiController.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApiController.java @@ -28,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class AnotherFakeApiController implements AnotherFakeApi { private final NativeWebRequest request; 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 f1ab3d650027..88b13d87041c 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApiController.java index b30f53bb595c..5ae5d5fed985 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApiController.java @@ -38,6 +38,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeApiController implements FakeApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index decd021376d6..d54c2670f8e2 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java index 05196793d4c2..65b695629d43 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java @@ -28,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeClassnameTestApiController implements FakeClassnameTestApi { private final NativeWebRequest request; 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 263f21f2397b..c79ba12a30f2 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApiController.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApiController.java index 0b88e5980bf1..ea6c56e02c11 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApiController.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApiController.java @@ -30,6 +30,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class PetApiController implements PetApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java index f4319f650f50..1afb547b40ee 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApiController.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApiController.java index f8c784ff3838..1292dc0b721d 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApiController.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApiController.java @@ -29,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class StoreApiController implements StoreApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java index e458b4a0b8bf..981e3a95cbe6 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApiController.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApiController.java index 894bf6db762e..ca00184d2a56 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApiController.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApiController.java @@ -30,6 +30,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class UserApiController implements UserApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml index 5fdcfc33eada..2999e6f2f8d6 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml @@ -2111,6 +2111,7 @@ components: status: description: Updated status of the pet type: string + type: object uploadFile_request: properties: additionalMetadata: @@ -2120,6 +2121,7 @@ components: description: file to upload format: binary type: string + type: object testEnumParameters_request: properties: enum_form_string_array: @@ -2139,6 +2141,7 @@ components: - -efg - (xyz) type: string + type: object testEndpointParameters_request: properties: integer: @@ -2211,6 +2214,7 @@ components: - double - number - pattern_without_delimiter + type: object testJsonFormData_request: properties: param: @@ -2222,6 +2226,7 @@ components: required: - param - param2 + type: object uploadFileWithRequiredFile_request: properties: additionalMetadata: @@ -2233,6 +2238,7 @@ components: type: string required: - requiredFile + type: object Dog_allOf: properties: breed: diff --git a/samples/server/petstore/springboot-reactive/.openapi-generator/FILES b/samples/server/petstore/springboot-reactive/.openapi-generator/FILES index b552438ed416..bf09bb15ac79 100644 --- a/samples/server/petstore/springboot-reactive/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-reactive/.openapi-generator/FILES @@ -21,6 +21,7 @@ src/main/java/org/openapitools/api/StoreApiDelegate.java src/main/java/org/openapitools/api/UserApi.java src/main/java/org/openapitools/api/UserApiController.java src/main/java/org/openapitools/api/UserApiDelegate.java +src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java src/main/java/org/openapitools/model/AdditionalPropertiesArray.java diff --git a/samples/server/petstore/springboot-reactive/.openapi-generator/VERSION b/samples/server/petstore/springboot-reactive/.openapi-generator/VERSION index ed829dbcddec..d6b4ec4aa783 100644 --- a/samples/server/petstore/springboot-reactive/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-reactive/.openapi-generator/VERSION @@ -1 +1 @@ -6.2.1-SNAPSHOT \ No newline at end of file +6.3.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java index ff1872149c2d..9aa14c56592d 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApiController.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApiController.java index ac91b64909a1..c9afaab792d8 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApiController.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApiController.java @@ -28,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class AnotherFakeApiController implements AnotherFakeApi { private final AnotherFakeApiDelegate delegate; 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 eccbe54fab5e..f598c332026d 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiController.java index 113e86683929..db9b0dff167e 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiController.java @@ -38,6 +38,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeApiController implements FakeApi { private final FakeApiDelegate delegate; diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index dcf310bf3016..789b88876a4d 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java index 99cb9416db60..f98a29c1d782 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java @@ -28,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeClassnameTestApiController implements FakeClassnameTestApi { private final FakeClassnameTestApiDelegate delegate; 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 384f6e6693ce..2286bc126ea8 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiController.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiController.java index df2e9ebac57a..4b6a806bf6df 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiController.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiController.java @@ -30,6 +30,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class PetApiController implements PetApi { private final PetApiDelegate delegate; diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java index 26af3b8d214c..826fe6283a3c 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiController.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiController.java index 0f1102844b4e..72b8085628cf 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiController.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiController.java @@ -29,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class StoreApiController implements StoreApi { private final StoreApiDelegate delegate; diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java index 83c0cecd4439..2e7af65dc8b2 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApiController.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApiController.java index 840baa171120..6d3effb9ec3b 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApiController.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApiController.java @@ -30,6 +30,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class UserApiController implements UserApi { private final UserApiDelegate delegate; diff --git a/samples/server/petstore/springboot-reactive/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-reactive/src/main/resources/openapi.yaml index 5fdcfc33eada..2999e6f2f8d6 100644 --- a/samples/server/petstore/springboot-reactive/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-reactive/src/main/resources/openapi.yaml @@ -2111,6 +2111,7 @@ components: status: description: Updated status of the pet type: string + type: object uploadFile_request: properties: additionalMetadata: @@ -2120,6 +2121,7 @@ components: description: file to upload format: binary type: string + type: object testEnumParameters_request: properties: enum_form_string_array: @@ -2139,6 +2141,7 @@ components: - -efg - (xyz) type: string + type: object testEndpointParameters_request: properties: integer: @@ -2211,6 +2214,7 @@ components: - double - number - pattern_without_delimiter + type: object testJsonFormData_request: properties: param: @@ -2222,6 +2226,7 @@ components: required: - param - param2 + type: object uploadFileWithRequiredFile_request: properties: additionalMetadata: @@ -2233,6 +2238,7 @@ components: type: string required: - requiredFile + type: object Dog_allOf: properties: breed: diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/.openapi-generator/FILES b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/.openapi-generator/FILES index cfad6877d8e0..7a4d79c7e105 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/.openapi-generator/FILES @@ -21,6 +21,7 @@ src/main/java/org/openapitools/api/StoreApiDelegate.java src/main/java/org/openapitools/api/UserApi.java src/main/java/org/openapitools/api/UserApiController.java src/main/java/org/openapitools/api/UserApiDelegate.java +src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/configuration/SpringFoxConfiguration.java src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/.openapi-generator/VERSION b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/.openapi-generator/VERSION index ed829dbcddec..d6b4ec4aa783 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/.openapi-generator/VERSION @@ -1 +1 @@ -6.2.1-SNAPSHOT \ No newline at end of file +6.3.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java index e364fcafe96a..ffa28f493727 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/AnotherFakeApiController.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/AnotherFakeApiController.java index 7c3f20492479..e27e2fc20ea9 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/AnotherFakeApiController.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/AnotherFakeApiController.java @@ -27,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class AnotherFakeApiController implements AnotherFakeApi { private final AnotherFakeApiDelegate delegate; 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 97769d2e2a5b..599c2a879c59 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ 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 8e624ba5fb59..726b17779f18 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 @@ -37,6 +37,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeApiController implements FakeApi { private final FakeApiDelegate delegate; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index b58eee9db9f4..ecc2a625ddfb 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java index 48a276daf130..21e28fe8b213 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java @@ -27,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeClassnameTestApiController implements FakeClassnameTestApi { private final FakeClassnameTestApiDelegate delegate; 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 f05c3e5f6282..c1d022bbe331 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ 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 1218abedfa61..665635623373 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 @@ -30,6 +30,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class PetApiController implements PetApi { private final PetApiDelegate delegate; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApi.java index 8a1f4ea555b9..c9e8abe50bf6 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApiController.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApiController.java index 8c3b33a99af6..e9e29a41b4f9 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApiController.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApiController.java @@ -28,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class StoreApiController implements StoreApi { private final StoreApiDelegate delegate; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/UserApi.java index 9d54717caa97..e960ec9acd6b 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/UserApiController.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/UserApiController.java index 58511a07291c..1b48d4a9444b 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/UserApiController.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/UserApiController.java @@ -29,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class UserApiController implements UserApi { private final UserApiDelegate delegate; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/resources/openapi.yaml index 81cc16dcab22..d28bcff839b2 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/resources/openapi.yaml @@ -2105,6 +2105,7 @@ components: status: description: Updated status of the pet type: string + type: object uploadFile_request: properties: additionalMetadata: @@ -2114,6 +2115,7 @@ components: description: file to upload format: binary type: string + type: object testEnumParameters_request: properties: enum_form_string_array: @@ -2133,6 +2135,7 @@ components: - -efg - (xyz) type: string + type: object testEndpointParameters_request: properties: integer: @@ -2205,6 +2208,7 @@ components: - double - number - pattern_without_delimiter + type: object testJsonFormData_request: properties: param: @@ -2216,6 +2220,7 @@ components: required: - param - param2 + type: object uploadFileWithRequiredFile_request: properties: additionalMetadata: @@ -2227,6 +2232,7 @@ components: type: string required: - requiredFile + type: object Dog_allOf: properties: breed: diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/.openapi-generator/FILES b/samples/server/petstore/springboot-spring-pageable-delegatePattern/.openapi-generator/FILES index cfad6877d8e0..7a4d79c7e105 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/.openapi-generator/FILES @@ -21,6 +21,7 @@ src/main/java/org/openapitools/api/StoreApiDelegate.java src/main/java/org/openapitools/api/UserApi.java src/main/java/org/openapitools/api/UserApiController.java src/main/java/org/openapitools/api/UserApiDelegate.java +src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/configuration/SpringFoxConfiguration.java src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/.openapi-generator/VERSION b/samples/server/petstore/springboot-spring-pageable-delegatePattern/.openapi-generator/VERSION index ed829dbcddec..d6b4ec4aa783 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/.openapi-generator/VERSION @@ -1 +1 @@ -6.2.1-SNAPSHOT \ No newline at end of file +6.3.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/AnotherFakeApi.java index e364fcafe96a..ffa28f493727 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/AnotherFakeApiController.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/AnotherFakeApiController.java index 7c3f20492479..e27e2fc20ea9 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/AnotherFakeApiController.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/AnotherFakeApiController.java @@ -27,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class AnotherFakeApiController implements AnotherFakeApi { private final AnotherFakeApiDelegate delegate; 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 97769d2e2a5b..599c2a879c59 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApiController.java index 8e624ba5fb59..726b17779f18 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApiController.java @@ -37,6 +37,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeApiController implements FakeApi { private final FakeApiDelegate delegate; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index b58eee9db9f4..ecc2a625ddfb 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java index 48a276daf130..21e28fe8b213 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java @@ -27,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeClassnameTestApiController implements FakeClassnameTestApi { private final FakeClassnameTestApiDelegate delegate; 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 f05c3e5f6282..c1d022bbe331 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/PetApiController.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/PetApiController.java index 1218abedfa61..665635623373 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/PetApiController.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/PetApiController.java @@ -30,6 +30,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class PetApiController implements PetApi { private final PetApiDelegate delegate; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApi.java index 8a1f4ea555b9..c9e8abe50bf6 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApiController.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApiController.java index 8c3b33a99af6..e9e29a41b4f9 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApiController.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApiController.java @@ -28,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class StoreApiController implements StoreApi { private final StoreApiDelegate delegate; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/UserApi.java index 9d54717caa97..e960ec9acd6b 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/UserApiController.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/UserApiController.java index 58511a07291c..1b48d4a9444b 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/UserApiController.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/UserApiController.java @@ -29,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class UserApiController implements UserApi { private final UserApiDelegate delegate; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/resources/openapi.yaml index 81cc16dcab22..d28bcff839b2 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/resources/openapi.yaml @@ -2105,6 +2105,7 @@ components: status: description: Updated status of the pet type: string + type: object uploadFile_request: properties: additionalMetadata: @@ -2114,6 +2115,7 @@ components: description: file to upload format: binary type: string + type: object testEnumParameters_request: properties: enum_form_string_array: @@ -2133,6 +2135,7 @@ components: - -efg - (xyz) type: string + type: object testEndpointParameters_request: properties: integer: @@ -2205,6 +2208,7 @@ components: - double - number - pattern_without_delimiter + type: object testJsonFormData_request: properties: param: @@ -2216,6 +2220,7 @@ components: required: - param - param2 + type: object uploadFileWithRequiredFile_request: properties: additionalMetadata: @@ -2227,6 +2232,7 @@ components: type: string required: - requiredFile + type: object Dog_allOf: properties: breed: diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/.openapi-generator/FILES b/samples/server/petstore/springboot-spring-pageable-without-j8/.openapi-generator/FILES index 2696c0211eb9..82b3e0b0d8f2 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/.openapi-generator/FILES @@ -15,6 +15,7 @@ src/main/java/org/openapitools/api/StoreApi.java src/main/java/org/openapitools/api/StoreApiController.java src/main/java/org/openapitools/api/UserApi.java src/main/java/org/openapitools/api/UserApiController.java +src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/configuration/SpringFoxConfiguration.java src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/.openapi-generator/VERSION b/samples/server/petstore/springboot-spring-pageable-without-j8/.openapi-generator/VERSION index ed829dbcddec..d6b4ec4aa783 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/.openapi-generator/VERSION @@ -1 +1 @@ -6.2.1-SNAPSHOT \ No newline at end of file +6.3.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java index 9ecd403de93c..b45fcc5dc16c 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/AnotherFakeApiController.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/AnotherFakeApiController.java index 65c9de6908c2..c2db7ca5a815 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/AnotherFakeApiController.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/AnotherFakeApiController.java @@ -28,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class AnotherFakeApiController implements AnotherFakeApi { private final NativeWebRequest request; 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 f7ea83eb0311..c07a605db9de 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ 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 b30f53bb595c..5ae5d5fed985 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 @@ -38,6 +38,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeApiController implements FakeApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index decd021376d6..d54c2670f8e2 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java index 05196793d4c2..65b695629d43 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java @@ -28,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeClassnameTestApiController implements FakeClassnameTestApi { private final NativeWebRequest request; 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 3d7097297201..f6c886ac94c8 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ 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 58de86d8ac79..ab60617a7ee1 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 @@ -31,6 +31,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class PetApiController implements PetApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/StoreApi.java index f4319f650f50..1afb547b40ee 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/StoreApiController.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/StoreApiController.java index f8c784ff3838..1292dc0b721d 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/StoreApiController.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/StoreApiController.java @@ -29,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class StoreApiController implements StoreApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/UserApi.java index e458b4a0b8bf..981e3a95cbe6 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/UserApiController.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/UserApiController.java index 894bf6db762e..ca00184d2a56 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/UserApiController.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/UserApiController.java @@ -30,6 +30,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class UserApiController implements UserApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/resources/openapi.yaml index 81cc16dcab22..d28bcff839b2 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/resources/openapi.yaml @@ -2105,6 +2105,7 @@ components: status: description: Updated status of the pet type: string + type: object uploadFile_request: properties: additionalMetadata: @@ -2114,6 +2115,7 @@ components: description: file to upload format: binary type: string + type: object testEnumParameters_request: properties: enum_form_string_array: @@ -2133,6 +2135,7 @@ components: - -efg - (xyz) type: string + type: object testEndpointParameters_request: properties: integer: @@ -2205,6 +2208,7 @@ components: - double - number - pattern_without_delimiter + type: object testJsonFormData_request: properties: param: @@ -2216,6 +2220,7 @@ components: required: - param - param2 + type: object uploadFileWithRequiredFile_request: properties: additionalMetadata: @@ -2227,6 +2232,7 @@ components: type: string required: - requiredFile + type: object Dog_allOf: properties: breed: diff --git a/samples/server/petstore/springboot-spring-pageable/.openapi-generator/FILES b/samples/server/petstore/springboot-spring-pageable/.openapi-generator/FILES index 2696c0211eb9..82b3e0b0d8f2 100644 --- a/samples/server/petstore/springboot-spring-pageable/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-spring-pageable/.openapi-generator/FILES @@ -15,6 +15,7 @@ src/main/java/org/openapitools/api/StoreApi.java src/main/java/org/openapitools/api/StoreApiController.java src/main/java/org/openapitools/api/UserApi.java src/main/java/org/openapitools/api/UserApiController.java +src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/configuration/SpringFoxConfiguration.java src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java diff --git a/samples/server/petstore/springboot-spring-pageable/.openapi-generator/VERSION b/samples/server/petstore/springboot-spring-pageable/.openapi-generator/VERSION index ed829dbcddec..d6b4ec4aa783 100644 --- a/samples/server/petstore/springboot-spring-pageable/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-spring-pageable/.openapi-generator/VERSION @@ -1 +1 @@ -6.2.1-SNAPSHOT \ No newline at end of file +6.3.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApi.java index 9ecd403de93c..b45fcc5dc16c 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApiController.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApiController.java index 65c9de6908c2..c2db7ca5a815 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApiController.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApiController.java @@ -28,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class AnotherFakeApiController implements AnotherFakeApi { private final NativeWebRequest request; 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 f7ea83eb0311..c07a605db9de 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApiController.java index b30f53bb595c..5ae5d5fed985 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApiController.java @@ -38,6 +38,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeApiController implements FakeApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index decd021376d6..d54c2670f8e2 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java index 05196793d4c2..65b695629d43 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java @@ -28,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeClassnameTestApiController implements FakeClassnameTestApi { private final NativeWebRequest request; 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 3d7097297201..f6c886ac94c8 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/PetApiController.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/PetApiController.java index 58de86d8ac79..ab60617a7ee1 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/PetApiController.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/PetApiController.java @@ -31,6 +31,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class PetApiController implements PetApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java index f4319f650f50..1afb547b40ee 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/StoreApiController.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/StoreApiController.java index f8c784ff3838..1292dc0b721d 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/StoreApiController.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/StoreApiController.java @@ -29,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class StoreApiController implements StoreApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/UserApi.java index e458b4a0b8bf..981e3a95cbe6 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/UserApiController.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/UserApiController.java index 894bf6db762e..ca00184d2a56 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/UserApiController.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/UserApiController.java @@ -30,6 +30,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class UserApiController implements UserApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-spring-pageable/src/main/resources/openapi.yaml index 81cc16dcab22..d28bcff839b2 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-spring-pageable/src/main/resources/openapi.yaml @@ -2105,6 +2105,7 @@ components: status: description: Updated status of the pet type: string + type: object uploadFile_request: properties: additionalMetadata: @@ -2114,6 +2115,7 @@ components: description: file to upload format: binary type: string + type: object testEnumParameters_request: properties: enum_form_string_array: @@ -2133,6 +2135,7 @@ components: - -efg - (xyz) type: string + type: object testEndpointParameters_request: properties: integer: @@ -2205,6 +2208,7 @@ components: - double - number - pattern_without_delimiter + type: object testJsonFormData_request: properties: param: @@ -2216,6 +2220,7 @@ components: required: - param - param2 + type: object uploadFileWithRequiredFile_request: properties: additionalMetadata: @@ -2227,6 +2232,7 @@ components: type: string required: - requiredFile + type: object Dog_allOf: properties: breed: diff --git a/samples/server/petstore/springboot-useoptional/.openapi-generator/FILES b/samples/server/petstore/springboot-useoptional/.openapi-generator/FILES index 32fdc6a9409b..3c2e959bec02 100644 --- a/samples/server/petstore/springboot-useoptional/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-useoptional/.openapi-generator/FILES @@ -15,6 +15,7 @@ src/main/java/org/openapitools/api/StoreApi.java src/main/java/org/openapitools/api/StoreApiController.java src/main/java/org/openapitools/api/UserApi.java src/main/java/org/openapitools/api/UserApiController.java +src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/configuration/SpringFoxConfiguration.java src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java diff --git a/samples/server/petstore/springboot-useoptional/.openapi-generator/VERSION b/samples/server/petstore/springboot-useoptional/.openapi-generator/VERSION index ed829dbcddec..d6b4ec4aa783 100644 --- a/samples/server/petstore/springboot-useoptional/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-useoptional/.openapi-generator/VERSION @@ -1 +1 @@ -6.2.1-SNAPSHOT \ No newline at end of file +6.3.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java index 9ecd403de93c..b45fcc5dc16c 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApiController.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApiController.java index 65c9de6908c2..c2db7ca5a815 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApiController.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApiController.java @@ -28,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class AnotherFakeApiController implements AnotherFakeApi { private final NativeWebRequest request; 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 f89cbd4f321a..b8085e150ec5 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApiController.java index b30f53bb595c..5ae5d5fed985 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApiController.java @@ -38,6 +38,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeApiController implements FakeApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index decd021376d6..d54c2670f8e2 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java index 05196793d4c2..65b695629d43 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java @@ -28,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeClassnameTestApiController implements FakeClassnameTestApi { private final NativeWebRequest request; 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 a72f4d9c2ffb..6d85c297c392 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApiController.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApiController.java index 0b88e5980bf1..ea6c56e02c11 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApiController.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApiController.java @@ -30,6 +30,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class PetApiController implements PetApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java index f4319f650f50..1afb547b40ee 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApiController.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApiController.java index f8c784ff3838..1292dc0b721d 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApiController.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApiController.java @@ -29,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class StoreApiController implements StoreApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java index e458b4a0b8bf..981e3a95cbe6 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApiController.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApiController.java index 894bf6db762e..ca00184d2a56 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApiController.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApiController.java @@ -30,6 +30,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class UserApiController implements UserApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-useoptional/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-useoptional/src/main/resources/openapi.yaml index 5fdcfc33eada..2999e6f2f8d6 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-useoptional/src/main/resources/openapi.yaml @@ -2111,6 +2111,7 @@ components: status: description: Updated status of the pet type: string + type: object uploadFile_request: properties: additionalMetadata: @@ -2120,6 +2121,7 @@ components: description: file to upload format: binary type: string + type: object testEnumParameters_request: properties: enum_form_string_array: @@ -2139,6 +2141,7 @@ components: - -efg - (xyz) type: string + type: object testEndpointParameters_request: properties: integer: @@ -2211,6 +2214,7 @@ components: - double - number - pattern_without_delimiter + type: object testJsonFormData_request: properties: param: @@ -2222,6 +2226,7 @@ components: required: - param - param2 + type: object uploadFileWithRequiredFile_request: properties: additionalMetadata: @@ -2233,6 +2238,7 @@ components: type: string required: - requiredFile + type: object Dog_allOf: properties: breed: diff --git a/samples/server/petstore/springboot-virtualan/.openapi-generator/FILES b/samples/server/petstore/springboot-virtualan/.openapi-generator/FILES index 242b5258470c..408f3973f3ee 100644 --- a/samples/server/petstore/springboot-virtualan/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-virtualan/.openapi-generator/FILES @@ -2,6 +2,7 @@ README.md pom.xml src/main/java/org/openapitools/OpenApiGeneratorApplication.java src/main/java/org/openapitools/RFC3339DateFormat.java +src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/configuration/SpringDocConfiguration.java src/main/java/org/openapitools/virtualan/api/AnotherFakeApi.java diff --git a/samples/server/petstore/springboot-virtualan/.openapi-generator/VERSION b/samples/server/petstore/springboot-virtualan/.openapi-generator/VERSION index ed829dbcddec..d6b4ec4aa783 100644 --- a/samples/server/petstore/springboot-virtualan/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-virtualan/.openapi-generator/VERSION @@ -1 +1 @@ -6.2.1-SNAPSHOT \ No newline at end of file +6.3.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApi.java index 7253f3acaca0..cb271de88171 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApiController.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApiController.java index 8430d80bd925..dd5594acb67b 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApiController.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApiController.java @@ -28,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class AnotherFakeApiController implements AnotherFakeApi { private final NativeWebRequest request; 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 6503e457d226..d610b3cc014d 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApiController.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApiController.java index d733bfab3a46..d33842e20df7 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApiController.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApiController.java @@ -38,6 +38,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeApiController implements FakeApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApi.java index d8ad5bf1321d..a95cbe23b7ab 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApiController.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApiController.java index 4db741afee9d..f4d0eedc19c9 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApiController.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApiController.java @@ -28,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeClassnameTestApiController implements FakeClassnameTestApi { private final NativeWebRequest request; 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 2bf118046c4a..e37f6b77f608 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApiController.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApiController.java index 0b171a217de1..94ea48fcc818 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApiController.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApiController.java @@ -30,6 +30,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class PetApiController implements PetApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java index 35a8114198ad..9f5d667b14ed 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApiController.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApiController.java index 1d865458002d..bc986cbdf0a1 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApiController.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApiController.java @@ -29,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class StoreApiController implements StoreApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApi.java index b64fb351d9c0..e9dfc2dcfbfd 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApiController.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApiController.java index 10575bc75fb0..65303c96a8a5 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApiController.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApiController.java @@ -30,6 +30,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class UserApiController implements UserApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot-virtualan/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-virtualan/src/main/resources/openapi.yaml index 5fdcfc33eada..2999e6f2f8d6 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-virtualan/src/main/resources/openapi.yaml @@ -2111,6 +2111,7 @@ components: status: description: Updated status of the pet type: string + type: object uploadFile_request: properties: additionalMetadata: @@ -2120,6 +2121,7 @@ components: description: file to upload format: binary type: string + type: object testEnumParameters_request: properties: enum_form_string_array: @@ -2139,6 +2141,7 @@ components: - -efg - (xyz) type: string + type: object testEndpointParameters_request: properties: integer: @@ -2211,6 +2214,7 @@ components: - double - number - pattern_without_delimiter + type: object testJsonFormData_request: properties: param: @@ -2222,6 +2226,7 @@ components: required: - param - param2 + type: object uploadFileWithRequiredFile_request: properties: additionalMetadata: @@ -2233,6 +2238,7 @@ components: type: string required: - requiredFile + type: object Dog_allOf: properties: breed: diff --git a/samples/server/petstore/springboot/.openapi-generator/FILES b/samples/server/petstore/springboot/.openapi-generator/FILES index 32fdc6a9409b..3c2e959bec02 100644 --- a/samples/server/petstore/springboot/.openapi-generator/FILES +++ b/samples/server/petstore/springboot/.openapi-generator/FILES @@ -15,6 +15,7 @@ src/main/java/org/openapitools/api/StoreApi.java src/main/java/org/openapitools/api/StoreApiController.java src/main/java/org/openapitools/api/UserApi.java src/main/java/org/openapitools/api/UserApiController.java +src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/configuration/SpringFoxConfiguration.java src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java diff --git a/samples/server/petstore/springboot/.openapi-generator/VERSION b/samples/server/petstore/springboot/.openapi-generator/VERSION index ed829dbcddec..d6b4ec4aa783 100644 --- a/samples/server/petstore/springboot/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot/.openapi-generator/VERSION @@ -1 +1 @@ -6.2.1-SNAPSHOT \ No newline at end of file +6.3.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java index 9ecd403de93c..b45fcc5dc16c 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApiController.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApiController.java index 65c9de6908c2..c2db7ca5a815 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApiController.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApiController.java @@ -28,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class AnotherFakeApiController implements AnotherFakeApi { private final NativeWebRequest request; 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 4b87b2def473..1220ac16e008 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApiController.java index b30f53bb595c..5ae5d5fed985 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApiController.java @@ -38,6 +38,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeApiController implements FakeApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index decd021376d6..d54c2670f8e2 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java index 05196793d4c2..65b695629d43 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java @@ -28,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeClassnameTestApiController implements FakeClassnameTestApi { private final NativeWebRequest request; 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 6247af5faa7b..60ccea3635bc 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 @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApiController.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApiController.java index 0b88e5980bf1..ea6c56e02c11 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApiController.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApiController.java @@ -30,6 +30,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class PetApiController implements PetApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java index f4319f650f50..1afb547b40ee 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApiController.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApiController.java index f8c784ff3838..1292dc0b721d 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApiController.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApiController.java @@ -29,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class StoreApiController implements StoreApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java index e458b4a0b8bf..981e3a95cbe6 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.2.1-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.3.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApiController.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApiController.java index 894bf6db762e..ca00184d2a56 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApiController.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApiController.java @@ -30,6 +30,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") @Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class UserApiController implements UserApi { private final NativeWebRequest request; diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Model200Response.java index 193231f85457..535bf8701409 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Model200Response.java @@ -77,9 +77,9 @@ public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) { return false; } - Model200Response _200response = (Model200Response) o; - return Objects.equals(this.name, _200response.name) && - Objects.equals(this.propertyClass, _200response.propertyClass); + Model200Response _200Response = (Model200Response) o; + return Objects.equals(this.name, _200Response.name) && + Objects.equals(this.propertyClass, _200Response.propertyClass); } @Override diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ModelList.java index 7853f3d408a0..87884712723a 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ModelList.java @@ -24,26 +24,26 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelList { - private String _123list; + private String _123List; - public ModelList _123list(String _123list) { - this._123list = _123list; + public ModelList _123List(String _123List) { + this._123List = _123List; return this; } /** - * Get _123list - * @return _123list + * Get _123List + * @return _123List */ @ApiModelProperty(value = "") @JsonProperty("123-list") - public String get123list() { - return _123list; + public String get123List() { + return _123List; } - public void set123list(String _123list) { - this._123list = _123list; + public void set123List(String _123List) { + this._123List = _123List; } @Override @@ -55,19 +55,19 @@ public boolean equals(Object o) { return false; } ModelList _list = (ModelList) o; - return Objects.equals(this._123list, _list._123list); + return Objects.equals(this._123List, _list._123List); } @Override public int hashCode() { - return Objects.hash(_123list); + return Objects.hash(_123List); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class ModelList {\n"); - sb.append(" _123list: ").append(toIndentedString(_123list)).append("\n"); + sb.append(" _123List: ").append(toIndentedString(_123List)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Name.java index 32403fe65891..0d6fb40c9567 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Name.java @@ -29,7 +29,7 @@ public class Name { private String property; - private Integer _123number; + private Integer _123Number; public Name name(Integer name) { this.name = name; @@ -91,24 +91,24 @@ public void setProperty(String property) { this.property = property; } - public Name _123number(Integer _123number) { - this._123number = _123number; + public Name _123Number(Integer _123Number) { + this._123Number = _123Number; return this; } /** - * Get _123number - * @return _123number + * Get _123Number + * @return _123Number */ @ApiModelProperty(readOnly = true, value = "") @JsonProperty("123Number") - public Integer get123number() { - return _123number; + public Integer get123Number() { + return _123Number; } - public void set123number(Integer _123number) { - this._123number = _123number; + public void set123Number(Integer _123Number) { + this._123Number = _123Number; } @Override @@ -123,12 +123,12 @@ public boolean equals(Object o) { return Objects.equals(this.name, name.name) && Objects.equals(this.snakeCase, name.snakeCase) && Objects.equals(this.property, name.property) && - Objects.equals(this._123number, name._123number); + Objects.equals(this._123Number, name._123Number); } @Override public int hashCode() { - return Objects.hash(name, snakeCase, property, _123number); + return Objects.hash(name, snakeCase, property, _123Number); } @Override @@ -138,7 +138,7 @@ public String toString() { sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" snakeCase: ").append(toIndentedString(snakeCase)).append("\n"); sb.append(" property: ").append(toIndentedString(property)).append("\n"); - sb.append(" _123number: ").append(toIndentedString(_123number)).append("\n"); + sb.append(" _123Number: ").append(toIndentedString(_123Number)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/SpecialModelName.java index 668035becd14..08f979d27c45 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/SpecialModelName.java @@ -24,26 +24,26 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class SpecialModelName { - private Long $specialPropertyName; + private Long $SpecialPropertyName; - public SpecialModelName $specialPropertyName(Long $specialPropertyName) { - this.$specialPropertyName = $specialPropertyName; + public SpecialModelName $SpecialPropertyName(Long $SpecialPropertyName) { + this.$SpecialPropertyName = $SpecialPropertyName; return this; } /** - * Get $specialPropertyName - * @return $specialPropertyName + * Get $SpecialPropertyName + * @return $SpecialPropertyName */ @ApiModelProperty(value = "") @JsonProperty("$special[property.name]") public Long get$SpecialPropertyName() { - return $specialPropertyName; + return $SpecialPropertyName; } - public void set$SpecialPropertyName(Long $specialPropertyName) { - this.$specialPropertyName = $specialPropertyName; + public void set$SpecialPropertyName(Long $SpecialPropertyName) { + this.$SpecialPropertyName = $SpecialPropertyName; } @Override @@ -54,20 +54,20 @@ public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) { return false; } - SpecialModelName $specialModelName = (SpecialModelName) o; - return Objects.equals(this.$specialPropertyName, $specialModelName.$specialPropertyName); + SpecialModelName $SpecialModelName = (SpecialModelName) o; + return Objects.equals(this.$SpecialPropertyName, $SpecialModelName.$SpecialPropertyName); } @Override public int hashCode() { - return Objects.hash($specialPropertyName); + return Objects.hash($SpecialPropertyName); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class SpecialModelName {\n"); - sb.append(" $specialPropertyName: ").append(toIndentedString($specialPropertyName)).append("\n"); + sb.append(" $SpecialPropertyName: ").append(toIndentedString($SpecialPropertyName)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot/src/main/resources/openapi.yaml b/samples/server/petstore/springboot/src/main/resources/openapi.yaml index 5fdcfc33eada..2999e6f2f8d6 100644 --- a/samples/server/petstore/springboot/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot/src/main/resources/openapi.yaml @@ -2111,6 +2111,7 @@ components: status: description: Updated status of the pet type: string + type: object uploadFile_request: properties: additionalMetadata: @@ -2120,6 +2121,7 @@ components: description: file to upload format: binary type: string + type: object testEnumParameters_request: properties: enum_form_string_array: @@ -2139,6 +2141,7 @@ components: - -efg - (xyz) type: string + type: object testEndpointParameters_request: properties: integer: @@ -2211,6 +2214,7 @@ components: - double - number - pattern_without_delimiter + type: object testJsonFormData_request: properties: param: @@ -2222,6 +2226,7 @@ components: required: - param - param2 + type: object uploadFileWithRequiredFile_request: properties: additionalMetadata: @@ -2233,6 +2238,7 @@ components: type: string required: - requiredFile + type: object Dog_allOf: properties: breed: From e35df5e570c082eaec13155e245444542f2b8690 Mon Sep 17 00:00:00 2001 From: Oleh Kurpiak Date: Sun, 19 Mar 2023 13:28:48 +0200 Subject: [PATCH 8/8] [Java][Spring] update test & samples; add serialization/deserialization test --- .../assertions/AbstractAnnotationAssert.java | 7 + .../java/spring/SpringCodegenTest.java | 42 ++++- ...ith-fake-endpoints-models-for-testing.yaml | 31 ++++ .../main/java/org/openapitools/model/Pet.java | 12 +- .../main/java/org/openapitools/model/Pet.java | 12 +- .../.openapi-generator/FILES | 1 + .../java/org/openapitools/api/PetApi.java | 17 ++ .../model/AdditionalPropertiesClass.java | 22 +-- .../model/ContainerDefaultValue.java | 8 +- ...ResponseObjectWithDifferentFieldNames.java | 149 +++++++++++++++++ .../openapitools/model/TypeHolderDefault.java | 10 +- .../.openapi-generator/FILES | 1 + .../java/org/openapitools/api/PetApi.java | 17 ++ .../model/AdditionalPropertiesClassDto.java | 22 +-- .../model/ContainerDefaultValueDto.java | 8 +- ...ponseObjectWithDifferentFieldNamesDto.java | 151 +++++++++++++++++ .../model/TypeHolderDefaultDto.java | 10 +- .../main/java/org/openapitools/model/Pet.java | 12 +- .../main/java/org/openapitools/model/Pet.java | 12 +- .../.openapi-generator/FILES | 1 + .../java/org/openapitools/api/PetApi.java | 26 +++ .../model/AdditionalPropertiesClass.java | 22 +-- .../model/ContainerDefaultValue.java | 8 +- .../model/FileSchemaTestClass.java | 4 +- .../main/java/org/openapitools/model/Pet.java | 12 +- ...ResponseObjectWithDifferentFieldNames.java | 155 +++++++++++++++++ .../openapitools/model/TypeHolderDefault.java | 10 +- .../openapitools/model/TypeHolderExample.java | 12 +- .../main/java/org/openapitools/model/Pet.java | 12 +- .../main/java/org/openapitools/model/Pet.java | 12 +- .../main/java/org/openapitools/model/Pet.java | 12 +- .../main/java/org/openapitools/model/Pet.java | 12 +- .../main/java/org/openapitools/model/Pet.java | 12 +- .../main/java/org/openapitools/model/Pet.java | 12 +- .../.openapi-generator-ignore | 2 + .../.openapi-generator/FILES | 1 + .../java/org/openapitools/api/FakeApi.java | 28 ++++ .../openapitools/api/FakeApiController.java | 1 + .../org/openapitools/api/FakeApiDelegate.java | 22 +++ .../model/AdditionalPropertiesClass.java | 22 +-- .../model/ContainerDefaultValue.java | 8 +- .../model/FileSchemaTestClass.java | 4 +- .../main/java/org/openapitools/model/Pet.java | 12 +- ...ResponseObjectWithDifferentFieldNames.java | 155 +++++++++++++++++ .../openapitools/model/TypeHolderDefault.java | 10 +- .../openapitools/model/TypeHolderExample.java | 12 +- .../src/main/resources/openapi.yaml | 41 +++++ ...ferentFieldNamesJsonSerializationTest.java | 57 +++++++ .../.openapi-generator/FILES | 1 + .../java/org/openapitools/api/FakeApi.java | 38 +++++ .../openapitools/api/FakeApiController.java | 1 + .../model/AdditionalPropertiesClass.java | 22 +-- .../model/ContainerDefaultValue.java | 8 +- .../model/FileSchemaTestClass.java | 4 +- .../main/java/org/openapitools/model/Pet.java | 12 +- ...ResponseObjectWithDifferentFieldNames.java | 155 +++++++++++++++++ .../openapitools/model/TypeHolderDefault.java | 10 +- .../openapitools/model/TypeHolderExample.java | 12 +- .../src/main/resources/openapi.yaml | 41 +++++ .../main/java/org/openapitools/model/Pet.java | 12 +- .../main/java/org/openapitools/model/Pet.java | 12 +- .../java/org/openapitools/model/Category.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../java/org/openapitools/model/Order.java | 12 +- .../main/java/org/openapitools/model/Pet.java | 12 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../java/org/openapitools/model/User.java | 16 +- .../.openapi-generator/FILES | 1 + .../java/org/openapitools/api/FakeApi.java | 26 +++ .../model/AdditionalPropertiesClass.java | 22 +-- .../model/ContainerDefaultValue.java | 8 +- .../model/FileSchemaTestClass.java | 4 +- .../main/java/org/openapitools/model/Pet.java | 12 +- ...ResponseObjectWithDifferentFieldNames.java | 155 +++++++++++++++++ .../openapitools/model/TypeHolderDefault.java | 10 +- .../openapitools/model/TypeHolderExample.java | 12 +- .../.openapi-generator/FILES | 1 + .../java/org/openapitools/api/FakeApi.java | 39 +++++ .../openapitools/api/FakeApiController.java | 1 + .../model/AdditionalPropertiesClass.java | 22 +-- .../model/ContainerDefaultValue.java | 8 +- .../model/FileSchemaTestClass.java | 4 +- .../main/java/org/openapitools/model/Pet.java | 12 +- ...ResponseObjectWithDifferentFieldNames.java | 155 +++++++++++++++++ .../openapitools/model/TypeHolderDefault.java | 10 +- .../openapitools/model/TypeHolderExample.java | 12 +- .../src/main/resources/openapi.yaml | 41 +++++ .../.openapi-generator/FILES | 1 + .../java/org/openapitools/api/FakeApi.java | 39 +++++ .../openapitools/api/FakeApiController.java | 1 + .../model/AdditionalPropertiesClass.java | 22 +-- .../model/ContainerDefaultValue.java | 8 +- .../model/FileSchemaTestClass.java | 4 +- .../main/java/org/openapitools/model/Pet.java | 12 +- ...ResponseObjectWithDifferentFieldNames.java | 156 +++++++++++++++++ .../openapitools/model/TypeHolderDefault.java | 10 +- .../openapitools/model/TypeHolderExample.java | 12 +- .../src/main/resources/openapi.yaml | 41 +++++ .../.openapi-generator/FILES | 1 + .../java/org/openapitools/api/FakeApi.java | 29 ++++ .../openapitools/api/FakeApiController.java | 1 + .../org/openapitools/api/FakeApiDelegate.java | 22 +++ .../model/AdditionalPropertiesClass.java | 22 +-- .../model/ContainerDefaultValue.java | 8 +- .../model/FileSchemaTestClass.java | 4 +- .../main/java/org/openapitools/model/Pet.java | 12 +- ...ResponseObjectWithDifferentFieldNames.java | 156 +++++++++++++++++ .../openapitools/model/TypeHolderDefault.java | 10 +- .../openapitools/model/TypeHolderExample.java | 12 +- .../src/main/resources/openapi.yaml | 41 +++++ .../main/java/org/openapitools/model/Pet.java | 12 +- .../.openapi-generator/FILES | 1 + .../java/org/openapitools/api/FakeApi.java | 29 ++++ .../openapitools/api/FakeApiController.java | 1 + .../org/openapitools/api/FakeApiDelegate.java | 22 +++ .../model/AdditionalPropertiesClass.java | 22 +-- .../model/ContainerDefaultValue.java | 8 +- .../model/FileSchemaTestClass.java | 4 +- .../main/java/org/openapitools/model/Pet.java | 12 +- ...ResponseObjectWithDifferentFieldNames.java | 156 +++++++++++++++++ .../openapitools/model/TypeHolderDefault.java | 10 +- .../openapitools/model/TypeHolderExample.java | 12 +- .../src/main/resources/openapi.yaml | 41 +++++ .../main/java/org/openapitools/model/Pet.java | 12 +- .../.openapi-generator/FILES | 1 + .../java/org/openapitools/api/FakeApi.java | 39 +++++ .../openapitools/api/FakeApiController.java | 1 + .../model/AdditionalPropertiesClass.java | 22 +-- .../model/ContainerDefaultValue.java | 8 +- .../model/FileSchemaTestClass.java | 4 +- .../main/java/org/openapitools/model/Pet.java | 12 +- ...ResponseObjectWithDifferentFieldNames.java | 156 +++++++++++++++++ .../openapitools/model/TypeHolderDefault.java | 10 +- .../openapitools/model/TypeHolderExample.java | 12 +- .../src/main/resources/openapi.yaml | 41 +++++ .../.openapi-generator/FILES | 1 + .../java/org/openapitools/api/FakeApi.java | 30 ++++ .../openapitools/api/FakeApiController.java | 1 + .../org/openapitools/api/FakeApiDelegate.java | 23 +++ .../model/AdditionalPropertiesClass.java | 22 +-- .../model/ContainerDefaultValue.java | 8 +- .../model/FileSchemaTestClass.java | 4 +- .../main/java/org/openapitools/model/Pet.java | 12 +- ...ResponseObjectWithDifferentFieldNames.java | 156 +++++++++++++++++ .../openapitools/model/TypeHolderDefault.java | 10 +- .../openapitools/model/TypeHolderExample.java | 12 +- .../src/main/resources/openapi.yaml | 41 +++++ .../model/FileSchemaTestClass.java | 4 +- .../main/java/org/openapitools/model/Pet.java | 12 +- .../openapitools/model/TypeHolderExample.java | 12 +- .../model/FileSchemaTestClass.java | 4 +- .../main/java/org/openapitools/model/Pet.java | 12 +- .../openapitools/model/TypeHolderExample.java | 12 +- .../model/FileSchemaTestClass.java | 4 +- .../main/java/org/openapitools/model/Pet.java | 12 +- .../openapitools/model/TypeHolderExample.java | 12 +- .../model/FileSchemaTestClass.java | 4 +- .../main/java/org/openapitools/model/Pet.java | 12 +- .../openapitools/model/TypeHolderExample.java | 12 +- .../.openapi-generator/FILES | 1 + .../java/org/openapitools/api/FakeApi.java | 39 +++++ .../openapitools/api/FakeApiController.java | 1 + .../model/AdditionalPropertiesClass.java | 22 +-- .../model/ContainerDefaultValue.java | 8 +- .../model/FileSchemaTestClass.java | 4 +- .../main/java/org/openapitools/model/Pet.java | 12 +- ...ResponseObjectWithDifferentFieldNames.java | 156 +++++++++++++++++ .../openapitools/model/TypeHolderDefault.java | 10 +- .../openapitools/model/TypeHolderExample.java | 12 +- .../src/main/resources/openapi.yaml | 41 +++++ .../.openapi-generator/FILES | 1 + .../openapitools/virtualan/api/FakeApi.java | 39 +++++ .../virtualan/api/FakeApiController.java | 1 + .../model/AdditionalPropertiesClass.java | 22 +-- .../model/ContainerDefaultValue.java | 8 +- .../virtualan/model/FileSchemaTestClass.java | 4 +- .../org/openapitools/virtualan/model/Pet.java | 12 +- ...ResponseObjectWithDifferentFieldNames.java | 155 +++++++++++++++++ .../virtualan/model/TypeHolderDefault.java | 10 +- .../virtualan/model/TypeHolderExample.java | 12 +- .../src/main/resources/openapi.yaml | 41 +++++ .../springboot/.openapi-generator/FILES | 1 + .../java/org/openapitools/api/FakeApi.java | 39 +++++ .../openapitools/api/FakeApiController.java | 1 + .../model/AdditionalPropertiesClassDto.java | 22 +-- .../model/ContainerDefaultValueDto.java | 8 +- .../model/FileSchemaTestClassDto.java | 4 +- .../java/org/openapitools/model/PetDto.java | 12 +- ...ponseObjectWithDifferentFieldNamesDto.java | 158 ++++++++++++++++++ .../model/TypeHolderDefaultDto.java | 10 +- .../model/TypeHolderExampleDto.java | 12 +- .../src/main/resources/openapi.yaml | 41 +++++ 192 files changed, 4146 insertions(+), 655 deletions(-) create mode 100644 samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java create mode 100644 samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java create mode 100644 samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java create mode 100644 samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java create mode 100644 samples/openapi3/server/petstore/springboot-delegate/src/test/java/org/openapitools/ResponseObjectWithDifferentFieldNamesJsonSerializationTest.java create mode 100644 samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java create mode 100644 samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java create mode 100644 samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java create mode 100644 samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java create mode 100644 samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java create mode 100644 samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java create mode 100644 samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java create mode 100644 samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java create mode 100644 samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java create mode 100644 samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ResponseObjectWithDifferentFieldNames.java create mode 100644 samples/server/petstore/springboot/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/assertions/AbstractAnnotationAssert.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/assertions/AbstractAnnotationAssert.java index 05b53d5fa09e..5a9e64126182 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/assertions/AbstractAnnotationAssert.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/assertions/AbstractAnnotationAssert.java @@ -35,6 +35,13 @@ public ACTUAL containsWithName(final String name) { return myself(); } + public ACTUAL doesNotContainsWithName(final String name) { + super + .withFailMessage("Should have annotation with name: " + name) + .noneMatch(annotation -> annotation.getNameAsString().equals(name)); + return myself(); + } + public ACTUAL containsWithNameAndAttributes(final String name, final Map attributes) { super .withFailMessage("Should have annotation with name: " + name + " and attributes: " + attributes + ", but was: " + actual) 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 010cfad2e5af..46cec50b1b3b 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 @@ -2146,12 +2146,12 @@ private Map generateFromContract(String url, String library, Map files = generator.opts(input).generate().stream() + .collect(Collectors.toMap(File::getName, Function.identity())); - String jsonPropertyInGetClassName = "@NotNull @Schema(name = \"className\", requiredMode = Schema.RequiredMode.REQUIRED) @JsonProperty(\"className\") public String getClassName() {"; - String jsonPropertyInGetColor = "@Schema(name = \"color\", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty(\"color\") public String getColor() {"; - assertFileContains(Paths.get(output.getAbsolutePath() + "/src/main/java/org/openapitools/model/Animal.java"), jsonPropertyInGetClassName, jsonPropertyInGetColor); + JavaFileAssert.assertThat(files.get("ResponseObjectWithDifferentFieldNames.java")) + .hasProperty("normalPropertyName") + .assertPropertyAnnotations() + .doesNotContainsWithName("JsonProperty") + .toProperty().toType() + .hasProperty("UPPER_CASE_PROPERTY_SNAKE") + .assertPropertyAnnotations() + .doesNotContainsWithName("JsonProperty") + .toProperty().toType() + .hasProperty("lowerCasePropertyDashes") + .assertPropertyAnnotations() + .doesNotContainsWithName("JsonProperty") + .toProperty().toType() + .hasProperty("propertyNameWithSpaces") + .assertPropertyAnnotations() + .doesNotContainsWithName("JsonProperty") + .toProperty().toType() + .assertMethod("getNormalPropertyName") + .assertMethodAnnotations() + .containsWithNameAndAttributes("JsonProperty", ImmutableMap.of("value", "\"normalPropertyName\"")) + .toMethod().toFileAssert() + .assertMethod("getUPPERCASEPROPERTYSNAKE") + .assertMethodAnnotations() + .containsWithNameAndAttributes("JsonProperty", ImmutableMap.of("value", "\"UPPER_CASE_PROPERTY_SNAKE\"")) + .toMethod().toFileAssert() + .assertMethod("getLowerCasePropertyDashes") + .assertMethodAnnotations() + .containsWithNameAndAttributes("JsonProperty", ImmutableMap.of("value", "\"lower-case-property-dashes\"")) + .toMethod().toFileAssert() + .assertMethod("getPropertyNameWithSpaces") + .assertMethodAnnotations() + .containsWithNameAndAttributes("JsonProperty", ImmutableMap.of("value", "\"property name with spaces\"")); } } diff --git a/modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml b/modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml index 7f51877150e3..27c97636a188 100644 --- a/modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml @@ -1091,6 +1091,26 @@ paths: - petstore_auth: - write:pets - read:pets + /fake/{petId}/response-object-different-names: + get: + tags: + - pet + operationId: responseObjectDifferentNames + parameters: + - name: petId + in: path + description: ID of pet to update + required: true + schema: + type: integer + format: int64 + responses: + 200: + description: successful operation + content: + application/json: + schema: + $ref: "#/components/schemas/ResponseObjectWithDifferentFieldNames" servers: - url: http://petstore.swagger.io:80/v2 components: @@ -2006,3 +2026,14 @@ components: items: type: string default: ["foo", "bar"] + ResponseObjectWithDifferentFieldNames: + type: object + properties: + normalPropertyName: + type: string + UPPER_CASE_PROPERTY_SNAKE: + type: string + lower-case-property-dashes: + type: string + property name with spaces: + type: string diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Pet.java index ce02f3c7d4e4..086df08a3ed0 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Pet.java +++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Pet.java @@ -28,20 +28,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private List photoUrls = new ArrayList<>(); - @JsonProperty("tags") @Valid private List<@Valid Tag> tags; @@ -82,7 +77,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; /** @@ -113,6 +107,7 @@ public Pet id(Long id) { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -132,6 +127,7 @@ public Pet category(Category category) { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("category") public Category getCategory() { return category; } @@ -151,6 +147,7 @@ public Pet name(String name) { */ @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") + @JsonProperty("name") public String getName() { return name; } @@ -178,6 +175,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; } @@ -205,6 +203,7 @@ public Pet addTagsItem(Tag tagsItem) { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -224,6 +223,7 @@ public Pet status(StatusEnum status) { */ @ApiModelProperty(value = "pet status in the store") + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java index ce02f3c7d4e4..086df08a3ed0 100644 --- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java +++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java @@ -28,20 +28,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private List photoUrls = new ArrayList<>(); - @JsonProperty("tags") @Valid private List<@Valid Tag> tags; @@ -82,7 +77,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; /** @@ -113,6 +107,7 @@ public Pet id(Long id) { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -132,6 +127,7 @@ public Pet category(Category category) { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("category") public Category getCategory() { return category; } @@ -151,6 +147,7 @@ public Pet name(String name) { */ @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") + @JsonProperty("name") public String getName() { return name; } @@ -178,6 +175,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; } @@ -205,6 +203,7 @@ public Pet addTagsItem(Tag tagsItem) { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -224,6 +223,7 @@ public Pet status(StatusEnum status) { */ @ApiModelProperty(value = "pet status in the store") + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/client/petstore/spring-http-interface-reactive/.openapi-generator/FILES b/samples/client/petstore/spring-http-interface-reactive/.openapi-generator/FILES index 8f0d232df2eb..4507343d0db6 100644 --- a/samples/client/petstore/spring-http-interface-reactive/.openapi-generator/FILES +++ b/samples/client/petstore/spring-http-interface-reactive/.openapi-generator/FILES @@ -50,6 +50,7 @@ src/main/java/org/openapitools/model/OuterComposite.java src/main/java/org/openapitools/model/OuterEnum.java src/main/java/org/openapitools/model/Pet.java src/main/java/org/openapitools/model/ReadOnlyFirst.java +src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java src/main/java/org/openapitools/model/SpecialModelName.java src/main/java/org/openapitools/model/Tag.java src/main/java/org/openapitools/model/TypeHolderDefault.java diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/PetApi.java index 9e4acf4039d4..86811e2f6b06 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/PetApi.java @@ -7,6 +7,7 @@ import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import org.openapitools.model.ResponseObjectWithDifferentFieldNames; import java.util.Set; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @@ -122,6 +123,22 @@ Mono> getPetById( ); + /** + * GET /fake/{petId}/response-object-different-names + * + * @param petId ID of pet to update (required) + * @return successful operation (status code 200) + */ + @HttpExchange( + method = "GET", + value = "/fake/{petId}/response-object-different-names", + accept = "application/json" + ) + Mono> responseObjectDifferentNames( + @PathVariable("petId") Long petId + ); + + /** * PUT /pet : Update an existing pet * diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 446381cac9d1..a70c6615754f 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -26,45 +26,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesClass { - @JsonProperty("map_string") private Map mapString = new HashMap<>(); - @JsonProperty("map_number") private Map mapNumber = new HashMap<>(); - @JsonProperty("map_integer") private Map mapInteger = new HashMap<>(); - @JsonProperty("map_boolean") private Map mapBoolean = new HashMap<>(); - @JsonProperty("map_array_integer") private Map> mapArrayInteger = new HashMap<>(); - @JsonProperty("map_array_anytype") private Map> mapArrayAnytype = new HashMap<>(); - @JsonProperty("map_map_string") private Map> mapMapString = new HashMap<>(); - @JsonProperty("map_map_anytype") private Map> mapMapAnytype = new HashMap<>(); - @JsonProperty("anytype_1") private Object anytype1; - @JsonProperty("anytype_2") private JsonNullable anytype2 = JsonNullable.undefined(); - @JsonProperty("anytype_3") private Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { @@ -85,6 +74,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt * @return mapString */ + @JsonProperty("map_string") public Map getMapString() { return mapString; } @@ -111,6 +101,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * @return mapNumber */ + @JsonProperty("map_number") public Map getMapNumber() { return mapNumber; } @@ -137,6 +128,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege * @return mapInteger */ + @JsonProperty("map_integer") public Map getMapInteger() { return mapInteger; } @@ -163,6 +155,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea * @return mapBoolean */ + @JsonProperty("map_boolean") public Map getMapBoolean() { return mapBoolean; } @@ -189,6 +182,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { return mapArrayInteger; } @@ -215,6 +209,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * @return mapArrayAnytype */ + @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { return mapArrayAnytype; } @@ -241,6 +236,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { return mapMapString; } @@ -267,6 +263,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { return mapMapAnytype; } @@ -285,6 +282,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) { * @return anytype1 */ + @JsonProperty("anytype_1") public Object getAnytype1() { return anytype1; } @@ -303,6 +301,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) { * @return anytype2 */ + @JsonProperty("anytype_2") public JsonNullable getAnytype2() { return anytype2; } @@ -321,6 +320,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) { * @return anytype3 */ + @JsonProperty("anytype_3") public Object getAnytype3() { return anytype3; } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java index 22b58754add7..00d8190f7d4e 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -24,19 +24,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ContainerDefaultValue { - @JsonProperty("nullable_array") private JsonNullable> nullableArray = JsonNullable.undefined(); - @JsonProperty("nullable_required_array") private JsonNullable> nullableRequiredArray = JsonNullable.undefined(); - @JsonProperty("required_array") private List requiredArray = new ArrayList<>(); - @JsonProperty("nullable_array_with_default") private JsonNullable> nullableArrayWithDefault = JsonNullable.undefined(); @@ -75,6 +71,7 @@ public ContainerDefaultValue addNullableArrayItem(String nullableArrayItem) { * @return nullableArray */ + @JsonProperty("nullable_array") public JsonNullable> getNullableArray() { return nullableArray; } @@ -101,6 +98,7 @@ public ContainerDefaultValue addNullableRequiredArrayItem(String nullableRequire * @return nullableRequiredArray */ @NotNull + @JsonProperty("nullable_required_array") public JsonNullable> getNullableRequiredArray() { return nullableRequiredArray; } @@ -127,6 +125,7 @@ public ContainerDefaultValue addRequiredArrayItem(String requiredArrayItem) { * @return requiredArray */ @NotNull + @JsonProperty("required_array") public List getRequiredArray() { return requiredArray; } @@ -153,6 +152,7 @@ public ContainerDefaultValue addNullableArrayWithDefaultItem(String nullableArra * @return nullableArrayWithDefault */ + @JsonProperty("nullable_array_with_default") public JsonNullable> getNullableArrayWithDefault() { return nullableArrayWithDefault; } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java new file mode 100644 index 000000000000..5d6f48d1f5fe --- /dev/null +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java @@ -0,0 +1,149 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import jakarta.validation.constraints.NotNull; + + +import java.util.*; +import jakarta.annotation.Generated; + +/** + * ResponseObjectWithDifferentFieldNames + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public class ResponseObjectWithDifferentFieldNames { + + private String normalPropertyName; + + private String UPPER_CASE_PROPERTY_SNAKE; + + private String lowerCasePropertyDashes; + + private String propertyNameWithSpaces; + + public ResponseObjectWithDifferentFieldNames normalPropertyName(String normalPropertyName) { + this.normalPropertyName = normalPropertyName; + return this; + } + + /** + * Get normalPropertyName + * @return normalPropertyName + */ + + @JsonProperty("normalPropertyName") + public String getNormalPropertyName() { + return normalPropertyName; + } + + public void setNormalPropertyName(String normalPropertyName) { + this.normalPropertyName = normalPropertyName; + } + + public ResponseObjectWithDifferentFieldNames UPPER_CASE_PROPERTY_SNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; + return this; + } + + /** + * Get UPPER_CASE_PROPERTY_SNAKE + * @return UPPER_CASE_PROPERTY_SNAKE + */ + + @JsonProperty("UPPER_CASE_PROPERTY_SNAKE") + public String getUPPERCASEPROPERTYSNAKE() { + return UPPER_CASE_PROPERTY_SNAKE; + } + + public void setUPPERCASEPROPERTYSNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; + } + + public ResponseObjectWithDifferentFieldNames lowerCasePropertyDashes(String lowerCasePropertyDashes) { + this.lowerCasePropertyDashes = lowerCasePropertyDashes; + return this; + } + + /** + * Get lowerCasePropertyDashes + * @return lowerCasePropertyDashes + */ + + @JsonProperty("lower-case-property-dashes") + public String getLowerCasePropertyDashes() { + return lowerCasePropertyDashes; + } + + public void setLowerCasePropertyDashes(String lowerCasePropertyDashes) { + this.lowerCasePropertyDashes = lowerCasePropertyDashes; + } + + public ResponseObjectWithDifferentFieldNames propertyNameWithSpaces(String propertyNameWithSpaces) { + this.propertyNameWithSpaces = propertyNameWithSpaces; + return this; + } + + /** + * Get propertyNameWithSpaces + * @return propertyNameWithSpaces + */ + + @JsonProperty("property name with spaces") + public String getPropertyNameWithSpaces() { + return propertyNameWithSpaces; + } + + public void setPropertyNameWithSpaces(String propertyNameWithSpaces) { + this.propertyNameWithSpaces = propertyNameWithSpaces; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ResponseObjectWithDifferentFieldNames responseObjectWithDifferentFieldNames = (ResponseObjectWithDifferentFieldNames) o; + return Objects.equals(this.normalPropertyName, responseObjectWithDifferentFieldNames.normalPropertyName) && + Objects.equals(this.UPPER_CASE_PROPERTY_SNAKE, responseObjectWithDifferentFieldNames.UPPER_CASE_PROPERTY_SNAKE) && + Objects.equals(this.lowerCasePropertyDashes, responseObjectWithDifferentFieldNames.lowerCasePropertyDashes) && + Objects.equals(this.propertyNameWithSpaces, responseObjectWithDifferentFieldNames.propertyNameWithSpaces); + } + + @Override + public int hashCode() { + return Objects.hash(normalPropertyName, UPPER_CASE_PROPERTY_SNAKE, lowerCasePropertyDashes, propertyNameWithSpaces); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ResponseObjectWithDifferentFieldNames {\n"); + sb.append(" normalPropertyName: ").append(toIndentedString(normalPropertyName)).append("\n"); + sb.append(" UPPER_CASE_PROPERTY_SNAKE: ").append(toIndentedString(UPPER_CASE_PROPERTY_SNAKE)).append("\n"); + sb.append(" lowerCasePropertyDashes: ").append(toIndentedString(lowerCasePropertyDashes)).append("\n"); + sb.append(" propertyNameWithSpaces: ").append(toIndentedString(propertyNameWithSpaces)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java index 799aa25fccd2..41daada064f2 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -22,19 +22,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderDefault { - @JsonProperty("string_item") private String stringItem = "what"; - @JsonProperty("number_item") private BigDecimal numberItem = new BigDecimal("1.234"); - @JsonProperty("integer_item") private Integer integerItem = -2; - @JsonProperty("bool_item") private Boolean boolItem = true; - @JsonProperty("array_item") private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); @@ -68,6 +63,7 @@ public TypeHolderDefault stringItem(String stringItem) { * @return stringItem */ @NotNull + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -86,6 +82,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) { * @return numberItem */ @NotNull + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -104,6 +101,7 @@ public TypeHolderDefault integerItem(Integer integerItem) { * @return integerItem */ @NotNull + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -122,6 +120,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) { * @return boolItem */ @NotNull + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -148,6 +147,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { * @return arrayItem */ @NotNull + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/client/petstore/spring-http-interface/.openapi-generator/FILES b/samples/client/petstore/spring-http-interface/.openapi-generator/FILES index 057a6b03c611..12b7506e6734 100644 --- a/samples/client/petstore/spring-http-interface/.openapi-generator/FILES +++ b/samples/client/petstore/spring-http-interface/.openapi-generator/FILES @@ -49,6 +49,7 @@ src/main/java/org/openapitools/model/OuterCompositeDto.java src/main/java/org/openapitools/model/OuterEnumDto.java src/main/java/org/openapitools/model/PetDto.java src/main/java/org/openapitools/model/ReadOnlyFirstDto.java +src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java src/main/java/org/openapitools/model/ReturnDto.java src/main/java/org/openapitools/model/SpecialModelNameDto.java src/main/java/org/openapitools/model/TagDto.java diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/PetApi.java index 4cdaa75682a2..a685526d90a3 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/PetApi.java @@ -7,6 +7,7 @@ import org.openapitools.model.ApiResponseDto; import org.openapitools.model.PetDto; +import org.openapitools.model.ResponseObjectWithDifferentFieldNamesDto; import java.util.Set; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @@ -118,6 +119,22 @@ ResponseEntity getPetById( ); + /** + * GET /fake/{petId}/response-object-different-names + * + * @param petId ID of pet to update (required) + * @return successful operation (status code 200) + */ + @HttpExchange( + method = "GET", + value = "/fake/{petId}/response-object-different-names", + accept = "application/json" + ) + ResponseEntity responseObjectDifferentNames( + @PathVariable("petId") Long petId + ); + + /** * PUT /pet : Update an existing pet * diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java index e2aa343d20f5..7267a4621a52 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java @@ -28,45 +28,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesClassDto { - @JsonProperty("map_string") private Map mapString = new HashMap<>(); - @JsonProperty("map_number") private Map mapNumber = new HashMap<>(); - @JsonProperty("map_integer") private Map mapInteger = new HashMap<>(); - @JsonProperty("map_boolean") private Map mapBoolean = new HashMap<>(); - @JsonProperty("map_array_integer") private Map> mapArrayInteger = new HashMap<>(); - @JsonProperty("map_array_anytype") private Map> mapArrayAnytype = new HashMap<>(); - @JsonProperty("map_map_string") private Map> mapMapString = new HashMap<>(); - @JsonProperty("map_map_anytype") private Map> mapMapAnytype = new HashMap<>(); - @JsonProperty("anytype_1") private Object anytype1; - @JsonProperty("anytype_2") private JsonNullable anytype2 = JsonNullable.undefined(); - @JsonProperty("anytype_3") private Object anytype3; public AdditionalPropertiesClassDto mapString(Map mapString) { @@ -87,6 +76,7 @@ public AdditionalPropertiesClassDto putMapStringItem(String key, String mapStrin * @return mapString */ + @JsonProperty("map_string") public Map getMapString() { return mapString; } @@ -113,6 +103,7 @@ public AdditionalPropertiesClassDto putMapNumberItem(String key, BigDecimal mapN * @return mapNumber */ + @JsonProperty("map_number") public Map getMapNumber() { return mapNumber; } @@ -139,6 +130,7 @@ public AdditionalPropertiesClassDto putMapIntegerItem(String key, Integer mapInt * @return mapInteger */ + @JsonProperty("map_integer") public Map getMapInteger() { return mapInteger; } @@ -165,6 +157,7 @@ public AdditionalPropertiesClassDto putMapBooleanItem(String key, Boolean mapBoo * @return mapBoolean */ + @JsonProperty("map_boolean") public Map getMapBoolean() { return mapBoolean; } @@ -191,6 +184,7 @@ public AdditionalPropertiesClassDto putMapArrayIntegerItem(String key, List> getMapArrayInteger() { return mapArrayInteger; } @@ -217,6 +211,7 @@ public AdditionalPropertiesClassDto putMapArrayAnytypeItem(String key, List> getMapArrayAnytype() { return mapArrayAnytype; } @@ -243,6 +238,7 @@ public AdditionalPropertiesClassDto putMapMapStringItem(String key, Map> getMapMapString() { return mapMapString; } @@ -269,6 +265,7 @@ public AdditionalPropertiesClassDto putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { return mapMapAnytype; } @@ -287,6 +284,7 @@ public AdditionalPropertiesClassDto anytype1(Object anytype1) { * @return anytype1 */ + @JsonProperty("anytype_1") public Object getAnytype1() { return anytype1; } @@ -305,6 +303,7 @@ public AdditionalPropertiesClassDto anytype2(Object anytype2) { * @return anytype2 */ + @JsonProperty("anytype_2") public JsonNullable getAnytype2() { return anytype2; } @@ -323,6 +322,7 @@ public AdditionalPropertiesClassDto anytype3(Object anytype3) { * @return anytype3 */ + @JsonProperty("anytype_3") public Object getAnytype3() { return anytype3; } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java index 9d13d762de9f..8e89bf7bcd48 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java @@ -26,19 +26,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ContainerDefaultValueDto { - @JsonProperty("nullable_array") private JsonNullable> nullableArray = JsonNullable.undefined(); - @JsonProperty("nullable_required_array") private JsonNullable> nullableRequiredArray = JsonNullable.undefined(); - @JsonProperty("required_array") private List requiredArray = new ArrayList<>(); - @JsonProperty("nullable_array_with_default") private JsonNullable> nullableArrayWithDefault = JsonNullable.undefined(); @@ -60,6 +56,7 @@ public ContainerDefaultValueDto addNullableArrayItem(String nullableArrayItem) { * @return nullableArray */ + @JsonProperty("nullable_array") public JsonNullable> getNullableArray() { return nullableArray; } @@ -86,6 +83,7 @@ public ContainerDefaultValueDto addNullableRequiredArrayItem(String nullableRequ * @return nullableRequiredArray */ @NotNull + @JsonProperty("nullable_required_array") public JsonNullable> getNullableRequiredArray() { return nullableRequiredArray; } @@ -112,6 +110,7 @@ public ContainerDefaultValueDto addRequiredArrayItem(String requiredArrayItem) { * @return requiredArray */ @NotNull + @JsonProperty("required_array") public List getRequiredArray() { return requiredArray; } @@ -138,6 +137,7 @@ public ContainerDefaultValueDto addNullableArrayWithDefaultItem(String nullableA * @return nullableArrayWithDefault */ + @JsonProperty("nullable_array_with_default") public JsonNullable> getNullableArrayWithDefault() { return nullableArrayWithDefault; } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java new file mode 100644 index 000000000000..550a49f8bf11 --- /dev/null +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java @@ -0,0 +1,151 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import jakarta.validation.constraints.NotNull; + + +import java.util.*; +import jakarta.annotation.Generated; + +/** + * ResponseObjectWithDifferentFieldNamesDto + */ + +@JsonTypeName("ResponseObjectWithDifferentFieldNames") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public class ResponseObjectWithDifferentFieldNamesDto { + + private String normalPropertyName; + + private String UPPER_CASE_PROPERTY_SNAKE; + + private String lowerCasePropertyDashes; + + private String propertyNameWithSpaces; + + public ResponseObjectWithDifferentFieldNamesDto normalPropertyName(String normalPropertyName) { + this.normalPropertyName = normalPropertyName; + return this; + } + + /** + * Get normalPropertyName + * @return normalPropertyName + */ + + @JsonProperty("normalPropertyName") + public String getNormalPropertyName() { + return normalPropertyName; + } + + public void setNormalPropertyName(String normalPropertyName) { + this.normalPropertyName = normalPropertyName; + } + + public ResponseObjectWithDifferentFieldNamesDto UPPER_CASE_PROPERTY_SNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; + return this; + } + + /** + * Get UPPER_CASE_PROPERTY_SNAKE + * @return UPPER_CASE_PROPERTY_SNAKE + */ + + @JsonProperty("UPPER_CASE_PROPERTY_SNAKE") + public String getUPPERCASEPROPERTYSNAKE() { + return UPPER_CASE_PROPERTY_SNAKE; + } + + public void setUPPERCASEPROPERTYSNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; + } + + public ResponseObjectWithDifferentFieldNamesDto lowerCasePropertyDashes(String lowerCasePropertyDashes) { + this.lowerCasePropertyDashes = lowerCasePropertyDashes; + return this; + } + + /** + * Get lowerCasePropertyDashes + * @return lowerCasePropertyDashes + */ + + @JsonProperty("lower-case-property-dashes") + public String getLowerCasePropertyDashes() { + return lowerCasePropertyDashes; + } + + public void setLowerCasePropertyDashes(String lowerCasePropertyDashes) { + this.lowerCasePropertyDashes = lowerCasePropertyDashes; + } + + public ResponseObjectWithDifferentFieldNamesDto propertyNameWithSpaces(String propertyNameWithSpaces) { + this.propertyNameWithSpaces = propertyNameWithSpaces; + return this; + } + + /** + * Get propertyNameWithSpaces + * @return propertyNameWithSpaces + */ + + @JsonProperty("property name with spaces") + public String getPropertyNameWithSpaces() { + return propertyNameWithSpaces; + } + + public void setPropertyNameWithSpaces(String propertyNameWithSpaces) { + this.propertyNameWithSpaces = propertyNameWithSpaces; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ResponseObjectWithDifferentFieldNamesDto responseObjectWithDifferentFieldNames = (ResponseObjectWithDifferentFieldNamesDto) o; + return Objects.equals(this.normalPropertyName, responseObjectWithDifferentFieldNames.normalPropertyName) && + Objects.equals(this.UPPER_CASE_PROPERTY_SNAKE, responseObjectWithDifferentFieldNames.UPPER_CASE_PROPERTY_SNAKE) && + Objects.equals(this.lowerCasePropertyDashes, responseObjectWithDifferentFieldNames.lowerCasePropertyDashes) && + Objects.equals(this.propertyNameWithSpaces, responseObjectWithDifferentFieldNames.propertyNameWithSpaces); + } + + @Override + public int hashCode() { + return Objects.hash(normalPropertyName, UPPER_CASE_PROPERTY_SNAKE, lowerCasePropertyDashes, propertyNameWithSpaces); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ResponseObjectWithDifferentFieldNamesDto {\n"); + sb.append(" normalPropertyName: ").append(toIndentedString(normalPropertyName)).append("\n"); + sb.append(" UPPER_CASE_PROPERTY_SNAKE: ").append(toIndentedString(UPPER_CASE_PROPERTY_SNAKE)).append("\n"); + sb.append(" lowerCasePropertyDashes: ").append(toIndentedString(lowerCasePropertyDashes)).append("\n"); + sb.append(" propertyNameWithSpaces: ").append(toIndentedString(propertyNameWithSpaces)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + 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 989330c9165b..2b6d79d2e11d 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 @@ -24,19 +24,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderDefaultDto { - @JsonProperty("string_item") private String stringItem = "what"; - @JsonProperty("number_item") private BigDecimal numberItem = new BigDecimal("1.234"); - @JsonProperty("integer_item") private Integer integerItem = -2; - @JsonProperty("bool_item") private Boolean boolItem = true; - @JsonProperty("array_item") private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); @@ -50,6 +45,7 @@ public TypeHolderDefaultDto stringItem(String stringItem) { * @return stringItem */ @NotNull + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -68,6 +64,7 @@ public TypeHolderDefaultDto numberItem(BigDecimal numberItem) { * @return numberItem */ @NotNull + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -86,6 +83,7 @@ public TypeHolderDefaultDto integerItem(Integer integerItem) { * @return integerItem */ @NotNull + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -104,6 +102,7 @@ public TypeHolderDefaultDto boolItem(Boolean boolItem) { * @return boolItem */ @NotNull + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -130,6 +129,7 @@ public TypeHolderDefaultDto addArrayItemItem(Integer arrayItemItem) { * @return arrayItem */ @NotNull + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Pet.java index f18b714d61ce..52bb7a983b17 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Pet.java @@ -27,20 +27,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private List photoUrls = new ArrayList<>(); - @JsonProperty("tags") @Valid private List<@Valid Tag> tags; @@ -81,7 +76,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; /** @@ -112,6 +106,7 @@ public Pet id(Long id) { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -131,6 +126,7 @@ public Pet category(Category category) { */ @Valid @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("category") public Category getCategory() { return category; } @@ -150,6 +146,7 @@ public Pet name(String name) { */ @NotNull @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("name") public String getName() { return name; } @@ -177,6 +174,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { */ @NotNull @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; } @@ -204,6 +202,7 @@ public Pet addTagsItem(Tag tagsItem) { */ @Valid @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -223,6 +222,7 @@ public Pet status(StatusEnum status) { */ @Schema(name = "status", description = "pet status in the store", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java index fdb5e59cd6bc..7ed29b5a5c00 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java @@ -27,20 +27,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private List photoUrls = new ArrayList<>(); - @JsonProperty("tags") @Valid private List<@Valid Tag> tags; @@ -81,7 +76,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; /** @@ -112,6 +106,7 @@ public Pet id(Long id) { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -131,6 +126,7 @@ public Pet category(Category category) { */ @Valid @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("category") public Category getCategory() { return category; } @@ -150,6 +146,7 @@ public Pet name(String name) { */ @NotNull @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("name") public String getName() { return name; } @@ -177,6 +174,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { */ @NotNull @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; } @@ -204,6 +202,7 @@ public Pet addTagsItem(Tag tagsItem) { */ @Valid @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -223,6 +222,7 @@ public Pet status(StatusEnum status) { */ @Schema(name = "status", description = "pet status in the store", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/.openapi-generator/FILES b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/.openapi-generator/FILES index bdc0d268f433..5ebc7f2a19f2 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/.openapi-generator/FILES +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/.openapi-generator/FILES @@ -49,6 +49,7 @@ src/main/java/org/openapitools/model/OuterComposite.java src/main/java/org/openapitools/model/OuterEnum.java src/main/java/org/openapitools/model/Pet.java src/main/java/org/openapitools/model/ReadOnlyFirst.java +src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java src/main/java/org/openapitools/model/SpecialModelName.java src/main/java/org/openapitools/model/Tag.java src/main/java/org/openapitools/model/TypeHolderDefault.java 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 52b514af35a7..d093b19bbcb1 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,6 +7,7 @@ import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import org.openapitools.model.ResponseObjectWithDifferentFieldNames; import java.util.Set; import io.swagger.v3.oas.annotations.ExternalDocumentation; import io.swagger.v3.oas.annotations.Operation; @@ -208,6 +209,31 @@ ResponseEntity getPetById( ); + /** + * GET /fake/{petId}/response-object-different-names + * + * @param petId ID of pet to update (required) + * @return successful operation (status code 200) + */ + @Operation( + operationId = "responseObjectDifferentNames", + tags = { "pet" }, + responses = { + @ApiResponse(responseCode = "200", description = "successful operation", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = ResponseObjectWithDifferentFieldNames.class)) + }) + } + ) + @RequestMapping( + method = RequestMethod.GET, + value = "/fake/{petId}/response-object-different-names", + produces = "application/json" + ) + ResponseEntity responseObjectDifferentNames( + @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId + ); + + /** * PUT /pet : Update an existing pet * diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 66e0aed61c6c..eff5bd5fa4b1 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -28,45 +28,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesClass { - @JsonProperty("map_string") @Valid private Map mapString = new HashMap<>(); - @JsonProperty("map_number") @Valid private Map mapNumber = new HashMap<>(); - @JsonProperty("map_integer") @Valid private Map mapInteger = new HashMap<>(); - @JsonProperty("map_boolean") @Valid private Map mapBoolean = new HashMap<>(); - @JsonProperty("map_array_integer") @Valid private Map> mapArrayInteger = new HashMap<>(); - @JsonProperty("map_array_anytype") @Valid private Map> mapArrayAnytype = new HashMap<>(); - @JsonProperty("map_map_string") @Valid private Map> mapMapString = new HashMap<>(); - @JsonProperty("map_map_anytype") @Valid private Map> mapMapAnytype = new HashMap<>(); - @JsonProperty("anytype_1") private Object anytype1; - @JsonProperty("anytype_2") private JsonNullable anytype2 = JsonNullable.undefined(); - @JsonProperty("anytype_3") private Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { @@ -88,6 +77,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt */ @Schema(name = "map_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_string") public Map getMapString() { return mapString; } @@ -115,6 +105,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb */ @Valid @Schema(name = "map_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_number") public Map getMapNumber() { return mapNumber; } @@ -142,6 +133,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege */ @Schema(name = "map_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_integer") public Map getMapInteger() { return mapInteger; } @@ -169,6 +161,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea */ @Schema(name = "map_boolean", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_boolean") public Map getMapBoolean() { return mapBoolean; } @@ -196,6 +189,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { return mapArrayInteger; } @@ -223,6 +217,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List */ @Valid @Schema(name = "map_array_anytype", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { return mapArrayAnytype; } @@ -250,6 +245,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { return mapMapString; } @@ -277,6 +273,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { return mapMapAnytype; } @@ -296,6 +293,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) { */ @Schema(name = "anytype_1", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("anytype_1") public Object getAnytype1() { return anytype1; } @@ -315,6 +313,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) { */ @Schema(name = "anytype_2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("anytype_2") public JsonNullable getAnytype2() { return anytype2; } @@ -334,6 +333,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) { */ @Schema(name = "anytype_3", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("anytype_3") public Object getAnytype3() { return anytype3; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ContainerDefaultValue.java index ae4b8d558cad..6c5b41d66d4c 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -26,19 +26,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ContainerDefaultValue { - @JsonProperty("nullable_array") @Valid private JsonNullable> nullableArray = JsonNullable.undefined(); - @JsonProperty("nullable_required_array") @Valid private JsonNullable> nullableRequiredArray = JsonNullable.undefined(); - @JsonProperty("required_array") @Valid private List requiredArray = new ArrayList<>(); - @JsonProperty("nullable_array_with_default") @Valid private JsonNullable> nullableArrayWithDefault = JsonNullable.undefined(); @@ -61,6 +57,7 @@ public ContainerDefaultValue addNullableArrayItem(String nullableArrayItem) { */ @Schema(name = "nullable_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("nullable_array") public JsonNullable> getNullableArray() { return nullableArray; } @@ -88,6 +85,7 @@ public ContainerDefaultValue addNullableRequiredArrayItem(String nullableRequire */ @NotNull @Schema(name = "nullable_required_array", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("nullable_required_array") public JsonNullable> getNullableRequiredArray() { return nullableRequiredArray; } @@ -115,6 +113,7 @@ public ContainerDefaultValue addRequiredArrayItem(String requiredArrayItem) { */ @NotNull @Schema(name = "required_array", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("required_array") public List getRequiredArray() { return requiredArray; } @@ -142,6 +141,7 @@ public ContainerDefaultValue addNullableArrayWithDefaultItem(String nullableArra */ @Schema(name = "nullable_array_with_default", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("nullable_array_with_default") public JsonNullable> getNullableArrayWithDefault() { return nullableArrayWithDefault; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FileSchemaTestClass.java index dae9b27f93aa..be6e37a7aba9 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -24,10 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FileSchemaTestClass { - @JsonProperty("file") private File file; - @JsonProperty("files") @Valid private List<@Valid File> files; @@ -42,6 +40,7 @@ public FileSchemaTestClass file(File file) { */ @Valid @Schema(name = "file", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("file") public File getFile() { return file; } @@ -69,6 +68,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) { */ @Valid @Schema(name = "files", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("files") public List<@Valid File> getFiles() { return files; } 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 fbbb929632cb..b313f7bb7e23 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 @@ -29,20 +29,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private Set photoUrls = new LinkedHashSet<>(); - @JsonProperty("tags") @Valid private List<@Valid Tag> tags; @@ -83,7 +78,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; public Pet id(Long id) { @@ -97,6 +91,7 @@ public Pet id(Long id) { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -116,6 +111,7 @@ public Pet category(Category category) { */ @Valid @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("category") public Category getCategory() { return category; } @@ -135,6 +131,7 @@ public Pet name(String name) { */ @NotNull @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("name") public String getName() { return name; } @@ -162,6 +159,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { */ @NotNull @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("photoUrls") public Set getPhotoUrls() { return photoUrls; } @@ -190,6 +188,7 @@ public Pet addTagsItem(Tag tagsItem) { */ @Valid @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -209,6 +208,7 @@ public Pet status(StatusEnum status) { */ @Schema(name = "status", description = "pet status in the store", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java new file mode 100644 index 000000000000..c681122f5f86 --- /dev/null +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java @@ -0,0 +1,155 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; +import io.swagger.v3.oas.annotations.media.Schema; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * ResponseObjectWithDifferentFieldNames + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public class ResponseObjectWithDifferentFieldNames { + + private String normalPropertyName; + + private String UPPER_CASE_PROPERTY_SNAKE; + + private String lowerCasePropertyDashes; + + private String propertyNameWithSpaces; + + public ResponseObjectWithDifferentFieldNames normalPropertyName(String normalPropertyName) { + this.normalPropertyName = normalPropertyName; + return this; + } + + /** + * Get normalPropertyName + * @return normalPropertyName + */ + + @Schema(name = "normalPropertyName", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("normalPropertyName") + public String getNormalPropertyName() { + return normalPropertyName; + } + + public void setNormalPropertyName(String normalPropertyName) { + this.normalPropertyName = normalPropertyName; + } + + public ResponseObjectWithDifferentFieldNames UPPER_CASE_PROPERTY_SNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; + return this; + } + + /** + * Get UPPER_CASE_PROPERTY_SNAKE + * @return UPPER_CASE_PROPERTY_SNAKE + */ + + @Schema(name = "UPPER_CASE_PROPERTY_SNAKE", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("UPPER_CASE_PROPERTY_SNAKE") + public String getUPPERCASEPROPERTYSNAKE() { + return UPPER_CASE_PROPERTY_SNAKE; + } + + public void setUPPERCASEPROPERTYSNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; + } + + public ResponseObjectWithDifferentFieldNames lowerCasePropertyDashes(String lowerCasePropertyDashes) { + this.lowerCasePropertyDashes = lowerCasePropertyDashes; + return this; + } + + /** + * Get lowerCasePropertyDashes + * @return lowerCasePropertyDashes + */ + + @Schema(name = "lower-case-property-dashes", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("lower-case-property-dashes") + public String getLowerCasePropertyDashes() { + return lowerCasePropertyDashes; + } + + public void setLowerCasePropertyDashes(String lowerCasePropertyDashes) { + this.lowerCasePropertyDashes = lowerCasePropertyDashes; + } + + public ResponseObjectWithDifferentFieldNames propertyNameWithSpaces(String propertyNameWithSpaces) { + this.propertyNameWithSpaces = propertyNameWithSpaces; + return this; + } + + /** + * Get propertyNameWithSpaces + * @return propertyNameWithSpaces + */ + + @Schema(name = "property name with spaces", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("property name with spaces") + public String getPropertyNameWithSpaces() { + return propertyNameWithSpaces; + } + + public void setPropertyNameWithSpaces(String propertyNameWithSpaces) { + this.propertyNameWithSpaces = propertyNameWithSpaces; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ResponseObjectWithDifferentFieldNames responseObjectWithDifferentFieldNames = (ResponseObjectWithDifferentFieldNames) o; + return Objects.equals(this.normalPropertyName, responseObjectWithDifferentFieldNames.normalPropertyName) && + Objects.equals(this.UPPER_CASE_PROPERTY_SNAKE, responseObjectWithDifferentFieldNames.UPPER_CASE_PROPERTY_SNAKE) && + Objects.equals(this.lowerCasePropertyDashes, responseObjectWithDifferentFieldNames.lowerCasePropertyDashes) && + Objects.equals(this.propertyNameWithSpaces, responseObjectWithDifferentFieldNames.propertyNameWithSpaces); + } + + @Override + public int hashCode() { + return Objects.hash(normalPropertyName, UPPER_CASE_PROPERTY_SNAKE, lowerCasePropertyDashes, propertyNameWithSpaces); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ResponseObjectWithDifferentFieldNames {\n"); + sb.append(" normalPropertyName: ").append(toIndentedString(normalPropertyName)).append("\n"); + sb.append(" UPPER_CASE_PROPERTY_SNAKE: ").append(toIndentedString(UPPER_CASE_PROPERTY_SNAKE)).append("\n"); + sb.append(" lowerCasePropertyDashes: ").append(toIndentedString(lowerCasePropertyDashes)).append("\n"); + sb.append(" propertyNameWithSpaces: ").append(toIndentedString(propertyNameWithSpaces)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + 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 76919cfbaaf3..eda3e4f43d34 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 @@ -24,19 +24,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderDefault { - @JsonProperty("string_item") private String stringItem = "what"; - @JsonProperty("number_item") private BigDecimal numberItem = new BigDecimal("1.234"); - @JsonProperty("integer_item") private Integer integerItem = -2; - @JsonProperty("bool_item") private Boolean boolItem = true; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); @@ -51,6 +46,7 @@ public TypeHolderDefault stringItem(String stringItem) { */ @NotNull @Schema(name = "string_item", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -70,6 +66,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) { */ @NotNull @Valid @Schema(name = "number_item", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -89,6 +86,7 @@ public TypeHolderDefault integerItem(Integer integerItem) { */ @NotNull @Schema(name = "integer_item", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -108,6 +106,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) { */ @NotNull @Schema(name = "bool_item", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -135,6 +134,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { */ @NotNull @Schema(name = "array_item", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } 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 6bcf2fdb5efc..fe3412f33587 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 @@ -24,22 +24,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderExample { - @JsonProperty("string_item") private String stringItem; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("float_item") private Float floatItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -54,6 +48,7 @@ public TypeHolderExample stringItem(String stringItem) { */ @NotNull @Schema(name = "string_item", example = "what", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -73,6 +68,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { */ @NotNull @Valid @Schema(name = "number_item", example = "1.234", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -92,6 +88,7 @@ public TypeHolderExample floatItem(Float floatItem) { */ @NotNull @Schema(name = "float_item", example = "1.234", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("float_item") public Float getFloatItem() { return floatItem; } @@ -111,6 +108,7 @@ public TypeHolderExample integerItem(Integer integerItem) { */ @NotNull @Schema(name = "integer_item", example = "-2", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -130,6 +128,7 @@ public TypeHolderExample boolItem(Boolean boolItem) { */ @NotNull @Schema(name = "bool_item", example = "true", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -157,6 +156,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { */ @NotNull @Schema(name = "array_item", example = "[0,1,2,3]", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java index fdb5e59cd6bc..7ed29b5a5c00 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java @@ -27,20 +27,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private List photoUrls = new ArrayList<>(); - @JsonProperty("tags") @Valid private List<@Valid Tag> tags; @@ -81,7 +76,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; /** @@ -112,6 +106,7 @@ public Pet id(Long id) { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -131,6 +126,7 @@ public Pet category(Category category) { */ @Valid @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("category") public Category getCategory() { return category; } @@ -150,6 +146,7 @@ public Pet name(String name) { */ @NotNull @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("name") public String getName() { return name; } @@ -177,6 +174,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { */ @NotNull @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; } @@ -204,6 +202,7 @@ public Pet addTagsItem(Tag tagsItem) { */ @Valid @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -223,6 +222,7 @@ public Pet status(StatusEnum status) { */ @Schema(name = "status", description = "pet status in the store", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java index fdb5e59cd6bc..7ed29b5a5c00 100644 --- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java @@ -27,20 +27,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private List photoUrls = new ArrayList<>(); - @JsonProperty("tags") @Valid private List<@Valid Tag> tags; @@ -81,7 +76,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; /** @@ -112,6 +106,7 @@ public Pet id(Long id) { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -131,6 +126,7 @@ public Pet category(Category category) { */ @Valid @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("category") public Category getCategory() { return category; } @@ -150,6 +146,7 @@ public Pet name(String name) { */ @NotNull @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("name") public String getName() { return name; } @@ -177,6 +174,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { */ @NotNull @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; } @@ -204,6 +202,7 @@ public Pet addTagsItem(Tag tagsItem) { */ @Valid @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -223,6 +222,7 @@ public Pet status(StatusEnum status) { */ @Schema(name = "status", description = "pet status in the store", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Pet.java index fdb5e59cd6bc..7ed29b5a5c00 100644 --- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Pet.java @@ -27,20 +27,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private List photoUrls = new ArrayList<>(); - @JsonProperty("tags") @Valid private List<@Valid Tag> tags; @@ -81,7 +76,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; /** @@ -112,6 +106,7 @@ public Pet id(Long id) { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -131,6 +126,7 @@ public Pet category(Category category) { */ @Valid @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("category") public Category getCategory() { return category; } @@ -150,6 +146,7 @@ public Pet name(String name) { */ @NotNull @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("name") public String getName() { return name; } @@ -177,6 +174,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { */ @NotNull @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; } @@ -204,6 +202,7 @@ public Pet addTagsItem(Tag tagsItem) { */ @Valid @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -223,6 +222,7 @@ public Pet status(StatusEnum status) { */ @Schema(name = "status", description = "pet status in the store", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java index fdb5e59cd6bc..7ed29b5a5c00 100644 --- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java @@ -27,20 +27,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private List photoUrls = new ArrayList<>(); - @JsonProperty("tags") @Valid private List<@Valid Tag> tags; @@ -81,7 +76,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; /** @@ -112,6 +106,7 @@ public Pet id(Long id) { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -131,6 +126,7 @@ public Pet category(Category category) { */ @Valid @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("category") public Category getCategory() { return category; } @@ -150,6 +146,7 @@ public Pet name(String name) { */ @NotNull @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("name") public String getName() { return name; } @@ -177,6 +174,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { */ @NotNull @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; } @@ -204,6 +202,7 @@ public Pet addTagsItem(Tag tagsItem) { */ @Valid @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -223,6 +222,7 @@ public Pet status(StatusEnum status) { */ @Schema(name = "status", description = "pet status in the store", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Pet.java index fdb5e59cd6bc..7ed29b5a5c00 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Pet.java @@ -27,20 +27,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private List photoUrls = new ArrayList<>(); - @JsonProperty("tags") @Valid private List<@Valid Tag> tags; @@ -81,7 +76,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; /** @@ -112,6 +106,7 @@ public Pet id(Long id) { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -131,6 +126,7 @@ public Pet category(Category category) { */ @Valid @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("category") public Category getCategory() { return category; } @@ -150,6 +146,7 @@ public Pet name(String name) { */ @NotNull @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("name") public String getName() { return name; } @@ -177,6 +174,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { */ @NotNull @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; } @@ -204,6 +202,7 @@ public Pet addTagsItem(Tag tagsItem) { */ @Valid @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -223,6 +222,7 @@ public Pet status(StatusEnum status) { */ @Schema(name = "status", description = "pet status in the store", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Pet.java index f18b714d61ce..52bb7a983b17 100644 --- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Pet.java @@ -27,20 +27,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private List photoUrls = new ArrayList<>(); - @JsonProperty("tags") @Valid private List<@Valid Tag> tags; @@ -81,7 +76,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; /** @@ -112,6 +106,7 @@ public Pet id(Long id) { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -131,6 +126,7 @@ public Pet category(Category category) { */ @Valid @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("category") public Category getCategory() { return category; } @@ -150,6 +146,7 @@ public Pet name(String name) { */ @NotNull @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("name") public String getName() { return name; } @@ -177,6 +174,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { */ @NotNull @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; } @@ -204,6 +202,7 @@ public Pet addTagsItem(Tag tagsItem) { */ @Valid @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -223,6 +222,7 @@ public Pet status(StatusEnum status) { */ @Schema(name = "status", description = "pet status in the store", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/.openapi-generator-ignore b/samples/openapi3/server/petstore/springboot-delegate/.openapi-generator-ignore index 7484ee590a38..b7d19e03b54a 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/.openapi-generator-ignore +++ b/samples/openapi3/server/petstore/springboot-delegate/.openapi-generator-ignore @@ -21,3 +21,5 @@ #docs/*.md # Then explicitly reverse the ignore rule for a single file: #!docs/README.md + +src/test/java/org/openapitools/ResponseObjectWithDifferentFieldNamesJsonSerializationTest.java \ No newline at end of file diff --git a/samples/openapi3/server/petstore/springboot-delegate/.openapi-generator/FILES b/samples/openapi3/server/petstore/springboot-delegate/.openapi-generator/FILES index 16d8f2a63237..50815c779dc5 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/.openapi-generator/FILES +++ b/samples/openapi3/server/petstore/springboot-delegate/.openapi-generator/FILES @@ -67,6 +67,7 @@ src/main/java/org/openapitools/model/OuterComposite.java src/main/java/org/openapitools/model/OuterEnum.java src/main/java/org/openapitools/model/Pet.java src/main/java/org/openapitools/model/ReadOnlyFirst.java +src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java src/main/java/org/openapitools/model/SpecialModelName.java src/main/java/org/openapitools/model/Tag.java src/main/java/org/openapitools/model/TypeHolderDefault.java 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 d047a0540c67..9f2e5b2da3e4 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,6 +14,7 @@ import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ResponseObjectWithDifferentFieldNames; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import io.swagger.v3.oas.annotations.ExternalDocumentation; @@ -195,6 +196,33 @@ default ResponseEntity fakeOuterStringSerialize( } + /** + * GET /fake/{petId}/response-object-different-names + * + * @param petId ID of pet to update (required) + * @return successful operation (status code 200) + */ + @Operation( + operationId = "responseObjectDifferentNames", + tags = { "pet" }, + responses = { + @ApiResponse(responseCode = "200", description = "successful operation", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = ResponseObjectWithDifferentFieldNames.class)) + }) + } + ) + @RequestMapping( + method = RequestMethod.GET, + value = "/fake/{petId}/response-object-different-names", + produces = { "application/json" } + ) + default ResponseEntity responseObjectDifferentNames( + @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId + ) { + return getDelegate().responseObjectDifferentNames(petId); + } + + /** * PUT /fake/body-with-file-schema * For this test, the body for this request much reference a schema named `File`. diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java index 726b17779f18..b88f61719554 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java @@ -9,6 +9,7 @@ import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ResponseObjectWithDifferentFieldNames; import org.openapitools.model.User; import org.openapitools.model.XmlItem; 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 d1a650378e63..65ea3c13eae9 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,6 +9,7 @@ import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ResponseObjectWithDifferentFieldNames; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import org.springframework.http.HttpStatus; @@ -107,6 +108,27 @@ default ResponseEntity fakeOuterStringSerialize(String body) { } + /** + * GET /fake/{petId}/response-object-different-names + * + * @param petId ID of pet to update (required) + * @return successful operation (status code 200) + * @see FakeApi#responseObjectDifferentNames + */ + default ResponseEntity responseObjectDifferentNames(Long petId) { + getRequest().ifPresent(request -> { + for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { + if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { + String exampleString = "{ \"UPPER_CASE_PROPERTY_SNAKE\" : \"UPPER_CASE_PROPERTY_SNAKE\", \"lower-case-property-dashes\" : \"lower-case-property-dashes\", \"property name with spaces\" : \"property name with spaces\", \"normalPropertyName\" : \"normalPropertyName\" }"; + ApiUtil.setExampleResponse(request, "application/json", exampleString); + break; + } + } + }); + return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); + + } + /** * PUT /fake/body-with-file-schema * For this test, the body for this request much reference a schema named `File`. diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 66e0aed61c6c..eff5bd5fa4b1 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -28,45 +28,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesClass { - @JsonProperty("map_string") @Valid private Map mapString = new HashMap<>(); - @JsonProperty("map_number") @Valid private Map mapNumber = new HashMap<>(); - @JsonProperty("map_integer") @Valid private Map mapInteger = new HashMap<>(); - @JsonProperty("map_boolean") @Valid private Map mapBoolean = new HashMap<>(); - @JsonProperty("map_array_integer") @Valid private Map> mapArrayInteger = new HashMap<>(); - @JsonProperty("map_array_anytype") @Valid private Map> mapArrayAnytype = new HashMap<>(); - @JsonProperty("map_map_string") @Valid private Map> mapMapString = new HashMap<>(); - @JsonProperty("map_map_anytype") @Valid private Map> mapMapAnytype = new HashMap<>(); - @JsonProperty("anytype_1") private Object anytype1; - @JsonProperty("anytype_2") private JsonNullable anytype2 = JsonNullable.undefined(); - @JsonProperty("anytype_3") private Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { @@ -88,6 +77,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt */ @Schema(name = "map_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_string") public Map getMapString() { return mapString; } @@ -115,6 +105,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb */ @Valid @Schema(name = "map_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_number") public Map getMapNumber() { return mapNumber; } @@ -142,6 +133,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege */ @Schema(name = "map_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_integer") public Map getMapInteger() { return mapInteger; } @@ -169,6 +161,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea */ @Schema(name = "map_boolean", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_boolean") public Map getMapBoolean() { return mapBoolean; } @@ -196,6 +189,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { return mapArrayInteger; } @@ -223,6 +217,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List */ @Valid @Schema(name = "map_array_anytype", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { return mapArrayAnytype; } @@ -250,6 +245,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { return mapMapString; } @@ -277,6 +273,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { return mapMapAnytype; } @@ -296,6 +293,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) { */ @Schema(name = "anytype_1", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("anytype_1") public Object getAnytype1() { return anytype1; } @@ -315,6 +313,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) { */ @Schema(name = "anytype_2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("anytype_2") public JsonNullable getAnytype2() { return anytype2; } @@ -334,6 +333,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) { */ @Schema(name = "anytype_3", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("anytype_3") public Object getAnytype3() { return anytype3; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java index 55d205398170..ebcd1eede94e 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -26,19 +26,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ContainerDefaultValue { - @JsonProperty("nullable_array") @Valid private JsonNullable> nullableArray = JsonNullable.undefined(); - @JsonProperty("nullable_required_array") @Valid private JsonNullable> nullableRequiredArray = JsonNullable.undefined(); - @JsonProperty("required_array") @Valid private List requiredArray = new ArrayList<>(); - @JsonProperty("nullable_array_with_default") @Valid private JsonNullable> nullableArrayWithDefault = JsonNullable.undefined(); @@ -78,6 +74,7 @@ public ContainerDefaultValue addNullableArrayItem(String nullableArrayItem) { */ @Schema(name = "nullable_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("nullable_array") public JsonNullable> getNullableArray() { return nullableArray; } @@ -105,6 +102,7 @@ public ContainerDefaultValue addNullableRequiredArrayItem(String nullableRequire */ @NotNull @Schema(name = "nullable_required_array", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("nullable_required_array") public JsonNullable> getNullableRequiredArray() { return nullableRequiredArray; } @@ -132,6 +130,7 @@ public ContainerDefaultValue addRequiredArrayItem(String requiredArrayItem) { */ @NotNull @Schema(name = "required_array", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("required_array") public List getRequiredArray() { return requiredArray; } @@ -159,6 +158,7 @@ public ContainerDefaultValue addNullableArrayWithDefaultItem(String nullableArra */ @Schema(name = "nullable_array_with_default", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("nullable_array_with_default") public JsonNullable> getNullableArrayWithDefault() { return nullableArrayWithDefault; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java index dae9b27f93aa..be6e37a7aba9 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -24,10 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FileSchemaTestClass { - @JsonProperty("file") private File file; - @JsonProperty("files") @Valid private List<@Valid File> files; @@ -42,6 +40,7 @@ public FileSchemaTestClass file(File file) { */ @Valid @Schema(name = "file", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("file") public File getFile() { return file; } @@ -69,6 +68,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) { */ @Valid @Schema(name = "files", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("files") public List<@Valid File> getFiles() { return files; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java index ba99ad030276..0e76707f06f6 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java @@ -29,20 +29,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private Set photoUrls = new LinkedHashSet<>(); - @JsonProperty("tags") @Valid private List<@Valid Tag> tags; @@ -83,7 +78,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; /** @@ -114,6 +108,7 @@ public Pet id(Long id) { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -133,6 +128,7 @@ public Pet category(Category category) { */ @Valid @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("category") public Category getCategory() { return category; } @@ -152,6 +148,7 @@ public Pet name(String name) { */ @NotNull @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("name") public String getName() { return name; } @@ -179,6 +176,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { */ @NotNull @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("photoUrls") public Set getPhotoUrls() { return photoUrls; } @@ -207,6 +205,7 @@ public Pet addTagsItem(Tag tagsItem) { */ @Valid @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -226,6 +225,7 @@ public Pet status(StatusEnum status) { */ @Schema(name = "status", description = "pet status in the store", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java new file mode 100644 index 000000000000..c681122f5f86 --- /dev/null +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java @@ -0,0 +1,155 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; +import io.swagger.v3.oas.annotations.media.Schema; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * ResponseObjectWithDifferentFieldNames + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public class ResponseObjectWithDifferentFieldNames { + + private String normalPropertyName; + + private String UPPER_CASE_PROPERTY_SNAKE; + + private String lowerCasePropertyDashes; + + private String propertyNameWithSpaces; + + public ResponseObjectWithDifferentFieldNames normalPropertyName(String normalPropertyName) { + this.normalPropertyName = normalPropertyName; + return this; + } + + /** + * Get normalPropertyName + * @return normalPropertyName + */ + + @Schema(name = "normalPropertyName", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("normalPropertyName") + public String getNormalPropertyName() { + return normalPropertyName; + } + + public void setNormalPropertyName(String normalPropertyName) { + this.normalPropertyName = normalPropertyName; + } + + public ResponseObjectWithDifferentFieldNames UPPER_CASE_PROPERTY_SNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; + return this; + } + + /** + * Get UPPER_CASE_PROPERTY_SNAKE + * @return UPPER_CASE_PROPERTY_SNAKE + */ + + @Schema(name = "UPPER_CASE_PROPERTY_SNAKE", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("UPPER_CASE_PROPERTY_SNAKE") + public String getUPPERCASEPROPERTYSNAKE() { + return UPPER_CASE_PROPERTY_SNAKE; + } + + public void setUPPERCASEPROPERTYSNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; + } + + public ResponseObjectWithDifferentFieldNames lowerCasePropertyDashes(String lowerCasePropertyDashes) { + this.lowerCasePropertyDashes = lowerCasePropertyDashes; + return this; + } + + /** + * Get lowerCasePropertyDashes + * @return lowerCasePropertyDashes + */ + + @Schema(name = "lower-case-property-dashes", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("lower-case-property-dashes") + public String getLowerCasePropertyDashes() { + return lowerCasePropertyDashes; + } + + public void setLowerCasePropertyDashes(String lowerCasePropertyDashes) { + this.lowerCasePropertyDashes = lowerCasePropertyDashes; + } + + public ResponseObjectWithDifferentFieldNames propertyNameWithSpaces(String propertyNameWithSpaces) { + this.propertyNameWithSpaces = propertyNameWithSpaces; + return this; + } + + /** + * Get propertyNameWithSpaces + * @return propertyNameWithSpaces + */ + + @Schema(name = "property name with spaces", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("property name with spaces") + public String getPropertyNameWithSpaces() { + return propertyNameWithSpaces; + } + + public void setPropertyNameWithSpaces(String propertyNameWithSpaces) { + this.propertyNameWithSpaces = propertyNameWithSpaces; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ResponseObjectWithDifferentFieldNames responseObjectWithDifferentFieldNames = (ResponseObjectWithDifferentFieldNames) o; + return Objects.equals(this.normalPropertyName, responseObjectWithDifferentFieldNames.normalPropertyName) && + Objects.equals(this.UPPER_CASE_PROPERTY_SNAKE, responseObjectWithDifferentFieldNames.UPPER_CASE_PROPERTY_SNAKE) && + Objects.equals(this.lowerCasePropertyDashes, responseObjectWithDifferentFieldNames.lowerCasePropertyDashes) && + Objects.equals(this.propertyNameWithSpaces, responseObjectWithDifferentFieldNames.propertyNameWithSpaces); + } + + @Override + public int hashCode() { + return Objects.hash(normalPropertyName, UPPER_CASE_PROPERTY_SNAKE, lowerCasePropertyDashes, propertyNameWithSpaces); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ResponseObjectWithDifferentFieldNames {\n"); + sb.append(" normalPropertyName: ").append(toIndentedString(normalPropertyName)).append("\n"); + sb.append(" UPPER_CASE_PROPERTY_SNAKE: ").append(toIndentedString(UPPER_CASE_PROPERTY_SNAKE)).append("\n"); + sb.append(" lowerCasePropertyDashes: ").append(toIndentedString(lowerCasePropertyDashes)).append("\n"); + sb.append(" propertyNameWithSpaces: ").append(toIndentedString(propertyNameWithSpaces)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java index 12b55e211855..c2217970131c 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -24,19 +24,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderDefault { - @JsonProperty("string_item") private String stringItem = "what"; - @JsonProperty("number_item") private BigDecimal numberItem = new BigDecimal("1.234"); - @JsonProperty("integer_item") private Integer integerItem = -2; - @JsonProperty("bool_item") private Boolean boolItem = true; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); @@ -71,6 +66,7 @@ public TypeHolderDefault stringItem(String stringItem) { */ @NotNull @Schema(name = "string_item", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -90,6 +86,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) { */ @NotNull @Valid @Schema(name = "number_item", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -109,6 +106,7 @@ public TypeHolderDefault integerItem(Integer integerItem) { */ @NotNull @Schema(name = "integer_item", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -128,6 +126,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) { */ @NotNull @Schema(name = "bool_item", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -155,6 +154,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { */ @NotNull @Schema(name = "array_item", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java index 8b74b97d38f3..96efe9c2627d 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -24,22 +24,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderExample { - @JsonProperty("string_item") private String stringItem; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("float_item") private Float floatItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -75,6 +69,7 @@ public TypeHolderExample stringItem(String stringItem) { */ @NotNull @Schema(name = "string_item", example = "what", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -94,6 +89,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { */ @NotNull @Valid @Schema(name = "number_item", example = "1.234", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -113,6 +109,7 @@ public TypeHolderExample floatItem(Float floatItem) { */ @NotNull @Schema(name = "float_item", example = "1.234", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("float_item") public Float getFloatItem() { return floatItem; } @@ -132,6 +129,7 @@ public TypeHolderExample integerItem(Integer integerItem) { */ @NotNull @Schema(name = "integer_item", example = "-2", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -151,6 +149,7 @@ public TypeHolderExample boolItem(Boolean boolItem) { */ @NotNull @Schema(name = "bool_item", example = "true", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -178,6 +177,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { */ @NotNull @Schema(name = "array_item", example = "[0,1,2,3]", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/resources/openapi.yaml b/samples/openapi3/server/petstore/springboot-delegate/src/main/resources/openapi.yaml index 1fa32524cf2f..260abafd6eaa 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/resources/openapi.yaml +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/resources/openapi.yaml @@ -1174,6 +1174,31 @@ paths: x-accepts: application/json x-tags: - tag: pet + /fake/{petId}/response-object-different-names: + get: + operationId: responseObjectDifferentNames + parameters: + - description: ID of pet to update + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ResponseObjectWithDifferentFieldNames' + description: successful operation + tags: + - pet + x-accepts: application/json + x-tags: + - tag: pet components: requestBodies: UserArray: @@ -2114,6 +2139,22 @@ components: - nullable_required_array - required_array type: object + ResponseObjectWithDifferentFieldNames: + example: + UPPER_CASE_PROPERTY_SNAKE: UPPER_CASE_PROPERTY_SNAKE + lower-case-property-dashes: lower-case-property-dashes + property name with spaces: property name with spaces + normalPropertyName: normalPropertyName + properties: + normalPropertyName: + type: string + UPPER_CASE_PROPERTY_SNAKE: + type: string + lower-case-property-dashes: + type: string + property name with spaces: + type: string + type: object updatePetWithForm_request: properties: name: diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/test/java/org/openapitools/ResponseObjectWithDifferentFieldNamesJsonSerializationTest.java b/samples/openapi3/server/petstore/springboot-delegate/src/test/java/org/openapitools/ResponseObjectWithDifferentFieldNamesJsonSerializationTest.java new file mode 100644 index 000000000000..7b2e5702ed62 --- /dev/null +++ b/samples/openapi3/server/petstore/springboot-delegate/src/test/java/org/openapitools/ResponseObjectWithDifferentFieldNamesJsonSerializationTest.java @@ -0,0 +1,57 @@ +package org.openapitools; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.assertj.core.api.Assertions; +import org.json.JSONException; +import org.junit.jupiter.api.Test; +import org.openapitools.model.ResponseObjectWithDifferentFieldNames; +import org.skyscreamer.jsonassert.JSONAssert; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +public class ResponseObjectWithDifferentFieldNamesJsonSerializationTest { + + private static final String JSON_STRING = "{" + + "\"normalPropertyName\": \"normalPropertyName_value\"," + + "\"lower-case-property-dashes\": \"lowerCasePropertyDashes_value\"," + + "\"property name with spaces\": \"propertyNameWithSpaces_value\"," + + "\"UPPER_CASE_PROPERTY_SNAKE\": \"UPPER_CASE_PROPERTY_SNAKE_value\"" + + "}"; + + @Autowired + private ObjectMapper objectMapper; + + @Test + void shouldSerializedModelToJson() throws JsonProcessingException, JSONException { + ResponseObjectWithDifferentFieldNames object = new ResponseObjectWithDifferentFieldNames() + .normalPropertyName("normalPropertyName_value") + .UPPER_CASE_PROPERTY_SNAKE("UPPER_CASE_PROPERTY_SNAKE_value") + .lowerCasePropertyDashes("lowerCasePropertyDashes_value") + .propertyNameWithSpaces("propertyNameWithSpaces_value"); + + String actualJson = objectMapper.writeValueAsString(object); + + JSONAssert.assertEquals(JSON_STRING, actualJson, true); + } + + @Test + void shouldDeserializedJsonToModel() throws JsonProcessingException { + String json = "{" + + "\"normalPropertyName\": \"normalPropertyName_value\"," + + "\"lower-case-property-dashes\": \"lowerCasePropertyDashes_value\"," + + "\"property name with spaces\": \"propertyNameWithSpaces_value\"," + + "\"UPPER_CASE_PROPERTY_SNAKE\": \"UPPER_CASE_PROPERTY_SNAKE_value\"" + + "}"; + + ResponseObjectWithDifferentFieldNames object = objectMapper.readValue(json, ResponseObjectWithDifferentFieldNames.class); + + Assertions.assertThat(object) + .returns("normalPropertyName_value", ResponseObjectWithDifferentFieldNames::getNormalPropertyName) + .returns("UPPER_CASE_PROPERTY_SNAKE_value", ResponseObjectWithDifferentFieldNames::getUPPERCASEPROPERTYSNAKE) + .returns("lowerCasePropertyDashes_value", ResponseObjectWithDifferentFieldNames::getLowerCasePropertyDashes) + .returns("propertyNameWithSpaces_value", ResponseObjectWithDifferentFieldNames::getPropertyNameWithSpaces); + } + +} diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/.openapi-generator/FILES b/samples/openapi3/server/petstore/springboot-implicitHeaders/.openapi-generator/FILES index 8263ca2ee05c..c904db3800ae 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/.openapi-generator/FILES +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/.openapi-generator/FILES @@ -61,6 +61,7 @@ src/main/java/org/openapitools/model/OuterComposite.java src/main/java/org/openapitools/model/OuterEnum.java src/main/java/org/openapitools/model/Pet.java src/main/java/org/openapitools/model/ReadOnlyFirst.java +src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java src/main/java/org/openapitools/model/SpecialModelName.java src/main/java/org/openapitools/model/Tag.java src/main/java/org/openapitools/model/TypeHolderDefault.java 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 4e0a224db24e..47c0b05280fa 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,6 +14,7 @@ import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ResponseObjectWithDifferentFieldNames; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import io.swagger.v3.oas.annotations.ExternalDocumentation; @@ -213,6 +214,43 @@ default ResponseEntity fakeOuterStringSerialize( } + /** + * GET /fake/{petId}/response-object-different-names + * + * @param petId ID of pet to update (required) + * @return successful operation (status code 200) + */ + @Operation( + operationId = "responseObjectDifferentNames", + tags = { "pet" }, + responses = { + @ApiResponse(responseCode = "200", description = "successful operation", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = ResponseObjectWithDifferentFieldNames.class)) + }) + } + ) + @RequestMapping( + method = RequestMethod.GET, + value = "/fake/{petId}/response-object-different-names", + produces = { "application/json" } + ) + default ResponseEntity responseObjectDifferentNames( + @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId + ) { + getRequest().ifPresent(request -> { + for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { + if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { + String exampleString = "{ \"UPPER_CASE_PROPERTY_SNAKE\" : \"UPPER_CASE_PROPERTY_SNAKE\", \"lower-case-property-dashes\" : \"lower-case-property-dashes\", \"property name with spaces\" : \"property name with spaces\", \"normalPropertyName\" : \"normalPropertyName\" }"; + ApiUtil.setExampleResponse(request, "application/json", exampleString); + break; + } + } + }); + return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); + + } + + /** * PUT /fake/body-with-file-schema * For this test, the body for this request much reference a schema named `File`. diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApiController.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApiController.java index 5ae5d5fed985..9121a3951829 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApiController.java @@ -9,6 +9,7 @@ import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ResponseObjectWithDifferentFieldNames; import org.openapitools.model.User; import org.openapitools.model.XmlItem; diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 66e0aed61c6c..eff5bd5fa4b1 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -28,45 +28,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesClass { - @JsonProperty("map_string") @Valid private Map mapString = new HashMap<>(); - @JsonProperty("map_number") @Valid private Map mapNumber = new HashMap<>(); - @JsonProperty("map_integer") @Valid private Map mapInteger = new HashMap<>(); - @JsonProperty("map_boolean") @Valid private Map mapBoolean = new HashMap<>(); - @JsonProperty("map_array_integer") @Valid private Map> mapArrayInteger = new HashMap<>(); - @JsonProperty("map_array_anytype") @Valid private Map> mapArrayAnytype = new HashMap<>(); - @JsonProperty("map_map_string") @Valid private Map> mapMapString = new HashMap<>(); - @JsonProperty("map_map_anytype") @Valid private Map> mapMapAnytype = new HashMap<>(); - @JsonProperty("anytype_1") private Object anytype1; - @JsonProperty("anytype_2") private JsonNullable anytype2 = JsonNullable.undefined(); - @JsonProperty("anytype_3") private Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { @@ -88,6 +77,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt */ @Schema(name = "map_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_string") public Map getMapString() { return mapString; } @@ -115,6 +105,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb */ @Valid @Schema(name = "map_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_number") public Map getMapNumber() { return mapNumber; } @@ -142,6 +133,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege */ @Schema(name = "map_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_integer") public Map getMapInteger() { return mapInteger; } @@ -169,6 +161,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea */ @Schema(name = "map_boolean", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_boolean") public Map getMapBoolean() { return mapBoolean; } @@ -196,6 +189,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { return mapArrayInteger; } @@ -223,6 +217,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List */ @Valid @Schema(name = "map_array_anytype", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { return mapArrayAnytype; } @@ -250,6 +245,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { return mapMapString; } @@ -277,6 +273,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { return mapMapAnytype; } @@ -296,6 +293,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) { */ @Schema(name = "anytype_1", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("anytype_1") public Object getAnytype1() { return anytype1; } @@ -315,6 +313,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) { */ @Schema(name = "anytype_2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("anytype_2") public JsonNullable getAnytype2() { return anytype2; } @@ -334,6 +333,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) { */ @Schema(name = "anytype_3", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("anytype_3") public Object getAnytype3() { return anytype3; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java index 55d205398170..ebcd1eede94e 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -26,19 +26,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ContainerDefaultValue { - @JsonProperty("nullable_array") @Valid private JsonNullable> nullableArray = JsonNullable.undefined(); - @JsonProperty("nullable_required_array") @Valid private JsonNullable> nullableRequiredArray = JsonNullable.undefined(); - @JsonProperty("required_array") @Valid private List requiredArray = new ArrayList<>(); - @JsonProperty("nullable_array_with_default") @Valid private JsonNullable> nullableArrayWithDefault = JsonNullable.undefined(); @@ -78,6 +74,7 @@ public ContainerDefaultValue addNullableArrayItem(String nullableArrayItem) { */ @Schema(name = "nullable_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("nullable_array") public JsonNullable> getNullableArray() { return nullableArray; } @@ -105,6 +102,7 @@ public ContainerDefaultValue addNullableRequiredArrayItem(String nullableRequire */ @NotNull @Schema(name = "nullable_required_array", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("nullable_required_array") public JsonNullable> getNullableRequiredArray() { return nullableRequiredArray; } @@ -132,6 +130,7 @@ public ContainerDefaultValue addRequiredArrayItem(String requiredArrayItem) { */ @NotNull @Schema(name = "required_array", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("required_array") public List getRequiredArray() { return requiredArray; } @@ -159,6 +158,7 @@ public ContainerDefaultValue addNullableArrayWithDefaultItem(String nullableArra */ @Schema(name = "nullable_array_with_default", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("nullable_array_with_default") public JsonNullable> getNullableArrayWithDefault() { return nullableArrayWithDefault; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java index dae9b27f93aa..be6e37a7aba9 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -24,10 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FileSchemaTestClass { - @JsonProperty("file") private File file; - @JsonProperty("files") @Valid private List<@Valid File> files; @@ -42,6 +40,7 @@ public FileSchemaTestClass file(File file) { */ @Valid @Schema(name = "file", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("file") public File getFile() { return file; } @@ -69,6 +68,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) { */ @Valid @Schema(name = "files", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("files") public List<@Valid File> getFiles() { return files; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java index ba99ad030276..0e76707f06f6 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java @@ -29,20 +29,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private Set photoUrls = new LinkedHashSet<>(); - @JsonProperty("tags") @Valid private List<@Valid Tag> tags; @@ -83,7 +78,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; /** @@ -114,6 +108,7 @@ public Pet id(Long id) { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -133,6 +128,7 @@ public Pet category(Category category) { */ @Valid @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("category") public Category getCategory() { return category; } @@ -152,6 +148,7 @@ public Pet name(String name) { */ @NotNull @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("name") public String getName() { return name; } @@ -179,6 +176,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { */ @NotNull @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("photoUrls") public Set getPhotoUrls() { return photoUrls; } @@ -207,6 +205,7 @@ public Pet addTagsItem(Tag tagsItem) { */ @Valid @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -226,6 +225,7 @@ public Pet status(StatusEnum status) { */ @Schema(name = "status", description = "pet status in the store", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java new file mode 100644 index 000000000000..c681122f5f86 --- /dev/null +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java @@ -0,0 +1,155 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; +import io.swagger.v3.oas.annotations.media.Schema; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * ResponseObjectWithDifferentFieldNames + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public class ResponseObjectWithDifferentFieldNames { + + private String normalPropertyName; + + private String UPPER_CASE_PROPERTY_SNAKE; + + private String lowerCasePropertyDashes; + + private String propertyNameWithSpaces; + + public ResponseObjectWithDifferentFieldNames normalPropertyName(String normalPropertyName) { + this.normalPropertyName = normalPropertyName; + return this; + } + + /** + * Get normalPropertyName + * @return normalPropertyName + */ + + @Schema(name = "normalPropertyName", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("normalPropertyName") + public String getNormalPropertyName() { + return normalPropertyName; + } + + public void setNormalPropertyName(String normalPropertyName) { + this.normalPropertyName = normalPropertyName; + } + + public ResponseObjectWithDifferentFieldNames UPPER_CASE_PROPERTY_SNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; + return this; + } + + /** + * Get UPPER_CASE_PROPERTY_SNAKE + * @return UPPER_CASE_PROPERTY_SNAKE + */ + + @Schema(name = "UPPER_CASE_PROPERTY_SNAKE", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("UPPER_CASE_PROPERTY_SNAKE") + public String getUPPERCASEPROPERTYSNAKE() { + return UPPER_CASE_PROPERTY_SNAKE; + } + + public void setUPPERCASEPROPERTYSNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; + } + + public ResponseObjectWithDifferentFieldNames lowerCasePropertyDashes(String lowerCasePropertyDashes) { + this.lowerCasePropertyDashes = lowerCasePropertyDashes; + return this; + } + + /** + * Get lowerCasePropertyDashes + * @return lowerCasePropertyDashes + */ + + @Schema(name = "lower-case-property-dashes", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("lower-case-property-dashes") + public String getLowerCasePropertyDashes() { + return lowerCasePropertyDashes; + } + + public void setLowerCasePropertyDashes(String lowerCasePropertyDashes) { + this.lowerCasePropertyDashes = lowerCasePropertyDashes; + } + + public ResponseObjectWithDifferentFieldNames propertyNameWithSpaces(String propertyNameWithSpaces) { + this.propertyNameWithSpaces = propertyNameWithSpaces; + return this; + } + + /** + * Get propertyNameWithSpaces + * @return propertyNameWithSpaces + */ + + @Schema(name = "property name with spaces", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("property name with spaces") + public String getPropertyNameWithSpaces() { + return propertyNameWithSpaces; + } + + public void setPropertyNameWithSpaces(String propertyNameWithSpaces) { + this.propertyNameWithSpaces = propertyNameWithSpaces; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ResponseObjectWithDifferentFieldNames responseObjectWithDifferentFieldNames = (ResponseObjectWithDifferentFieldNames) o; + return Objects.equals(this.normalPropertyName, responseObjectWithDifferentFieldNames.normalPropertyName) && + Objects.equals(this.UPPER_CASE_PROPERTY_SNAKE, responseObjectWithDifferentFieldNames.UPPER_CASE_PROPERTY_SNAKE) && + Objects.equals(this.lowerCasePropertyDashes, responseObjectWithDifferentFieldNames.lowerCasePropertyDashes) && + Objects.equals(this.propertyNameWithSpaces, responseObjectWithDifferentFieldNames.propertyNameWithSpaces); + } + + @Override + public int hashCode() { + return Objects.hash(normalPropertyName, UPPER_CASE_PROPERTY_SNAKE, lowerCasePropertyDashes, propertyNameWithSpaces); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ResponseObjectWithDifferentFieldNames {\n"); + sb.append(" normalPropertyName: ").append(toIndentedString(normalPropertyName)).append("\n"); + sb.append(" UPPER_CASE_PROPERTY_SNAKE: ").append(toIndentedString(UPPER_CASE_PROPERTY_SNAKE)).append("\n"); + sb.append(" lowerCasePropertyDashes: ").append(toIndentedString(lowerCasePropertyDashes)).append("\n"); + sb.append(" propertyNameWithSpaces: ").append(toIndentedString(propertyNameWithSpaces)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java index 12b55e211855..c2217970131c 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -24,19 +24,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderDefault { - @JsonProperty("string_item") private String stringItem = "what"; - @JsonProperty("number_item") private BigDecimal numberItem = new BigDecimal("1.234"); - @JsonProperty("integer_item") private Integer integerItem = -2; - @JsonProperty("bool_item") private Boolean boolItem = true; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); @@ -71,6 +66,7 @@ public TypeHolderDefault stringItem(String stringItem) { */ @NotNull @Schema(name = "string_item", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -90,6 +86,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) { */ @NotNull @Valid @Schema(name = "number_item", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -109,6 +106,7 @@ public TypeHolderDefault integerItem(Integer integerItem) { */ @NotNull @Schema(name = "integer_item", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -128,6 +126,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) { */ @NotNull @Schema(name = "bool_item", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -155,6 +154,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { */ @NotNull @Schema(name = "array_item", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java index 8b74b97d38f3..96efe9c2627d 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -24,22 +24,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderExample { - @JsonProperty("string_item") private String stringItem; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("float_item") private Float floatItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -75,6 +69,7 @@ public TypeHolderExample stringItem(String stringItem) { */ @NotNull @Schema(name = "string_item", example = "what", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -94,6 +89,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { */ @NotNull @Valid @Schema(name = "number_item", example = "1.234", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -113,6 +109,7 @@ public TypeHolderExample floatItem(Float floatItem) { */ @NotNull @Schema(name = "float_item", example = "1.234", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("float_item") public Float getFloatItem() { return floatItem; } @@ -132,6 +129,7 @@ public TypeHolderExample integerItem(Integer integerItem) { */ @NotNull @Schema(name = "integer_item", example = "-2", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -151,6 +149,7 @@ public TypeHolderExample boolItem(Boolean boolItem) { */ @NotNull @Schema(name = "bool_item", example = "true", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -178,6 +177,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { */ @NotNull @Schema(name = "array_item", example = "[0,1,2,3]", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml index 1fa32524cf2f..260abafd6eaa 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml @@ -1174,6 +1174,31 @@ paths: x-accepts: application/json x-tags: - tag: pet + /fake/{petId}/response-object-different-names: + get: + operationId: responseObjectDifferentNames + parameters: + - description: ID of pet to update + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ResponseObjectWithDifferentFieldNames' + description: successful operation + tags: + - pet + x-accepts: application/json + x-tags: + - tag: pet components: requestBodies: UserArray: @@ -2114,6 +2139,22 @@ components: - nullable_required_array - required_array type: object + ResponseObjectWithDifferentFieldNames: + example: + UPPER_CASE_PROPERTY_SNAKE: UPPER_CASE_PROPERTY_SNAKE + lower-case-property-dashes: lower-case-property-dashes + property name with spaces: property name with spaces + normalPropertyName: normalPropertyName + properties: + normalPropertyName: + type: string + UPPER_CASE_PROPERTY_SNAKE: + type: string + lower-case-property-dashes: + type: string + property name with spaces: + type: string + type: object updatePetWithForm_request: properties: name: diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Pet.java index 05bed382e38e..f72251ebac0d 100644 --- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Pet.java @@ -25,20 +25,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private List photoUrls = new ArrayList<>(); - @JsonProperty("tags") @Valid private List<@Valid Tag> tags; @@ -79,7 +74,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; /** @@ -109,6 +103,7 @@ public Pet id(Long id) { * @return id */ + @JsonProperty("id") public Long getId() { return id; } @@ -127,6 +122,7 @@ public Pet category(Category category) { * @return category */ @Valid + @JsonProperty("category") public Category getCategory() { return category; } @@ -145,6 +141,7 @@ public Pet name(String name) { * @return name */ @NotNull + @JsonProperty("name") public String getName() { return name; } @@ -171,6 +168,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * @return photoUrls */ @NotNull + @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; } @@ -197,6 +195,7 @@ public Pet addTagsItem(Tag tagsItem) { * @return tags */ @Valid + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -215,6 +214,7 @@ public Pet status(StatusEnum status) { * @return status */ + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java index fdb5e59cd6bc..7ed29b5a5c00 100644 --- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java @@ -27,20 +27,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private List photoUrls = new ArrayList<>(); - @JsonProperty("tags") @Valid private List<@Valid Tag> tags; @@ -81,7 +76,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; /** @@ -112,6 +106,7 @@ public Pet id(Long id) { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -131,6 +126,7 @@ public Pet category(Category category) { */ @Valid @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("category") public Category getCategory() { return category; } @@ -150,6 +146,7 @@ public Pet name(String name) { */ @NotNull @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("name") public String getName() { return name; } @@ -177,6 +174,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { */ @NotNull @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; } @@ -204,6 +202,7 @@ public Pet addTagsItem(Tag tagsItem) { */ @Valid @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -223,6 +222,7 @@ public Pet status(StatusEnum status) { */ @Schema(name = "status", description = "pet status in the store", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Category.java index 72502d0f0e26..5fe001a360f0 100644 --- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Category.java @@ -30,11 +30,9 @@ @Generated(value = "org.openapitools.codegen.languages.JavaCamelServerCodegen") public class Category { - @JsonProperty("id") @JacksonXmlProperty(localName = "id") private Long id; - @JsonProperty("name") @JacksonXmlProperty(localName = "name") private String name; @@ -49,6 +47,7 @@ public Category id(Long id) { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -68,6 +67,7 @@ public Category name(String name) { */ @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/ModelApiResponse.java index d7fd8f87d926..37ee933d1276 100644 --- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -32,15 +32,12 @@ @Generated(value = "org.openapitools.codegen.languages.JavaCamelServerCodegen") public class ModelApiResponse { - @JsonProperty("code") @JacksonXmlProperty(localName = "code") private Integer code; - @JsonProperty("type") @JacksonXmlProperty(localName = "type") private String type; - @JsonProperty("message") @JacksonXmlProperty(localName = "message") private String message; @@ -55,6 +52,7 @@ public ModelApiResponse code(Integer code) { */ @Schema(name = "code", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("code") public Integer getCode() { return code; } @@ -74,6 +72,7 @@ public ModelApiResponse type(String type) { */ @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("type") public String getType() { return type; } @@ -93,6 +92,7 @@ public ModelApiResponse message(String message) { */ @Schema(name = "message", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Order.java index a2507752ed07..19cc6ec9bf51 100644 --- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Order.java @@ -33,19 +33,15 @@ @Generated(value = "org.openapitools.codegen.languages.JavaCamelServerCodegen") public class Order { - @JsonProperty("id") @JacksonXmlProperty(localName = "id") private Long id; - @JsonProperty("petId") @JacksonXmlProperty(localName = "petId") private Long petId; - @JsonProperty("quantity") @JacksonXmlProperty(localName = "quantity") private Integer quantity; - @JsonProperty("shipDate") @JacksonXmlProperty(localName = "shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private Date shipDate; @@ -87,11 +83,9 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") @JacksonXmlProperty(localName = "status") private StatusEnum status; - @JsonProperty("complete") @JacksonXmlProperty(localName = "complete") private Boolean complete = false; @@ -106,6 +100,7 @@ public Order id(Long id) { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -125,6 +120,7 @@ public Order petId(Long petId) { */ @Schema(name = "petId", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -144,6 +140,7 @@ public Order quantity(Integer quantity) { */ @Schema(name = "quantity", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -163,6 +160,7 @@ public Order shipDate(Date shipDate) { */ @Valid @Schema(name = "shipDate", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("shipDate") public Date getShipDate() { return shipDate; } @@ -182,6 +180,7 @@ public Order status(StatusEnum status) { */ @Schema(name = "status", description = "Order Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -201,6 +200,7 @@ public Order complete(Boolean complete) { */ @Schema(name = "complete", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Pet.java index 6fa31a30601d..410419edbaab 100644 --- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Pet.java @@ -35,24 +35,19 @@ @Generated(value = "org.openapitools.codegen.languages.JavaCamelServerCodegen") public class Pet { - @JsonProperty("id") @JacksonXmlProperty(localName = "id") private Long id; - @JsonProperty("category") @JacksonXmlProperty(localName = "category") private Category category; - @JsonProperty("name") @JacksonXmlProperty(localName = "name") private String name; - @JsonProperty("photoUrls") @JacksonXmlProperty(localName = "photoUrl") @Valid private List photoUrls = new ArrayList<>(); - @JsonProperty("tags") @JacksonXmlProperty(localName = "tag") @Valid private List<@Valid Tag> tags; @@ -94,7 +89,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") @JacksonXmlProperty(localName = "status") private StatusEnum status; @@ -126,6 +120,7 @@ public Pet id(Long id) { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -145,6 +140,7 @@ public Pet category(Category category) { */ @Valid @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("category") public Category getCategory() { return category; } @@ -164,6 +160,7 @@ public Pet name(String name) { */ @NotNull @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("name") public String getName() { return name; } @@ -191,6 +188,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { */ @NotNull @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; } @@ -218,6 +216,7 @@ public Pet addTagsItem(Tag tagsItem) { */ @Valid @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -237,6 +236,7 @@ public Pet status(StatusEnum status) { */ @Schema(name = "status", description = "pet status in the store", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Tag.java index e841695b5e09..f2c6219aeb89 100644 --- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Tag.java @@ -30,11 +30,9 @@ @Generated(value = "org.openapitools.codegen.languages.JavaCamelServerCodegen") public class Tag { - @JsonProperty("id") @JacksonXmlProperty(localName = "id") private Long id; - @JsonProperty("name") @JacksonXmlProperty(localName = "name") private String name; @@ -49,6 +47,7 @@ public Tag id(Long id) { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -68,6 +67,7 @@ public Tag name(String name) { */ @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/User.java index 5a2a1168ea85..94ac85834347 100644 --- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/User.java @@ -30,35 +30,27 @@ @Generated(value = "org.openapitools.codegen.languages.JavaCamelServerCodegen") public class User { - @JsonProperty("id") @JacksonXmlProperty(localName = "id") private Long id; - @JsonProperty("username") @JacksonXmlProperty(localName = "username") private String username; - @JsonProperty("firstName") @JacksonXmlProperty(localName = "firstName") private String firstName; - @JsonProperty("lastName") @JacksonXmlProperty(localName = "lastName") private String lastName; - @JsonProperty("email") @JacksonXmlProperty(localName = "email") private String email; - @JsonProperty("password") @JacksonXmlProperty(localName = "password") private String password; - @JsonProperty("phone") @JacksonXmlProperty(localName = "phone") private String phone; - @JsonProperty("userStatus") @JacksonXmlProperty(localName = "userStatus") private Integer userStatus; @@ -73,6 +65,7 @@ public User id(Long id) { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -92,6 +85,7 @@ public User username(String username) { */ @Schema(name = "username", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("username") public String getUsername() { return username; } @@ -111,6 +105,7 @@ public User firstName(String firstName) { */ @Schema(name = "firstName", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -130,6 +125,7 @@ public User lastName(String lastName) { */ @Schema(name = "lastName", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -149,6 +145,7 @@ public User email(String email) { */ @Schema(name = "email", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("email") public String getEmail() { return email; } @@ -168,6 +165,7 @@ public User password(String password) { */ @Schema(name = "password", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("password") public String getPassword() { return password; } @@ -187,6 +185,7 @@ public User phone(String phone) { */ @Schema(name = "phone", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("phone") public String getPhone() { return phone; } @@ -206,6 +205,7 @@ public User userStatus(Integer userStatus) { */ @Schema(name = "userStatus", description = "User Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/.openapi-generator/FILES b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/.openapi-generator/FILES index 18561f6ffff9..10f1284050fd 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/.openapi-generator/FILES +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/.openapi-generator/FILES @@ -50,6 +50,7 @@ src/main/java/org/openapitools/model/OuterComposite.java src/main/java/org/openapitools/model/OuterEnum.java src/main/java/org/openapitools/model/Pet.java src/main/java/org/openapitools/model/ReadOnlyFirst.java +src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java src/main/java/org/openapitools/model/SpecialModelName.java src/main/java/org/openapitools/model/Tag.java src/main/java/org/openapitools/model/TypeHolderDefault.java diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeApi.java index 66dfa30d774a..d974ae15f0e3 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeApi.java @@ -14,6 +14,7 @@ import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ResponseObjectWithDifferentFieldNames; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import io.swagger.v3.oas.annotations.ExternalDocumentation; @@ -185,6 +186,31 @@ ResponseEntity fakeOuterStringSerialize( ) throws Exception; + /** + * GET /fake/{petId}/response-object-different-names + * + * @param petId ID of pet to update (required) + * @return successful operation (status code 200) + */ + @Operation( + operationId = "responseObjectDifferentNames", + tags = { "pet" }, + responses = { + @ApiResponse(responseCode = "200", description = "successful operation", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = ResponseObjectWithDifferentFieldNames.class)) + }) + } + ) + @RequestMapping( + method = RequestMethod.GET, + value = "/fake/{petId}/response-object-different-names", + produces = { "application/json" } + ) + ResponseEntity responseObjectDifferentNames( + @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId + ) throws Exception; + + /** * PUT /fake/body-with-file-schema * For this test, the body for this request much reference a schema named `File`. diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 66e0aed61c6c..eff5bd5fa4b1 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -28,45 +28,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesClass { - @JsonProperty("map_string") @Valid private Map mapString = new HashMap<>(); - @JsonProperty("map_number") @Valid private Map mapNumber = new HashMap<>(); - @JsonProperty("map_integer") @Valid private Map mapInteger = new HashMap<>(); - @JsonProperty("map_boolean") @Valid private Map mapBoolean = new HashMap<>(); - @JsonProperty("map_array_integer") @Valid private Map> mapArrayInteger = new HashMap<>(); - @JsonProperty("map_array_anytype") @Valid private Map> mapArrayAnytype = new HashMap<>(); - @JsonProperty("map_map_string") @Valid private Map> mapMapString = new HashMap<>(); - @JsonProperty("map_map_anytype") @Valid private Map> mapMapAnytype = new HashMap<>(); - @JsonProperty("anytype_1") private Object anytype1; - @JsonProperty("anytype_2") private JsonNullable anytype2 = JsonNullable.undefined(); - @JsonProperty("anytype_3") private Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { @@ -88,6 +77,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt */ @Schema(name = "map_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_string") public Map getMapString() { return mapString; } @@ -115,6 +105,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb */ @Valid @Schema(name = "map_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_number") public Map getMapNumber() { return mapNumber; } @@ -142,6 +133,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege */ @Schema(name = "map_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_integer") public Map getMapInteger() { return mapInteger; } @@ -169,6 +161,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea */ @Schema(name = "map_boolean", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_boolean") public Map getMapBoolean() { return mapBoolean; } @@ -196,6 +189,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { return mapArrayInteger; } @@ -223,6 +217,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List */ @Valid @Schema(name = "map_array_anytype", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { return mapArrayAnytype; } @@ -250,6 +245,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { return mapMapString; } @@ -277,6 +273,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { return mapMapAnytype; } @@ -296,6 +293,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) { */ @Schema(name = "anytype_1", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("anytype_1") public Object getAnytype1() { return anytype1; } @@ -315,6 +313,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) { */ @Schema(name = "anytype_2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("anytype_2") public JsonNullable getAnytype2() { return anytype2; } @@ -334,6 +333,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) { */ @Schema(name = "anytype_3", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("anytype_3") public Object getAnytype3() { return anytype3; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ContainerDefaultValue.java index 55d205398170..ebcd1eede94e 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -26,19 +26,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ContainerDefaultValue { - @JsonProperty("nullable_array") @Valid private JsonNullable> nullableArray = JsonNullable.undefined(); - @JsonProperty("nullable_required_array") @Valid private JsonNullable> nullableRequiredArray = JsonNullable.undefined(); - @JsonProperty("required_array") @Valid private List requiredArray = new ArrayList<>(); - @JsonProperty("nullable_array_with_default") @Valid private JsonNullable> nullableArrayWithDefault = JsonNullable.undefined(); @@ -78,6 +74,7 @@ public ContainerDefaultValue addNullableArrayItem(String nullableArrayItem) { */ @Schema(name = "nullable_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("nullable_array") public JsonNullable> getNullableArray() { return nullableArray; } @@ -105,6 +102,7 @@ public ContainerDefaultValue addNullableRequiredArrayItem(String nullableRequire */ @NotNull @Schema(name = "nullable_required_array", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("nullable_required_array") public JsonNullable> getNullableRequiredArray() { return nullableRequiredArray; } @@ -132,6 +130,7 @@ public ContainerDefaultValue addRequiredArrayItem(String requiredArrayItem) { */ @NotNull @Schema(name = "required_array", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("required_array") public List getRequiredArray() { return requiredArray; } @@ -159,6 +158,7 @@ public ContainerDefaultValue addNullableArrayWithDefaultItem(String nullableArra */ @Schema(name = "nullable_array_with_default", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("nullable_array_with_default") public JsonNullable> getNullableArrayWithDefault() { return nullableArrayWithDefault; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FileSchemaTestClass.java index dae9b27f93aa..be6e37a7aba9 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -24,10 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FileSchemaTestClass { - @JsonProperty("file") private File file; - @JsonProperty("files") @Valid private List<@Valid File> files; @@ -42,6 +40,7 @@ public FileSchemaTestClass file(File file) { */ @Valid @Schema(name = "file", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("file") public File getFile() { return file; } @@ -69,6 +68,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) { */ @Valid @Schema(name = "files", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("files") public List<@Valid File> getFiles() { return files; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Pet.java index ba99ad030276..0e76707f06f6 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Pet.java @@ -29,20 +29,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private Set photoUrls = new LinkedHashSet<>(); - @JsonProperty("tags") @Valid private List<@Valid Tag> tags; @@ -83,7 +78,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; /** @@ -114,6 +108,7 @@ public Pet id(Long id) { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -133,6 +128,7 @@ public Pet category(Category category) { */ @Valid @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("category") public Category getCategory() { return category; } @@ -152,6 +148,7 @@ public Pet name(String name) { */ @NotNull @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("name") public String getName() { return name; } @@ -179,6 +176,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { */ @NotNull @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("photoUrls") public Set getPhotoUrls() { return photoUrls; } @@ -207,6 +205,7 @@ public Pet addTagsItem(Tag tagsItem) { */ @Valid @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -226,6 +225,7 @@ public Pet status(StatusEnum status) { */ @Schema(name = "status", description = "pet status in the store", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java new file mode 100644 index 000000000000..c681122f5f86 --- /dev/null +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java @@ -0,0 +1,155 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; +import io.swagger.v3.oas.annotations.media.Schema; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * ResponseObjectWithDifferentFieldNames + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public class ResponseObjectWithDifferentFieldNames { + + private String normalPropertyName; + + private String UPPER_CASE_PROPERTY_SNAKE; + + private String lowerCasePropertyDashes; + + private String propertyNameWithSpaces; + + public ResponseObjectWithDifferentFieldNames normalPropertyName(String normalPropertyName) { + this.normalPropertyName = normalPropertyName; + return this; + } + + /** + * Get normalPropertyName + * @return normalPropertyName + */ + + @Schema(name = "normalPropertyName", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("normalPropertyName") + public String getNormalPropertyName() { + return normalPropertyName; + } + + public void setNormalPropertyName(String normalPropertyName) { + this.normalPropertyName = normalPropertyName; + } + + public ResponseObjectWithDifferentFieldNames UPPER_CASE_PROPERTY_SNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; + return this; + } + + /** + * Get UPPER_CASE_PROPERTY_SNAKE + * @return UPPER_CASE_PROPERTY_SNAKE + */ + + @Schema(name = "UPPER_CASE_PROPERTY_SNAKE", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("UPPER_CASE_PROPERTY_SNAKE") + public String getUPPERCASEPROPERTYSNAKE() { + return UPPER_CASE_PROPERTY_SNAKE; + } + + public void setUPPERCASEPROPERTYSNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; + } + + public ResponseObjectWithDifferentFieldNames lowerCasePropertyDashes(String lowerCasePropertyDashes) { + this.lowerCasePropertyDashes = lowerCasePropertyDashes; + return this; + } + + /** + * Get lowerCasePropertyDashes + * @return lowerCasePropertyDashes + */ + + @Schema(name = "lower-case-property-dashes", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("lower-case-property-dashes") + public String getLowerCasePropertyDashes() { + return lowerCasePropertyDashes; + } + + public void setLowerCasePropertyDashes(String lowerCasePropertyDashes) { + this.lowerCasePropertyDashes = lowerCasePropertyDashes; + } + + public ResponseObjectWithDifferentFieldNames propertyNameWithSpaces(String propertyNameWithSpaces) { + this.propertyNameWithSpaces = propertyNameWithSpaces; + return this; + } + + /** + * Get propertyNameWithSpaces + * @return propertyNameWithSpaces + */ + + @Schema(name = "property name with spaces", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("property name with spaces") + public String getPropertyNameWithSpaces() { + return propertyNameWithSpaces; + } + + public void setPropertyNameWithSpaces(String propertyNameWithSpaces) { + this.propertyNameWithSpaces = propertyNameWithSpaces; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ResponseObjectWithDifferentFieldNames responseObjectWithDifferentFieldNames = (ResponseObjectWithDifferentFieldNames) o; + return Objects.equals(this.normalPropertyName, responseObjectWithDifferentFieldNames.normalPropertyName) && + Objects.equals(this.UPPER_CASE_PROPERTY_SNAKE, responseObjectWithDifferentFieldNames.UPPER_CASE_PROPERTY_SNAKE) && + Objects.equals(this.lowerCasePropertyDashes, responseObjectWithDifferentFieldNames.lowerCasePropertyDashes) && + Objects.equals(this.propertyNameWithSpaces, responseObjectWithDifferentFieldNames.propertyNameWithSpaces); + } + + @Override + public int hashCode() { + return Objects.hash(normalPropertyName, UPPER_CASE_PROPERTY_SNAKE, lowerCasePropertyDashes, propertyNameWithSpaces); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ResponseObjectWithDifferentFieldNames {\n"); + sb.append(" normalPropertyName: ").append(toIndentedString(normalPropertyName)).append("\n"); + sb.append(" UPPER_CASE_PROPERTY_SNAKE: ").append(toIndentedString(UPPER_CASE_PROPERTY_SNAKE)).append("\n"); + sb.append(" lowerCasePropertyDashes: ").append(toIndentedString(lowerCasePropertyDashes)).append("\n"); + sb.append(" propertyNameWithSpaces: ").append(toIndentedString(propertyNameWithSpaces)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderDefault.java index 12b55e211855..c2217970131c 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -24,19 +24,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderDefault { - @JsonProperty("string_item") private String stringItem = "what"; - @JsonProperty("number_item") private BigDecimal numberItem = new BigDecimal("1.234"); - @JsonProperty("integer_item") private Integer integerItem = -2; - @JsonProperty("bool_item") private Boolean boolItem = true; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); @@ -71,6 +66,7 @@ public TypeHolderDefault stringItem(String stringItem) { */ @NotNull @Schema(name = "string_item", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -90,6 +86,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) { */ @NotNull @Valid @Schema(name = "number_item", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -109,6 +106,7 @@ public TypeHolderDefault integerItem(Integer integerItem) { */ @NotNull @Schema(name = "integer_item", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -128,6 +126,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) { */ @NotNull @Schema(name = "bool_item", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -155,6 +154,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { */ @NotNull @Schema(name = "array_item", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderExample.java index 8b74b97d38f3..96efe9c2627d 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -24,22 +24,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderExample { - @JsonProperty("string_item") private String stringItem; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("float_item") private Float floatItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -75,6 +69,7 @@ public TypeHolderExample stringItem(String stringItem) { */ @NotNull @Schema(name = "string_item", example = "what", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -94,6 +89,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { */ @NotNull @Valid @Schema(name = "number_item", example = "1.234", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -113,6 +109,7 @@ public TypeHolderExample floatItem(Float floatItem) { */ @NotNull @Schema(name = "float_item", example = "1.234", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("float_item") public Float getFloatItem() { return floatItem; } @@ -132,6 +129,7 @@ public TypeHolderExample integerItem(Integer integerItem) { */ @NotNull @Schema(name = "integer_item", example = "-2", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -151,6 +149,7 @@ public TypeHolderExample boolItem(Boolean boolItem) { */ @NotNull @Schema(name = "bool_item", example = "true", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -178,6 +177,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { */ @NotNull @Schema(name = "array_item", example = "[0,1,2,3]", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/FILES b/samples/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/FILES index 32921b847d0c..946be0025614 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/FILES @@ -61,6 +61,7 @@ src/main/java/org/openapitools/model/OuterComposite.java src/main/java/org/openapitools/model/OuterEnum.java src/main/java/org/openapitools/model/Pet.java src/main/java/org/openapitools/model/ReadOnlyFirst.java +src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java src/main/java/org/openapitools/model/SpecialModelName.java src/main/java/org/openapitools/model/Tag.java src/main/java/org/openapitools/model/TypeHolderDefault.java 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 edf5c41ea0fc..046ebd0a351a 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,6 +14,7 @@ import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ResponseObjectWithDifferentFieldNames; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import io.swagger.annotations.*; @@ -203,6 +204,44 @@ default ResponseEntity fakeOuterStringSerialize( } + /** + * GET /fake/{petId}/response-object-different-names + * + * @param petId ID of pet to update (required) + * @return successful operation (status code 200) + */ + @ApiOperation( + tags = { "pet" }, + value = "", + nickname = "responseObjectDifferentNames", + notes = "", + response = ResponseObjectWithDifferentFieldNames.class + ) + @ApiResponses({ + @ApiResponse(code = 200, message = "successful operation", response = ResponseObjectWithDifferentFieldNames.class) + }) + @RequestMapping( + method = RequestMethod.GET, + value = "/fake/{petId}/response-object-different-names", + produces = { "application/json" } + ) + default ResponseEntity responseObjectDifferentNames( + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId + ) { + getRequest().ifPresent(request -> { + for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { + if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { + String exampleString = "{ \"UPPER_CASE_PROPERTY_SNAKE\" : \"UPPER_CASE_PROPERTY_SNAKE\", \"lower-case-property-dashes\" : \"lower-case-property-dashes\", \"property name with spaces\" : \"property name with spaces\", \"normalPropertyName\" : \"normalPropertyName\" }"; + ApiUtil.setExampleResponse(request, "application/json", exampleString); + break; + } + } + }); + return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); + + } + + /** * PUT /fake/body-with-file-schema * For this test, the body for this request much reference a schema named `File`. 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 5ae5d5fed985..9121a3951829 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,6 +9,7 @@ import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ResponseObjectWithDifferentFieldNames; import org.openapitools.model.User; import org.openapitools.model.XmlItem; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index ccad3b7842e8..da623886687a 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -25,45 +25,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesClass { - @JsonProperty("map_string") @Valid private Map mapString = new HashMap<>(); - @JsonProperty("map_number") @Valid private Map mapNumber = new HashMap<>(); - @JsonProperty("map_integer") @Valid private Map mapInteger = new HashMap<>(); - @JsonProperty("map_boolean") @Valid private Map mapBoolean = new HashMap<>(); - @JsonProperty("map_array_integer") @Valid private Map> mapArrayInteger = new HashMap<>(); - @JsonProperty("map_array_anytype") @Valid private Map> mapArrayAnytype = new HashMap<>(); - @JsonProperty("map_map_string") @Valid private Map> mapMapString = new HashMap<>(); - @JsonProperty("map_map_anytype") @Valid private Map> mapMapAnytype = new HashMap<>(); - @JsonProperty("anytype_1") private Object anytype1; - @JsonProperty("anytype_2") private Object anytype2 = null; - @JsonProperty("anytype_3") private Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { @@ -85,6 +74,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt */ @ApiModelProperty(value = "") + @JsonProperty("map_string") public Map getMapString() { return mapString; } @@ -112,6 +102,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_number") public Map getMapNumber() { return mapNumber; } @@ -139,6 +130,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege */ @ApiModelProperty(value = "") + @JsonProperty("map_integer") public Map getMapInteger() { return mapInteger; } @@ -166,6 +158,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea */ @ApiModelProperty(value = "") + @JsonProperty("map_boolean") public Map getMapBoolean() { return mapBoolean; } @@ -193,6 +186,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { return mapArrayInteger; } @@ -220,6 +214,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { return mapArrayAnytype; } @@ -247,6 +242,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { return mapMapString; } @@ -274,6 +270,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { return mapMapAnytype; } @@ -293,6 +290,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) { */ @ApiModelProperty(value = "") + @JsonProperty("anytype_1") public Object getAnytype1() { return anytype1; } @@ -312,6 +310,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) { */ @ApiModelProperty(value = "") + @JsonProperty("anytype_2") public Object getAnytype2() { return anytype2; } @@ -331,6 +330,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) { */ @ApiModelProperty(value = "") + @JsonProperty("anytype_3") public Object getAnytype3() { return anytype3; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ContainerDefaultValue.java index 193fbbcab334..862accc3be52 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -23,19 +23,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ContainerDefaultValue { - @JsonProperty("nullable_array") @Valid private List nullableArray; - @JsonProperty("nullable_required_array") @Valid private List nullableRequiredArray; - @JsonProperty("required_array") @Valid private List requiredArray = new ArrayList<>(); - @JsonProperty("nullable_array_with_default") @Valid private List nullableArrayWithDefault = new ArrayList<>(Arrays.asList("foo", "bar")); @@ -75,6 +71,7 @@ public ContainerDefaultValue addNullableArrayItem(String nullableArrayItem) { */ @ApiModelProperty(value = "") + @JsonProperty("nullable_array") public List getNullableArray() { return nullableArray; } @@ -102,6 +99,7 @@ public ContainerDefaultValue addNullableRequiredArrayItem(String nullableRequire */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("nullable_required_array") public List getNullableRequiredArray() { return nullableRequiredArray; } @@ -129,6 +127,7 @@ public ContainerDefaultValue addRequiredArrayItem(String requiredArrayItem) { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("required_array") public List getRequiredArray() { return requiredArray; } @@ -156,6 +155,7 @@ public ContainerDefaultValue addNullableArrayWithDefaultItem(String nullableArra */ @ApiModelProperty(value = "") + @JsonProperty("nullable_array_with_default") public List getNullableArrayWithDefault() { return nullableArrayWithDefault; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 67bf9c73d2f4..514188584da7 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -24,10 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FileSchemaTestClass { - @JsonProperty("file") private File file; - @JsonProperty("files") @Valid private List<@Valid File> files; @@ -42,6 +40,7 @@ public FileSchemaTestClass file(File file) { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("file") public File getFile() { return file; } @@ -69,6 +68,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("files") public List<@Valid File> getFiles() { return files; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java index 84968c2299d7..db4b7dab2fc1 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java @@ -29,20 +29,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private Set photoUrls = new LinkedHashSet<>(); - @JsonProperty("tags") @Valid private List<@Valid Tag> tags; @@ -83,7 +78,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; /** @@ -114,6 +108,7 @@ public Pet id(Long id) { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -133,6 +128,7 @@ public Pet category(Category category) { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("category") public Category getCategory() { return category; } @@ -152,6 +148,7 @@ public Pet name(String name) { */ @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") + @JsonProperty("name") public String getName() { return name; } @@ -179,6 +176,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("photoUrls") public Set getPhotoUrls() { return photoUrls; } @@ -207,6 +205,7 @@ public Pet addTagsItem(Tag tagsItem) { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -226,6 +225,7 @@ public Pet status(StatusEnum status) { */ @ApiModelProperty(value = "pet status in the store") + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java new file mode 100644 index 000000000000..386aaf06884d --- /dev/null +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java @@ -0,0 +1,155 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * ResponseObjectWithDifferentFieldNames + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public class ResponseObjectWithDifferentFieldNames { + + private String normalPropertyName; + + private String UPPER_CASE_PROPERTY_SNAKE; + + private String lowerCasePropertyDashes; + + private String propertyNameWithSpaces; + + public ResponseObjectWithDifferentFieldNames normalPropertyName(String normalPropertyName) { + this.normalPropertyName = normalPropertyName; + return this; + } + + /** + * Get normalPropertyName + * @return normalPropertyName + */ + + @ApiModelProperty(value = "") + @JsonProperty("normalPropertyName") + public String getNormalPropertyName() { + return normalPropertyName; + } + + public void setNormalPropertyName(String normalPropertyName) { + this.normalPropertyName = normalPropertyName; + } + + public ResponseObjectWithDifferentFieldNames UPPER_CASE_PROPERTY_SNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; + return this; + } + + /** + * Get UPPER_CASE_PROPERTY_SNAKE + * @return UPPER_CASE_PROPERTY_SNAKE + */ + + @ApiModelProperty(value = "") + @JsonProperty("UPPER_CASE_PROPERTY_SNAKE") + public String getUPPERCASEPROPERTYSNAKE() { + return UPPER_CASE_PROPERTY_SNAKE; + } + + public void setUPPERCASEPROPERTYSNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; + } + + public ResponseObjectWithDifferentFieldNames lowerCasePropertyDashes(String lowerCasePropertyDashes) { + this.lowerCasePropertyDashes = lowerCasePropertyDashes; + return this; + } + + /** + * Get lowerCasePropertyDashes + * @return lowerCasePropertyDashes + */ + + @ApiModelProperty(value = "") + @JsonProperty("lower-case-property-dashes") + public String getLowerCasePropertyDashes() { + return lowerCasePropertyDashes; + } + + public void setLowerCasePropertyDashes(String lowerCasePropertyDashes) { + this.lowerCasePropertyDashes = lowerCasePropertyDashes; + } + + public ResponseObjectWithDifferentFieldNames propertyNameWithSpaces(String propertyNameWithSpaces) { + this.propertyNameWithSpaces = propertyNameWithSpaces; + return this; + } + + /** + * Get propertyNameWithSpaces + * @return propertyNameWithSpaces + */ + + @ApiModelProperty(value = "") + @JsonProperty("property name with spaces") + public String getPropertyNameWithSpaces() { + return propertyNameWithSpaces; + } + + public void setPropertyNameWithSpaces(String propertyNameWithSpaces) { + this.propertyNameWithSpaces = propertyNameWithSpaces; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ResponseObjectWithDifferentFieldNames responseObjectWithDifferentFieldNames = (ResponseObjectWithDifferentFieldNames) o; + return Objects.equals(this.normalPropertyName, responseObjectWithDifferentFieldNames.normalPropertyName) && + Objects.equals(this.UPPER_CASE_PROPERTY_SNAKE, responseObjectWithDifferentFieldNames.UPPER_CASE_PROPERTY_SNAKE) && + Objects.equals(this.lowerCasePropertyDashes, responseObjectWithDifferentFieldNames.lowerCasePropertyDashes) && + Objects.equals(this.propertyNameWithSpaces, responseObjectWithDifferentFieldNames.propertyNameWithSpaces); + } + + @Override + public int hashCode() { + return Objects.hash(normalPropertyName, UPPER_CASE_PROPERTY_SNAKE, lowerCasePropertyDashes, propertyNameWithSpaces); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ResponseObjectWithDifferentFieldNames {\n"); + sb.append(" normalPropertyName: ").append(toIndentedString(normalPropertyName)).append("\n"); + sb.append(" UPPER_CASE_PROPERTY_SNAKE: ").append(toIndentedString(UPPER_CASE_PROPERTY_SNAKE)).append("\n"); + sb.append(" lowerCasePropertyDashes: ").append(toIndentedString(lowerCasePropertyDashes)).append("\n"); + sb.append(" propertyNameWithSpaces: ").append(toIndentedString(propertyNameWithSpaces)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java index ac1c34f7878c..1f070eb65c82 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -24,19 +24,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderDefault { - @JsonProperty("string_item") private String stringItem = "what"; - @JsonProperty("number_item") private BigDecimal numberItem = new BigDecimal("1.234"); - @JsonProperty("integer_item") private Integer integerItem = -2; - @JsonProperty("bool_item") private Boolean boolItem = true; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); @@ -71,6 +66,7 @@ public TypeHolderDefault stringItem(String stringItem) { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -90,6 +86,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) { */ @NotNull @Valid @ApiModelProperty(required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -109,6 +106,7 @@ public TypeHolderDefault integerItem(Integer integerItem) { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -128,6 +126,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -155,6 +154,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java index ee14d628a10a..19956d3114db 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -24,22 +24,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderExample { - @JsonProperty("string_item") private String stringItem; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("float_item") private Float floatItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -75,6 +69,7 @@ public TypeHolderExample stringItem(String stringItem) { */ @NotNull @ApiModelProperty(example = "what", required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -94,6 +89,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { */ @NotNull @Valid @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -113,6 +109,7 @@ public TypeHolderExample floatItem(Float floatItem) { */ @NotNull @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("float_item") public Float getFloatItem() { return floatItem; } @@ -132,6 +129,7 @@ public TypeHolderExample integerItem(Integer integerItem) { */ @NotNull @ApiModelProperty(example = "-2", required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -151,6 +149,7 @@ public TypeHolderExample boolItem(Boolean boolItem) { */ @NotNull @ApiModelProperty(example = "true", required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -178,6 +177,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { */ @NotNull @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/resources/openapi.yaml index 1fa32524cf2f..260abafd6eaa 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/resources/openapi.yaml @@ -1174,6 +1174,31 @@ paths: x-accepts: application/json x-tags: - tag: pet + /fake/{petId}/response-object-different-names: + get: + operationId: responseObjectDifferentNames + parameters: + - description: ID of pet to update + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ResponseObjectWithDifferentFieldNames' + description: successful operation + tags: + - pet + x-accepts: application/json + x-tags: + - tag: pet components: requestBodies: UserArray: @@ -2114,6 +2139,22 @@ components: - nullable_required_array - required_array type: object + ResponseObjectWithDifferentFieldNames: + example: + UPPER_CASE_PROPERTY_SNAKE: UPPER_CASE_PROPERTY_SNAKE + lower-case-property-dashes: lower-case-property-dashes + property name with spaces: property name with spaces + normalPropertyName: normalPropertyName + properties: + normalPropertyName: + type: string + UPPER_CASE_PROPERTY_SNAKE: + type: string + lower-case-property-dashes: + type: string + property name with spaces: + type: string + type: object updatePetWithForm_request: properties: name: diff --git a/samples/server/petstore/springboot-beanvalidation/.openapi-generator/FILES b/samples/server/petstore/springboot-beanvalidation/.openapi-generator/FILES index 9ecdb11614b2..d46ab21480e3 100644 --- a/samples/server/petstore/springboot-beanvalidation/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-beanvalidation/.openapi-generator/FILES @@ -61,6 +61,7 @@ src/main/java/org/openapitools/model/OuterComposite.java src/main/java/org/openapitools/model/OuterEnum.java src/main/java/org/openapitools/model/Pet.java src/main/java/org/openapitools/model/ReadOnlyFirst.java +src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java src/main/java/org/openapitools/model/SpecialModelName.java src/main/java/org/openapitools/model/Tag.java src/main/java/org/openapitools/model/TypeHolderDefault.java 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 edf5c41ea0fc..046ebd0a351a 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,6 +14,7 @@ import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ResponseObjectWithDifferentFieldNames; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import io.swagger.annotations.*; @@ -203,6 +204,44 @@ default ResponseEntity fakeOuterStringSerialize( } + /** + * GET /fake/{petId}/response-object-different-names + * + * @param petId ID of pet to update (required) + * @return successful operation (status code 200) + */ + @ApiOperation( + tags = { "pet" }, + value = "", + nickname = "responseObjectDifferentNames", + notes = "", + response = ResponseObjectWithDifferentFieldNames.class + ) + @ApiResponses({ + @ApiResponse(code = 200, message = "successful operation", response = ResponseObjectWithDifferentFieldNames.class) + }) + @RequestMapping( + method = RequestMethod.GET, + value = "/fake/{petId}/response-object-different-names", + produces = { "application/json" } + ) + default ResponseEntity responseObjectDifferentNames( + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId + ) { + getRequest().ifPresent(request -> { + for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { + if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { + String exampleString = "{ \"UPPER_CASE_PROPERTY_SNAKE\" : \"UPPER_CASE_PROPERTY_SNAKE\", \"lower-case-property-dashes\" : \"lower-case-property-dashes\", \"property name with spaces\" : \"property name with spaces\", \"normalPropertyName\" : \"normalPropertyName\" }"; + ApiUtil.setExampleResponse(request, "application/json", exampleString); + break; + } + } + }); + return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); + + } + + /** * PUT /fake/body-with-file-schema * For this test, the body for this request much reference a schema named `File`. diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApiController.java index 5ae5d5fed985..9121a3951829 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApiController.java @@ -9,6 +9,7 @@ import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ResponseObjectWithDifferentFieldNames; import org.openapitools.model.User; import org.openapitools.model.XmlItem; diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 4d0595e38d0f..34712a94057a 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -29,45 +29,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesClass { - @JsonProperty("map_string") @Valid private Map mapString = new HashMap<>(); - @JsonProperty("map_number") @Valid private Map mapNumber = new HashMap<>(); - @JsonProperty("map_integer") @Valid private Map mapInteger = new HashMap<>(); - @JsonProperty("map_boolean") @Valid private Map mapBoolean = new HashMap<>(); - @JsonProperty("map_array_integer") @Valid private Map> mapArrayInteger = new HashMap<>(); - @JsonProperty("map_array_anytype") @Valid private Map> mapArrayAnytype = new HashMap<>(); - @JsonProperty("map_map_string") @Valid private Map> mapMapString = new HashMap<>(); - @JsonProperty("map_map_anytype") @Valid private Map> mapMapAnytype = new HashMap<>(); - @JsonProperty("anytype_1") private Object anytype1; - @JsonProperty("anytype_2") private JsonNullable anytype2 = JsonNullable.undefined(); - @JsonProperty("anytype_3") private Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { @@ -89,6 +78,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt */ @ApiModelProperty(value = "") + @JsonProperty("map_string") public Map getMapString() { return mapString; } @@ -116,6 +106,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_number") public Map getMapNumber() { return mapNumber; } @@ -143,6 +134,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege */ @ApiModelProperty(value = "") + @JsonProperty("map_integer") public Map getMapInteger() { return mapInteger; } @@ -170,6 +162,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea */ @ApiModelProperty(value = "") + @JsonProperty("map_boolean") public Map getMapBoolean() { return mapBoolean; } @@ -197,6 +190,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { return mapArrayInteger; } @@ -224,6 +218,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { return mapArrayAnytype; } @@ -251,6 +246,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { return mapMapString; } @@ -278,6 +274,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { return mapMapAnytype; } @@ -297,6 +294,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) { */ @ApiModelProperty(value = "") + @JsonProperty("anytype_1") public Object getAnytype1() { return anytype1; } @@ -316,6 +314,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) { */ @ApiModelProperty(value = "") + @JsonProperty("anytype_2") public JsonNullable getAnytype2() { return anytype2; } @@ -335,6 +334,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) { */ @ApiModelProperty(value = "") + @JsonProperty("anytype_3") public Object getAnytype3() { return anytype3; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ContainerDefaultValue.java index f513931c7181..5da3d386b4d4 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -27,19 +27,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ContainerDefaultValue { - @JsonProperty("nullable_array") @Valid private JsonNullable> nullableArray = JsonNullable.undefined(); - @JsonProperty("nullable_required_array") @Valid private JsonNullable> nullableRequiredArray = JsonNullable.undefined(); - @JsonProperty("required_array") @Valid private List requiredArray = new ArrayList<>(); - @JsonProperty("nullable_array_with_default") @Valid private JsonNullable> nullableArrayWithDefault = JsonNullable.undefined(); @@ -79,6 +75,7 @@ public ContainerDefaultValue addNullableArrayItem(String nullableArrayItem) { */ @ApiModelProperty(value = "") + @JsonProperty("nullable_array") public JsonNullable> getNullableArray() { return nullableArray; } @@ -106,6 +103,7 @@ public ContainerDefaultValue addNullableRequiredArrayItem(String nullableRequire */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("nullable_required_array") public JsonNullable> getNullableRequiredArray() { return nullableRequiredArray; } @@ -133,6 +131,7 @@ public ContainerDefaultValue addRequiredArrayItem(String requiredArrayItem) { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("required_array") public List getRequiredArray() { return requiredArray; } @@ -160,6 +159,7 @@ public ContainerDefaultValue addNullableArrayWithDefaultItem(String nullableArra */ @ApiModelProperty(value = "") + @JsonProperty("nullable_array_with_default") public JsonNullable> getNullableArrayWithDefault() { return nullableArrayWithDefault; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 5bac01151ba3..e1106056505e 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -25,10 +25,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FileSchemaTestClass { - @JsonProperty("file") private File file; - @JsonProperty("files") @Valid private List<@Valid File> files; @@ -43,6 +41,7 @@ public FileSchemaTestClass file(File file) { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("file") public File getFile() { return file; } @@ -70,6 +69,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("files") public List<@Valid File> getFiles() { return files; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Pet.java index da6c47fcc8bb..159881692803 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Pet.java @@ -30,20 +30,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private Set photoUrls = new LinkedHashSet<>(); - @JsonProperty("tags") @Valid private List<@Valid Tag> tags; @@ -84,7 +79,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; /** @@ -115,6 +109,7 @@ public Pet id(Long id) { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -134,6 +129,7 @@ public Pet category(Category category) { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("category") public Category getCategory() { return category; } @@ -153,6 +149,7 @@ public Pet name(String name) { */ @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") + @JsonProperty("name") public String getName() { return name; } @@ -180,6 +177,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("photoUrls") public Set getPhotoUrls() { return photoUrls; } @@ -208,6 +206,7 @@ public Pet addTagsItem(Tag tagsItem) { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -227,6 +226,7 @@ public Pet status(StatusEnum status) { */ @ApiModelProperty(value = "pet status in the store") + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java new file mode 100644 index 000000000000..187960e94e4b --- /dev/null +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java @@ -0,0 +1,156 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * ResponseObjectWithDifferentFieldNames + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public class ResponseObjectWithDifferentFieldNames { + + private String normalPropertyName; + + private String UPPER_CASE_PROPERTY_SNAKE; + + private String lowerCasePropertyDashes; + + private String propertyNameWithSpaces; + + public ResponseObjectWithDifferentFieldNames normalPropertyName(String normalPropertyName) { + this.normalPropertyName = normalPropertyName; + return this; + } + + /** + * Get normalPropertyName + * @return normalPropertyName + */ + + @ApiModelProperty(value = "") + @JsonProperty("normalPropertyName") + public String getNormalPropertyName() { + return normalPropertyName; + } + + public void setNormalPropertyName(String normalPropertyName) { + this.normalPropertyName = normalPropertyName; + } + + public ResponseObjectWithDifferentFieldNames UPPER_CASE_PROPERTY_SNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; + return this; + } + + /** + * Get UPPER_CASE_PROPERTY_SNAKE + * @return UPPER_CASE_PROPERTY_SNAKE + */ + + @ApiModelProperty(value = "") + @JsonProperty("UPPER_CASE_PROPERTY_SNAKE") + public String getUPPERCASEPROPERTYSNAKE() { + return UPPER_CASE_PROPERTY_SNAKE; + } + + public void setUPPERCASEPROPERTYSNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; + } + + public ResponseObjectWithDifferentFieldNames lowerCasePropertyDashes(String lowerCasePropertyDashes) { + this.lowerCasePropertyDashes = lowerCasePropertyDashes; + return this; + } + + /** + * Get lowerCasePropertyDashes + * @return lowerCasePropertyDashes + */ + + @ApiModelProperty(value = "") + @JsonProperty("lower-case-property-dashes") + public String getLowerCasePropertyDashes() { + return lowerCasePropertyDashes; + } + + public void setLowerCasePropertyDashes(String lowerCasePropertyDashes) { + this.lowerCasePropertyDashes = lowerCasePropertyDashes; + } + + public ResponseObjectWithDifferentFieldNames propertyNameWithSpaces(String propertyNameWithSpaces) { + this.propertyNameWithSpaces = propertyNameWithSpaces; + return this; + } + + /** + * Get propertyNameWithSpaces + * @return propertyNameWithSpaces + */ + + @ApiModelProperty(value = "") + @JsonProperty("property name with spaces") + public String getPropertyNameWithSpaces() { + return propertyNameWithSpaces; + } + + public void setPropertyNameWithSpaces(String propertyNameWithSpaces) { + this.propertyNameWithSpaces = propertyNameWithSpaces; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ResponseObjectWithDifferentFieldNames responseObjectWithDifferentFieldNames = (ResponseObjectWithDifferentFieldNames) o; + return Objects.equals(this.normalPropertyName, responseObjectWithDifferentFieldNames.normalPropertyName) && + Objects.equals(this.UPPER_CASE_PROPERTY_SNAKE, responseObjectWithDifferentFieldNames.UPPER_CASE_PROPERTY_SNAKE) && + Objects.equals(this.lowerCasePropertyDashes, responseObjectWithDifferentFieldNames.lowerCasePropertyDashes) && + Objects.equals(this.propertyNameWithSpaces, responseObjectWithDifferentFieldNames.propertyNameWithSpaces); + } + + @Override + public int hashCode() { + return Objects.hash(normalPropertyName, UPPER_CASE_PROPERTY_SNAKE, lowerCasePropertyDashes, propertyNameWithSpaces); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ResponseObjectWithDifferentFieldNames {\n"); + sb.append(" normalPropertyName: ").append(toIndentedString(normalPropertyName)).append("\n"); + sb.append(" UPPER_CASE_PROPERTY_SNAKE: ").append(toIndentedString(UPPER_CASE_PROPERTY_SNAKE)).append("\n"); + sb.append(" lowerCasePropertyDashes: ").append(toIndentedString(lowerCasePropertyDashes)).append("\n"); + sb.append(" propertyNameWithSpaces: ").append(toIndentedString(propertyNameWithSpaces)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderDefault.java index 7654de1cd322..da676b10f0df 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -25,19 +25,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderDefault { - @JsonProperty("string_item") private String stringItem = "what"; - @JsonProperty("number_item") private BigDecimal numberItem = new BigDecimal("1.234"); - @JsonProperty("integer_item") private Integer integerItem = -2; - @JsonProperty("bool_item") private Boolean boolItem = true; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); @@ -72,6 +67,7 @@ public TypeHolderDefault stringItem(String stringItem) { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -91,6 +87,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) { */ @NotNull @Valid @ApiModelProperty(required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -110,6 +107,7 @@ public TypeHolderDefault integerItem(Integer integerItem) { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -129,6 +127,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -156,6 +155,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderExample.java index da3cb34f1e7b..bbc653f248a2 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -25,22 +25,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderExample { - @JsonProperty("string_item") private String stringItem; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("float_item") private Float floatItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -76,6 +70,7 @@ public TypeHolderExample stringItem(String stringItem) { */ @NotNull @ApiModelProperty(example = "what", required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -95,6 +90,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { */ @NotNull @Valid @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -114,6 +110,7 @@ public TypeHolderExample floatItem(Float floatItem) { */ @NotNull @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("float_item") public Float getFloatItem() { return floatItem; } @@ -133,6 +130,7 @@ public TypeHolderExample integerItem(Integer integerItem) { */ @NotNull @ApiModelProperty(example = "-2", required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -152,6 +150,7 @@ public TypeHolderExample boolItem(Boolean boolItem) { */ @NotNull @ApiModelProperty(example = "true", required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -179,6 +178,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { */ @NotNull @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-beanvalidation/src/main/resources/openapi.yaml index 1fa32524cf2f..260abafd6eaa 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-beanvalidation/src/main/resources/openapi.yaml @@ -1174,6 +1174,31 @@ paths: x-accepts: application/json x-tags: - tag: pet + /fake/{petId}/response-object-different-names: + get: + operationId: responseObjectDifferentNames + parameters: + - description: ID of pet to update + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ResponseObjectWithDifferentFieldNames' + description: successful operation + tags: + - pet + x-accepts: application/json + x-tags: + - tag: pet components: requestBodies: UserArray: @@ -2114,6 +2139,22 @@ components: - nullable_required_array - required_array type: object + ResponseObjectWithDifferentFieldNames: + example: + UPPER_CASE_PROPERTY_SNAKE: UPPER_CASE_PROPERTY_SNAKE + lower-case-property-dashes: lower-case-property-dashes + property name with spaces: property name with spaces + normalPropertyName: normalPropertyName + properties: + normalPropertyName: + type: string + UPPER_CASE_PROPERTY_SNAKE: + type: string + lower-case-property-dashes: + type: string + property name with spaces: + type: string + type: object updatePetWithForm_request: properties: name: diff --git a/samples/server/petstore/springboot-delegate-j8/.openapi-generator/FILES b/samples/server/petstore/springboot-delegate-j8/.openapi-generator/FILES index 05fbaa353e8b..5789fc3c2952 100644 --- a/samples/server/petstore/springboot-delegate-j8/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-delegate-j8/.openapi-generator/FILES @@ -67,6 +67,7 @@ src/main/java/org/openapitools/model/OuterComposite.java src/main/java/org/openapitools/model/OuterEnum.java src/main/java/org/openapitools/model/Pet.java src/main/java/org/openapitools/model/ReadOnlyFirst.java +src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java src/main/java/org/openapitools/model/SpecialModelName.java src/main/java/org/openapitools/model/Tag.java src/main/java/org/openapitools/model/TypeHolderDefault.java 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 ae78c71d5303..19557bc37d06 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,6 +14,7 @@ import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ResponseObjectWithDifferentFieldNames; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import io.swagger.annotations.*; @@ -185,6 +186,34 @@ default ResponseEntity fakeOuterStringSerialize( } + /** + * GET /fake/{petId}/response-object-different-names + * + * @param petId ID of pet to update (required) + * @return successful operation (status code 200) + */ + @ApiOperation( + tags = { "pet" }, + value = "", + nickname = "responseObjectDifferentNames", + notes = "", + response = ResponseObjectWithDifferentFieldNames.class + ) + @ApiResponses({ + @ApiResponse(code = 200, message = "successful operation", response = ResponseObjectWithDifferentFieldNames.class) + }) + @RequestMapping( + method = RequestMethod.GET, + value = "/fake/{petId}/response-object-different-names", + produces = { "application/json" } + ) + default ResponseEntity responseObjectDifferentNames( + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId + ) { + return getDelegate().responseObjectDifferentNames(petId); + } + + /** * PUT /fake/body-with-file-schema * For this test, the body for this request much reference a schema named `File`. diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiController.java index 726b17779f18..b88f61719554 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiController.java @@ -9,6 +9,7 @@ import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ResponseObjectWithDifferentFieldNames; import org.openapitools.model.User; import org.openapitools.model.XmlItem; 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 d1a650378e63..65ea3c13eae9 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,6 +9,7 @@ import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ResponseObjectWithDifferentFieldNames; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import org.springframework.http.HttpStatus; @@ -107,6 +108,27 @@ default ResponseEntity fakeOuterStringSerialize(String body) { } + /** + * GET /fake/{petId}/response-object-different-names + * + * @param petId ID of pet to update (required) + * @return successful operation (status code 200) + * @see FakeApi#responseObjectDifferentNames + */ + default ResponseEntity responseObjectDifferentNames(Long petId) { + getRequest().ifPresent(request -> { + for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { + if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { + String exampleString = "{ \"UPPER_CASE_PROPERTY_SNAKE\" : \"UPPER_CASE_PROPERTY_SNAKE\", \"lower-case-property-dashes\" : \"lower-case-property-dashes\", \"property name with spaces\" : \"property name with spaces\", \"normalPropertyName\" : \"normalPropertyName\" }"; + ApiUtil.setExampleResponse(request, "application/json", exampleString); + break; + } + } + }); + return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); + + } + /** * PUT /fake/body-with-file-schema * For this test, the body for this request much reference a schema named `File`. diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 4d0595e38d0f..34712a94057a 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -29,45 +29,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesClass { - @JsonProperty("map_string") @Valid private Map mapString = new HashMap<>(); - @JsonProperty("map_number") @Valid private Map mapNumber = new HashMap<>(); - @JsonProperty("map_integer") @Valid private Map mapInteger = new HashMap<>(); - @JsonProperty("map_boolean") @Valid private Map mapBoolean = new HashMap<>(); - @JsonProperty("map_array_integer") @Valid private Map> mapArrayInteger = new HashMap<>(); - @JsonProperty("map_array_anytype") @Valid private Map> mapArrayAnytype = new HashMap<>(); - @JsonProperty("map_map_string") @Valid private Map> mapMapString = new HashMap<>(); - @JsonProperty("map_map_anytype") @Valid private Map> mapMapAnytype = new HashMap<>(); - @JsonProperty("anytype_1") private Object anytype1; - @JsonProperty("anytype_2") private JsonNullable anytype2 = JsonNullable.undefined(); - @JsonProperty("anytype_3") private Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { @@ -89,6 +78,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt */ @ApiModelProperty(value = "") + @JsonProperty("map_string") public Map getMapString() { return mapString; } @@ -116,6 +106,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_number") public Map getMapNumber() { return mapNumber; } @@ -143,6 +134,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege */ @ApiModelProperty(value = "") + @JsonProperty("map_integer") public Map getMapInteger() { return mapInteger; } @@ -170,6 +162,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea */ @ApiModelProperty(value = "") + @JsonProperty("map_boolean") public Map getMapBoolean() { return mapBoolean; } @@ -197,6 +190,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { return mapArrayInteger; } @@ -224,6 +218,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { return mapArrayAnytype; } @@ -251,6 +246,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { return mapMapString; } @@ -278,6 +274,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { return mapMapAnytype; } @@ -297,6 +294,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) { */ @ApiModelProperty(value = "") + @JsonProperty("anytype_1") public Object getAnytype1() { return anytype1; } @@ -316,6 +314,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) { */ @ApiModelProperty(value = "") + @JsonProperty("anytype_2") public JsonNullable getAnytype2() { return anytype2; } @@ -335,6 +334,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) { */ @ApiModelProperty(value = "") + @JsonProperty("anytype_3") public Object getAnytype3() { return anytype3; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ContainerDefaultValue.java index f513931c7181..5da3d386b4d4 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -27,19 +27,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ContainerDefaultValue { - @JsonProperty("nullable_array") @Valid private JsonNullable> nullableArray = JsonNullable.undefined(); - @JsonProperty("nullable_required_array") @Valid private JsonNullable> nullableRequiredArray = JsonNullable.undefined(); - @JsonProperty("required_array") @Valid private List requiredArray = new ArrayList<>(); - @JsonProperty("nullable_array_with_default") @Valid private JsonNullable> nullableArrayWithDefault = JsonNullable.undefined(); @@ -79,6 +75,7 @@ public ContainerDefaultValue addNullableArrayItem(String nullableArrayItem) { */ @ApiModelProperty(value = "") + @JsonProperty("nullable_array") public JsonNullable> getNullableArray() { return nullableArray; } @@ -106,6 +103,7 @@ public ContainerDefaultValue addNullableRequiredArrayItem(String nullableRequire */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("nullable_required_array") public JsonNullable> getNullableRequiredArray() { return nullableRequiredArray; } @@ -133,6 +131,7 @@ public ContainerDefaultValue addRequiredArrayItem(String requiredArrayItem) { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("required_array") public List getRequiredArray() { return requiredArray; } @@ -160,6 +159,7 @@ public ContainerDefaultValue addNullableArrayWithDefaultItem(String nullableArra */ @ApiModelProperty(value = "") + @JsonProperty("nullable_array_with_default") public JsonNullable> getNullableArrayWithDefault() { return nullableArrayWithDefault; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 5bac01151ba3..e1106056505e 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -25,10 +25,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FileSchemaTestClass { - @JsonProperty("file") private File file; - @JsonProperty("files") @Valid private List<@Valid File> files; @@ -43,6 +41,7 @@ public FileSchemaTestClass file(File file) { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("file") public File getFile() { return file; } @@ -70,6 +69,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("files") public List<@Valid File> getFiles() { return files; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Pet.java index da6c47fcc8bb..159881692803 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Pet.java @@ -30,20 +30,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private Set photoUrls = new LinkedHashSet<>(); - @JsonProperty("tags") @Valid private List<@Valid Tag> tags; @@ -84,7 +79,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; /** @@ -115,6 +109,7 @@ public Pet id(Long id) { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -134,6 +129,7 @@ public Pet category(Category category) { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("category") public Category getCategory() { return category; } @@ -153,6 +149,7 @@ public Pet name(String name) { */ @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") + @JsonProperty("name") public String getName() { return name; } @@ -180,6 +177,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("photoUrls") public Set getPhotoUrls() { return photoUrls; } @@ -208,6 +206,7 @@ public Pet addTagsItem(Tag tagsItem) { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -227,6 +226,7 @@ public Pet status(StatusEnum status) { */ @ApiModelProperty(value = "pet status in the store") + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java new file mode 100644 index 000000000000..187960e94e4b --- /dev/null +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java @@ -0,0 +1,156 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * ResponseObjectWithDifferentFieldNames + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public class ResponseObjectWithDifferentFieldNames { + + private String normalPropertyName; + + private String UPPER_CASE_PROPERTY_SNAKE; + + private String lowerCasePropertyDashes; + + private String propertyNameWithSpaces; + + public ResponseObjectWithDifferentFieldNames normalPropertyName(String normalPropertyName) { + this.normalPropertyName = normalPropertyName; + return this; + } + + /** + * Get normalPropertyName + * @return normalPropertyName + */ + + @ApiModelProperty(value = "") + @JsonProperty("normalPropertyName") + public String getNormalPropertyName() { + return normalPropertyName; + } + + public void setNormalPropertyName(String normalPropertyName) { + this.normalPropertyName = normalPropertyName; + } + + public ResponseObjectWithDifferentFieldNames UPPER_CASE_PROPERTY_SNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; + return this; + } + + /** + * Get UPPER_CASE_PROPERTY_SNAKE + * @return UPPER_CASE_PROPERTY_SNAKE + */ + + @ApiModelProperty(value = "") + @JsonProperty("UPPER_CASE_PROPERTY_SNAKE") + public String getUPPERCASEPROPERTYSNAKE() { + return UPPER_CASE_PROPERTY_SNAKE; + } + + public void setUPPERCASEPROPERTYSNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; + } + + public ResponseObjectWithDifferentFieldNames lowerCasePropertyDashes(String lowerCasePropertyDashes) { + this.lowerCasePropertyDashes = lowerCasePropertyDashes; + return this; + } + + /** + * Get lowerCasePropertyDashes + * @return lowerCasePropertyDashes + */ + + @ApiModelProperty(value = "") + @JsonProperty("lower-case-property-dashes") + public String getLowerCasePropertyDashes() { + return lowerCasePropertyDashes; + } + + public void setLowerCasePropertyDashes(String lowerCasePropertyDashes) { + this.lowerCasePropertyDashes = lowerCasePropertyDashes; + } + + public ResponseObjectWithDifferentFieldNames propertyNameWithSpaces(String propertyNameWithSpaces) { + this.propertyNameWithSpaces = propertyNameWithSpaces; + return this; + } + + /** + * Get propertyNameWithSpaces + * @return propertyNameWithSpaces + */ + + @ApiModelProperty(value = "") + @JsonProperty("property name with spaces") + public String getPropertyNameWithSpaces() { + return propertyNameWithSpaces; + } + + public void setPropertyNameWithSpaces(String propertyNameWithSpaces) { + this.propertyNameWithSpaces = propertyNameWithSpaces; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ResponseObjectWithDifferentFieldNames responseObjectWithDifferentFieldNames = (ResponseObjectWithDifferentFieldNames) o; + return Objects.equals(this.normalPropertyName, responseObjectWithDifferentFieldNames.normalPropertyName) && + Objects.equals(this.UPPER_CASE_PROPERTY_SNAKE, responseObjectWithDifferentFieldNames.UPPER_CASE_PROPERTY_SNAKE) && + Objects.equals(this.lowerCasePropertyDashes, responseObjectWithDifferentFieldNames.lowerCasePropertyDashes) && + Objects.equals(this.propertyNameWithSpaces, responseObjectWithDifferentFieldNames.propertyNameWithSpaces); + } + + @Override + public int hashCode() { + return Objects.hash(normalPropertyName, UPPER_CASE_PROPERTY_SNAKE, lowerCasePropertyDashes, propertyNameWithSpaces); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ResponseObjectWithDifferentFieldNames {\n"); + sb.append(" normalPropertyName: ").append(toIndentedString(normalPropertyName)).append("\n"); + sb.append(" UPPER_CASE_PROPERTY_SNAKE: ").append(toIndentedString(UPPER_CASE_PROPERTY_SNAKE)).append("\n"); + sb.append(" lowerCasePropertyDashes: ").append(toIndentedString(lowerCasePropertyDashes)).append("\n"); + sb.append(" propertyNameWithSpaces: ").append(toIndentedString(propertyNameWithSpaces)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java index 7654de1cd322..da676b10f0df 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -25,19 +25,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderDefault { - @JsonProperty("string_item") private String stringItem = "what"; - @JsonProperty("number_item") private BigDecimal numberItem = new BigDecimal("1.234"); - @JsonProperty("integer_item") private Integer integerItem = -2; - @JsonProperty("bool_item") private Boolean boolItem = true; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); @@ -72,6 +67,7 @@ public TypeHolderDefault stringItem(String stringItem) { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -91,6 +87,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) { */ @NotNull @Valid @ApiModelProperty(required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -110,6 +107,7 @@ public TypeHolderDefault integerItem(Integer integerItem) { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -129,6 +127,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -156,6 +155,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderExample.java index da3cb34f1e7b..bbc653f248a2 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -25,22 +25,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderExample { - @JsonProperty("string_item") private String stringItem; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("float_item") private Float floatItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -76,6 +70,7 @@ public TypeHolderExample stringItem(String stringItem) { */ @NotNull @ApiModelProperty(example = "what", required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -95,6 +90,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { */ @NotNull @Valid @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -114,6 +110,7 @@ public TypeHolderExample floatItem(Float floatItem) { */ @NotNull @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("float_item") public Float getFloatItem() { return floatItem; } @@ -133,6 +130,7 @@ public TypeHolderExample integerItem(Integer integerItem) { */ @NotNull @ApiModelProperty(example = "-2", required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -152,6 +150,7 @@ public TypeHolderExample boolItem(Boolean boolItem) { */ @NotNull @ApiModelProperty(example = "true", required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -179,6 +178,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { */ @NotNull @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-delegate-j8/src/main/resources/openapi.yaml index 1fa32524cf2f..260abafd6eaa 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-delegate-j8/src/main/resources/openapi.yaml @@ -1174,6 +1174,31 @@ paths: x-accepts: application/json x-tags: - tag: pet + /fake/{petId}/response-object-different-names: + get: + operationId: responseObjectDifferentNames + parameters: + - description: ID of pet to update + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ResponseObjectWithDifferentFieldNames' + description: successful operation + tags: + - pet + x-accepts: application/json + x-tags: + - tag: pet components: requestBodies: UserArray: @@ -2114,6 +2139,22 @@ components: - nullable_required_array - required_array type: object + ResponseObjectWithDifferentFieldNames: + example: + UPPER_CASE_PROPERTY_SNAKE: UPPER_CASE_PROPERTY_SNAKE + lower-case-property-dashes: lower-case-property-dashes + property name with spaces: property name with spaces + normalPropertyName: normalPropertyName + properties: + normalPropertyName: + type: string + UPPER_CASE_PROPERTY_SNAKE: + type: string + lower-case-property-dashes: + type: string + property name with spaces: + type: string + type: object updatePetWithForm_request: properties: name: diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Pet.java index ce02f3c7d4e4..086df08a3ed0 100644 --- a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Pet.java @@ -28,20 +28,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private List photoUrls = new ArrayList<>(); - @JsonProperty("tags") @Valid private List<@Valid Tag> tags; @@ -82,7 +77,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; /** @@ -113,6 +107,7 @@ public Pet id(Long id) { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -132,6 +127,7 @@ public Pet category(Category category) { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("category") public Category getCategory() { return category; } @@ -151,6 +147,7 @@ public Pet name(String name) { */ @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") + @JsonProperty("name") public String getName() { return name; } @@ -178,6 +175,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; } @@ -205,6 +203,7 @@ public Pet addTagsItem(Tag tagsItem) { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -224,6 +223,7 @@ public Pet status(StatusEnum status) { */ @ApiModelProperty(value = "pet status in the store") + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/server/petstore/springboot-delegate/.openapi-generator/FILES b/samples/server/petstore/springboot-delegate/.openapi-generator/FILES index 05fbaa353e8b..5789fc3c2952 100644 --- a/samples/server/petstore/springboot-delegate/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-delegate/.openapi-generator/FILES @@ -67,6 +67,7 @@ src/main/java/org/openapitools/model/OuterComposite.java src/main/java/org/openapitools/model/OuterEnum.java src/main/java/org/openapitools/model/Pet.java src/main/java/org/openapitools/model/ReadOnlyFirst.java +src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java src/main/java/org/openapitools/model/SpecialModelName.java src/main/java/org/openapitools/model/Tag.java src/main/java/org/openapitools/model/TypeHolderDefault.java 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 ae78c71d5303..19557bc37d06 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,6 +14,7 @@ import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ResponseObjectWithDifferentFieldNames; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import io.swagger.annotations.*; @@ -185,6 +186,34 @@ default ResponseEntity fakeOuterStringSerialize( } + /** + * GET /fake/{petId}/response-object-different-names + * + * @param petId ID of pet to update (required) + * @return successful operation (status code 200) + */ + @ApiOperation( + tags = { "pet" }, + value = "", + nickname = "responseObjectDifferentNames", + notes = "", + response = ResponseObjectWithDifferentFieldNames.class + ) + @ApiResponses({ + @ApiResponse(code = 200, message = "successful operation", response = ResponseObjectWithDifferentFieldNames.class) + }) + @RequestMapping( + method = RequestMethod.GET, + value = "/fake/{petId}/response-object-different-names", + produces = { "application/json" } + ) + default ResponseEntity responseObjectDifferentNames( + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId + ) { + return getDelegate().responseObjectDifferentNames(petId); + } + + /** * PUT /fake/body-with-file-schema * For this test, the body for this request much reference a schema named `File`. diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java index 726b17779f18..b88f61719554 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java @@ -9,6 +9,7 @@ import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ResponseObjectWithDifferentFieldNames; import org.openapitools.model.User; import org.openapitools.model.XmlItem; 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 d1a650378e63..65ea3c13eae9 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,6 +9,7 @@ import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ResponseObjectWithDifferentFieldNames; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import org.springframework.http.HttpStatus; @@ -107,6 +108,27 @@ default ResponseEntity fakeOuterStringSerialize(String body) { } + /** + * GET /fake/{petId}/response-object-different-names + * + * @param petId ID of pet to update (required) + * @return successful operation (status code 200) + * @see FakeApi#responseObjectDifferentNames + */ + default ResponseEntity responseObjectDifferentNames(Long petId) { + getRequest().ifPresent(request -> { + for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { + if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { + String exampleString = "{ \"UPPER_CASE_PROPERTY_SNAKE\" : \"UPPER_CASE_PROPERTY_SNAKE\", \"lower-case-property-dashes\" : \"lower-case-property-dashes\", \"property name with spaces\" : \"property name with spaces\", \"normalPropertyName\" : \"normalPropertyName\" }"; + ApiUtil.setExampleResponse(request, "application/json", exampleString); + break; + } + } + }); + return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); + + } + /** * PUT /fake/body-with-file-schema * For this test, the body for this request much reference a schema named `File`. diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 4d0595e38d0f..34712a94057a 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -29,45 +29,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesClass { - @JsonProperty("map_string") @Valid private Map mapString = new HashMap<>(); - @JsonProperty("map_number") @Valid private Map mapNumber = new HashMap<>(); - @JsonProperty("map_integer") @Valid private Map mapInteger = new HashMap<>(); - @JsonProperty("map_boolean") @Valid private Map mapBoolean = new HashMap<>(); - @JsonProperty("map_array_integer") @Valid private Map> mapArrayInteger = new HashMap<>(); - @JsonProperty("map_array_anytype") @Valid private Map> mapArrayAnytype = new HashMap<>(); - @JsonProperty("map_map_string") @Valid private Map> mapMapString = new HashMap<>(); - @JsonProperty("map_map_anytype") @Valid private Map> mapMapAnytype = new HashMap<>(); - @JsonProperty("anytype_1") private Object anytype1; - @JsonProperty("anytype_2") private JsonNullable anytype2 = JsonNullable.undefined(); - @JsonProperty("anytype_3") private Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { @@ -89,6 +78,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt */ @ApiModelProperty(value = "") + @JsonProperty("map_string") public Map getMapString() { return mapString; } @@ -116,6 +106,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_number") public Map getMapNumber() { return mapNumber; } @@ -143,6 +134,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege */ @ApiModelProperty(value = "") + @JsonProperty("map_integer") public Map getMapInteger() { return mapInteger; } @@ -170,6 +162,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea */ @ApiModelProperty(value = "") + @JsonProperty("map_boolean") public Map getMapBoolean() { return mapBoolean; } @@ -197,6 +190,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { return mapArrayInteger; } @@ -224,6 +218,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { return mapArrayAnytype; } @@ -251,6 +246,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { return mapMapString; } @@ -278,6 +274,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { return mapMapAnytype; } @@ -297,6 +294,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) { */ @ApiModelProperty(value = "") + @JsonProperty("anytype_1") public Object getAnytype1() { return anytype1; } @@ -316,6 +314,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) { */ @ApiModelProperty(value = "") + @JsonProperty("anytype_2") public JsonNullable getAnytype2() { return anytype2; } @@ -335,6 +334,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) { */ @ApiModelProperty(value = "") + @JsonProperty("anytype_3") public Object getAnytype3() { return anytype3; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java index f513931c7181..5da3d386b4d4 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -27,19 +27,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ContainerDefaultValue { - @JsonProperty("nullable_array") @Valid private JsonNullable> nullableArray = JsonNullable.undefined(); - @JsonProperty("nullable_required_array") @Valid private JsonNullable> nullableRequiredArray = JsonNullable.undefined(); - @JsonProperty("required_array") @Valid private List requiredArray = new ArrayList<>(); - @JsonProperty("nullable_array_with_default") @Valid private JsonNullable> nullableArrayWithDefault = JsonNullable.undefined(); @@ -79,6 +75,7 @@ public ContainerDefaultValue addNullableArrayItem(String nullableArrayItem) { */ @ApiModelProperty(value = "") + @JsonProperty("nullable_array") public JsonNullable> getNullableArray() { return nullableArray; } @@ -106,6 +103,7 @@ public ContainerDefaultValue addNullableRequiredArrayItem(String nullableRequire */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("nullable_required_array") public JsonNullable> getNullableRequiredArray() { return nullableRequiredArray; } @@ -133,6 +131,7 @@ public ContainerDefaultValue addRequiredArrayItem(String requiredArrayItem) { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("required_array") public List getRequiredArray() { return requiredArray; } @@ -160,6 +159,7 @@ public ContainerDefaultValue addNullableArrayWithDefaultItem(String nullableArra */ @ApiModelProperty(value = "") + @JsonProperty("nullable_array_with_default") public JsonNullable> getNullableArrayWithDefault() { return nullableArrayWithDefault; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 5bac01151ba3..e1106056505e 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -25,10 +25,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FileSchemaTestClass { - @JsonProperty("file") private File file; - @JsonProperty("files") @Valid private List<@Valid File> files; @@ -43,6 +41,7 @@ public FileSchemaTestClass file(File file) { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("file") public File getFile() { return file; } @@ -70,6 +69,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("files") public List<@Valid File> getFiles() { return files; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java index da6c47fcc8bb..159881692803 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java @@ -30,20 +30,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private Set photoUrls = new LinkedHashSet<>(); - @JsonProperty("tags") @Valid private List<@Valid Tag> tags; @@ -84,7 +79,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; /** @@ -115,6 +109,7 @@ public Pet id(Long id) { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -134,6 +129,7 @@ public Pet category(Category category) { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("category") public Category getCategory() { return category; } @@ -153,6 +149,7 @@ public Pet name(String name) { */ @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") + @JsonProperty("name") public String getName() { return name; } @@ -180,6 +177,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("photoUrls") public Set getPhotoUrls() { return photoUrls; } @@ -208,6 +206,7 @@ public Pet addTagsItem(Tag tagsItem) { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -227,6 +226,7 @@ public Pet status(StatusEnum status) { */ @ApiModelProperty(value = "pet status in the store") + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java new file mode 100644 index 000000000000..187960e94e4b --- /dev/null +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java @@ -0,0 +1,156 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * ResponseObjectWithDifferentFieldNames + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public class ResponseObjectWithDifferentFieldNames { + + private String normalPropertyName; + + private String UPPER_CASE_PROPERTY_SNAKE; + + private String lowerCasePropertyDashes; + + private String propertyNameWithSpaces; + + public ResponseObjectWithDifferentFieldNames normalPropertyName(String normalPropertyName) { + this.normalPropertyName = normalPropertyName; + return this; + } + + /** + * Get normalPropertyName + * @return normalPropertyName + */ + + @ApiModelProperty(value = "") + @JsonProperty("normalPropertyName") + public String getNormalPropertyName() { + return normalPropertyName; + } + + public void setNormalPropertyName(String normalPropertyName) { + this.normalPropertyName = normalPropertyName; + } + + public ResponseObjectWithDifferentFieldNames UPPER_CASE_PROPERTY_SNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; + return this; + } + + /** + * Get UPPER_CASE_PROPERTY_SNAKE + * @return UPPER_CASE_PROPERTY_SNAKE + */ + + @ApiModelProperty(value = "") + @JsonProperty("UPPER_CASE_PROPERTY_SNAKE") + public String getUPPERCASEPROPERTYSNAKE() { + return UPPER_CASE_PROPERTY_SNAKE; + } + + public void setUPPERCASEPROPERTYSNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; + } + + public ResponseObjectWithDifferentFieldNames lowerCasePropertyDashes(String lowerCasePropertyDashes) { + this.lowerCasePropertyDashes = lowerCasePropertyDashes; + return this; + } + + /** + * Get lowerCasePropertyDashes + * @return lowerCasePropertyDashes + */ + + @ApiModelProperty(value = "") + @JsonProperty("lower-case-property-dashes") + public String getLowerCasePropertyDashes() { + return lowerCasePropertyDashes; + } + + public void setLowerCasePropertyDashes(String lowerCasePropertyDashes) { + this.lowerCasePropertyDashes = lowerCasePropertyDashes; + } + + public ResponseObjectWithDifferentFieldNames propertyNameWithSpaces(String propertyNameWithSpaces) { + this.propertyNameWithSpaces = propertyNameWithSpaces; + return this; + } + + /** + * Get propertyNameWithSpaces + * @return propertyNameWithSpaces + */ + + @ApiModelProperty(value = "") + @JsonProperty("property name with spaces") + public String getPropertyNameWithSpaces() { + return propertyNameWithSpaces; + } + + public void setPropertyNameWithSpaces(String propertyNameWithSpaces) { + this.propertyNameWithSpaces = propertyNameWithSpaces; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ResponseObjectWithDifferentFieldNames responseObjectWithDifferentFieldNames = (ResponseObjectWithDifferentFieldNames) o; + return Objects.equals(this.normalPropertyName, responseObjectWithDifferentFieldNames.normalPropertyName) && + Objects.equals(this.UPPER_CASE_PROPERTY_SNAKE, responseObjectWithDifferentFieldNames.UPPER_CASE_PROPERTY_SNAKE) && + Objects.equals(this.lowerCasePropertyDashes, responseObjectWithDifferentFieldNames.lowerCasePropertyDashes) && + Objects.equals(this.propertyNameWithSpaces, responseObjectWithDifferentFieldNames.propertyNameWithSpaces); + } + + @Override + public int hashCode() { + return Objects.hash(normalPropertyName, UPPER_CASE_PROPERTY_SNAKE, lowerCasePropertyDashes, propertyNameWithSpaces); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ResponseObjectWithDifferentFieldNames {\n"); + sb.append(" normalPropertyName: ").append(toIndentedString(normalPropertyName)).append("\n"); + sb.append(" UPPER_CASE_PROPERTY_SNAKE: ").append(toIndentedString(UPPER_CASE_PROPERTY_SNAKE)).append("\n"); + sb.append(" lowerCasePropertyDashes: ").append(toIndentedString(lowerCasePropertyDashes)).append("\n"); + sb.append(" propertyNameWithSpaces: ").append(toIndentedString(propertyNameWithSpaces)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java index 7654de1cd322..da676b10f0df 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -25,19 +25,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderDefault { - @JsonProperty("string_item") private String stringItem = "what"; - @JsonProperty("number_item") private BigDecimal numberItem = new BigDecimal("1.234"); - @JsonProperty("integer_item") private Integer integerItem = -2; - @JsonProperty("bool_item") private Boolean boolItem = true; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); @@ -72,6 +67,7 @@ public TypeHolderDefault stringItem(String stringItem) { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -91,6 +87,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) { */ @NotNull @Valid @ApiModelProperty(required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -110,6 +107,7 @@ public TypeHolderDefault integerItem(Integer integerItem) { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -129,6 +127,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -156,6 +155,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java index da3cb34f1e7b..bbc653f248a2 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -25,22 +25,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderExample { - @JsonProperty("string_item") private String stringItem; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("float_item") private Float floatItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -76,6 +70,7 @@ public TypeHolderExample stringItem(String stringItem) { */ @NotNull @ApiModelProperty(example = "what", required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -95,6 +90,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { */ @NotNull @Valid @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -114,6 +110,7 @@ public TypeHolderExample floatItem(Float floatItem) { */ @NotNull @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("float_item") public Float getFloatItem() { return floatItem; } @@ -133,6 +130,7 @@ public TypeHolderExample integerItem(Integer integerItem) { */ @NotNull @ApiModelProperty(example = "-2", required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -152,6 +150,7 @@ public TypeHolderExample boolItem(Boolean boolItem) { */ @NotNull @ApiModelProperty(example = "true", required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -179,6 +178,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { */ @NotNull @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-delegate/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-delegate/src/main/resources/openapi.yaml index 1fa32524cf2f..260abafd6eaa 100644 --- a/samples/server/petstore/springboot-delegate/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-delegate/src/main/resources/openapi.yaml @@ -1174,6 +1174,31 @@ paths: x-accepts: application/json x-tags: - tag: pet + /fake/{petId}/response-object-different-names: + get: + operationId: responseObjectDifferentNames + parameters: + - description: ID of pet to update + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ResponseObjectWithDifferentFieldNames' + description: successful operation + tags: + - pet + x-accepts: application/json + x-tags: + - tag: pet components: requestBodies: UserArray: @@ -2114,6 +2139,22 @@ components: - nullable_required_array - required_array type: object + ResponseObjectWithDifferentFieldNames: + example: + UPPER_CASE_PROPERTY_SNAKE: UPPER_CASE_PROPERTY_SNAKE + lower-case-property-dashes: lower-case-property-dashes + property name with spaces: property name with spaces + normalPropertyName: normalPropertyName + properties: + normalPropertyName: + type: string + UPPER_CASE_PROPERTY_SNAKE: + type: string + lower-case-property-dashes: + type: string + property name with spaces: + type: string + type: object updatePetWithForm_request: properties: name: diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Pet.java index 05bed382e38e..f72251ebac0d 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Pet.java @@ -25,20 +25,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private List photoUrls = new ArrayList<>(); - @JsonProperty("tags") @Valid private List<@Valid Tag> tags; @@ -79,7 +74,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; /** @@ -109,6 +103,7 @@ public Pet id(Long id) { * @return id */ + @JsonProperty("id") public Long getId() { return id; } @@ -127,6 +122,7 @@ public Pet category(Category category) { * @return category */ @Valid + @JsonProperty("category") public Category getCategory() { return category; } @@ -145,6 +141,7 @@ public Pet name(String name) { * @return name */ @NotNull + @JsonProperty("name") public String getName() { return name; } @@ -171,6 +168,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * @return photoUrls */ @NotNull + @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; } @@ -197,6 +195,7 @@ public Pet addTagsItem(Tag tagsItem) { * @return tags */ @Valid + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -215,6 +214,7 @@ public Pet status(StatusEnum status) { * @return status */ + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/FILES b/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/FILES index 32921b847d0c..946be0025614 100644 --- a/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/FILES @@ -61,6 +61,7 @@ src/main/java/org/openapitools/model/OuterComposite.java src/main/java/org/openapitools/model/OuterEnum.java src/main/java/org/openapitools/model/Pet.java src/main/java/org/openapitools/model/ReadOnlyFirst.java +src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java src/main/java/org/openapitools/model/SpecialModelName.java src/main/java/org/openapitools/model/Tag.java src/main/java/org/openapitools/model/TypeHolderDefault.java 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 46f0bab3f016..de404285b492 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,6 +14,7 @@ import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ResponseObjectWithDifferentFieldNames; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import io.swagger.annotations.*; @@ -203,6 +204,44 @@ default ResponseEntity fakeOuterStringSerialize( } + /** + * GET /fake/{petId}/response-object-different-names + * + * @param petId ID of pet to update (required) + * @return successful operation (status code 200) + */ + @ApiOperation( + tags = { "pet" }, + value = "", + nickname = "responseObjectDifferentNames", + notes = "", + response = ResponseObjectWithDifferentFieldNames.class + ) + @ApiResponses({ + @ApiResponse(code = 200, message = "successful operation", response = ResponseObjectWithDifferentFieldNames.class) + }) + @RequestMapping( + method = RequestMethod.GET, + value = "/fake/{petId}/response-object-different-names", + produces = { "application/json" } + ) + default ResponseEntity responseObjectDifferentNames( + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId + ) { + getRequest().ifPresent(request -> { + for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { + if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { + String exampleString = "{ \"UPPER_CASE_PROPERTY_SNAKE\" : \"UPPER_CASE_PROPERTY_SNAKE\", \"lower-case-property-dashes\" : \"lower-case-property-dashes\", \"property name with spaces\" : \"property name with spaces\", \"normalPropertyName\" : \"normalPropertyName\" }"; + ApiUtil.setExampleResponse(request, "application/json", exampleString); + break; + } + } + }); + return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); + + } + + /** * PUT /fake/body-with-file-schema * For this test, the body for this request much reference a schema named `File`. diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApiController.java index 5ae5d5fed985..9121a3951829 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApiController.java @@ -9,6 +9,7 @@ import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ResponseObjectWithDifferentFieldNames; import org.openapitools.model.User; import org.openapitools.model.XmlItem; diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 4d0595e38d0f..34712a94057a 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -29,45 +29,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesClass { - @JsonProperty("map_string") @Valid private Map mapString = new HashMap<>(); - @JsonProperty("map_number") @Valid private Map mapNumber = new HashMap<>(); - @JsonProperty("map_integer") @Valid private Map mapInteger = new HashMap<>(); - @JsonProperty("map_boolean") @Valid private Map mapBoolean = new HashMap<>(); - @JsonProperty("map_array_integer") @Valid private Map> mapArrayInteger = new HashMap<>(); - @JsonProperty("map_array_anytype") @Valid private Map> mapArrayAnytype = new HashMap<>(); - @JsonProperty("map_map_string") @Valid private Map> mapMapString = new HashMap<>(); - @JsonProperty("map_map_anytype") @Valid private Map> mapMapAnytype = new HashMap<>(); - @JsonProperty("anytype_1") private Object anytype1; - @JsonProperty("anytype_2") private JsonNullable anytype2 = JsonNullable.undefined(); - @JsonProperty("anytype_3") private Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { @@ -89,6 +78,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt */ @ApiModelProperty(value = "") + @JsonProperty("map_string") public Map getMapString() { return mapString; } @@ -116,6 +106,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_number") public Map getMapNumber() { return mapNumber; } @@ -143,6 +134,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege */ @ApiModelProperty(value = "") + @JsonProperty("map_integer") public Map getMapInteger() { return mapInteger; } @@ -170,6 +162,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea */ @ApiModelProperty(value = "") + @JsonProperty("map_boolean") public Map getMapBoolean() { return mapBoolean; } @@ -197,6 +190,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { return mapArrayInteger; } @@ -224,6 +218,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { return mapArrayAnytype; } @@ -251,6 +246,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { return mapMapString; } @@ -278,6 +274,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { return mapMapAnytype; } @@ -297,6 +294,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) { */ @ApiModelProperty(value = "") + @JsonProperty("anytype_1") public Object getAnytype1() { return anytype1; } @@ -316,6 +314,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) { */ @ApiModelProperty(value = "") + @JsonProperty("anytype_2") public JsonNullable getAnytype2() { return anytype2; } @@ -335,6 +334,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) { */ @ApiModelProperty(value = "") + @JsonProperty("anytype_3") public Object getAnytype3() { return anytype3; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java index f513931c7181..5da3d386b4d4 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -27,19 +27,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ContainerDefaultValue { - @JsonProperty("nullable_array") @Valid private JsonNullable> nullableArray = JsonNullable.undefined(); - @JsonProperty("nullable_required_array") @Valid private JsonNullable> nullableRequiredArray = JsonNullable.undefined(); - @JsonProperty("required_array") @Valid private List requiredArray = new ArrayList<>(); - @JsonProperty("nullable_array_with_default") @Valid private JsonNullable> nullableArrayWithDefault = JsonNullable.undefined(); @@ -79,6 +75,7 @@ public ContainerDefaultValue addNullableArrayItem(String nullableArrayItem) { */ @ApiModelProperty(value = "") + @JsonProperty("nullable_array") public JsonNullable> getNullableArray() { return nullableArray; } @@ -106,6 +103,7 @@ public ContainerDefaultValue addNullableRequiredArrayItem(String nullableRequire */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("nullable_required_array") public JsonNullable> getNullableRequiredArray() { return nullableRequiredArray; } @@ -133,6 +131,7 @@ public ContainerDefaultValue addRequiredArrayItem(String requiredArrayItem) { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("required_array") public List getRequiredArray() { return requiredArray; } @@ -160,6 +159,7 @@ public ContainerDefaultValue addNullableArrayWithDefaultItem(String nullableArra */ @ApiModelProperty(value = "") + @JsonProperty("nullable_array_with_default") public JsonNullable> getNullableArrayWithDefault() { return nullableArrayWithDefault; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 5bac01151ba3..e1106056505e 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -25,10 +25,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FileSchemaTestClass { - @JsonProperty("file") private File file; - @JsonProperty("files") @Valid private List<@Valid File> files; @@ -43,6 +41,7 @@ public FileSchemaTestClass file(File file) { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("file") public File getFile() { return file; } @@ -70,6 +69,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("files") public List<@Valid File> getFiles() { return files; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java index da6c47fcc8bb..159881692803 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java @@ -30,20 +30,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private Set photoUrls = new LinkedHashSet<>(); - @JsonProperty("tags") @Valid private List<@Valid Tag> tags; @@ -84,7 +79,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; /** @@ -115,6 +109,7 @@ public Pet id(Long id) { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -134,6 +129,7 @@ public Pet category(Category category) { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("category") public Category getCategory() { return category; } @@ -153,6 +149,7 @@ public Pet name(String name) { */ @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") + @JsonProperty("name") public String getName() { return name; } @@ -180,6 +177,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("photoUrls") public Set getPhotoUrls() { return photoUrls; } @@ -208,6 +206,7 @@ public Pet addTagsItem(Tag tagsItem) { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -227,6 +226,7 @@ public Pet status(StatusEnum status) { */ @ApiModelProperty(value = "pet status in the store") + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java new file mode 100644 index 000000000000..187960e94e4b --- /dev/null +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java @@ -0,0 +1,156 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * ResponseObjectWithDifferentFieldNames + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public class ResponseObjectWithDifferentFieldNames { + + private String normalPropertyName; + + private String UPPER_CASE_PROPERTY_SNAKE; + + private String lowerCasePropertyDashes; + + private String propertyNameWithSpaces; + + public ResponseObjectWithDifferentFieldNames normalPropertyName(String normalPropertyName) { + this.normalPropertyName = normalPropertyName; + return this; + } + + /** + * Get normalPropertyName + * @return normalPropertyName + */ + + @ApiModelProperty(value = "") + @JsonProperty("normalPropertyName") + public String getNormalPropertyName() { + return normalPropertyName; + } + + public void setNormalPropertyName(String normalPropertyName) { + this.normalPropertyName = normalPropertyName; + } + + public ResponseObjectWithDifferentFieldNames UPPER_CASE_PROPERTY_SNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; + return this; + } + + /** + * Get UPPER_CASE_PROPERTY_SNAKE + * @return UPPER_CASE_PROPERTY_SNAKE + */ + + @ApiModelProperty(value = "") + @JsonProperty("UPPER_CASE_PROPERTY_SNAKE") + public String getUPPERCASEPROPERTYSNAKE() { + return UPPER_CASE_PROPERTY_SNAKE; + } + + public void setUPPERCASEPROPERTYSNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; + } + + public ResponseObjectWithDifferentFieldNames lowerCasePropertyDashes(String lowerCasePropertyDashes) { + this.lowerCasePropertyDashes = lowerCasePropertyDashes; + return this; + } + + /** + * Get lowerCasePropertyDashes + * @return lowerCasePropertyDashes + */ + + @ApiModelProperty(value = "") + @JsonProperty("lower-case-property-dashes") + public String getLowerCasePropertyDashes() { + return lowerCasePropertyDashes; + } + + public void setLowerCasePropertyDashes(String lowerCasePropertyDashes) { + this.lowerCasePropertyDashes = lowerCasePropertyDashes; + } + + public ResponseObjectWithDifferentFieldNames propertyNameWithSpaces(String propertyNameWithSpaces) { + this.propertyNameWithSpaces = propertyNameWithSpaces; + return this; + } + + /** + * Get propertyNameWithSpaces + * @return propertyNameWithSpaces + */ + + @ApiModelProperty(value = "") + @JsonProperty("property name with spaces") + public String getPropertyNameWithSpaces() { + return propertyNameWithSpaces; + } + + public void setPropertyNameWithSpaces(String propertyNameWithSpaces) { + this.propertyNameWithSpaces = propertyNameWithSpaces; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ResponseObjectWithDifferentFieldNames responseObjectWithDifferentFieldNames = (ResponseObjectWithDifferentFieldNames) o; + return Objects.equals(this.normalPropertyName, responseObjectWithDifferentFieldNames.normalPropertyName) && + Objects.equals(this.UPPER_CASE_PROPERTY_SNAKE, responseObjectWithDifferentFieldNames.UPPER_CASE_PROPERTY_SNAKE) && + Objects.equals(this.lowerCasePropertyDashes, responseObjectWithDifferentFieldNames.lowerCasePropertyDashes) && + Objects.equals(this.propertyNameWithSpaces, responseObjectWithDifferentFieldNames.propertyNameWithSpaces); + } + + @Override + public int hashCode() { + return Objects.hash(normalPropertyName, UPPER_CASE_PROPERTY_SNAKE, lowerCasePropertyDashes, propertyNameWithSpaces); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ResponseObjectWithDifferentFieldNames {\n"); + sb.append(" normalPropertyName: ").append(toIndentedString(normalPropertyName)).append("\n"); + sb.append(" UPPER_CASE_PROPERTY_SNAKE: ").append(toIndentedString(UPPER_CASE_PROPERTY_SNAKE)).append("\n"); + sb.append(" lowerCasePropertyDashes: ").append(toIndentedString(lowerCasePropertyDashes)).append("\n"); + sb.append(" propertyNameWithSpaces: ").append(toIndentedString(propertyNameWithSpaces)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java index 7654de1cd322..da676b10f0df 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -25,19 +25,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderDefault { - @JsonProperty("string_item") private String stringItem = "what"; - @JsonProperty("number_item") private BigDecimal numberItem = new BigDecimal("1.234"); - @JsonProperty("integer_item") private Integer integerItem = -2; - @JsonProperty("bool_item") private Boolean boolItem = true; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); @@ -72,6 +67,7 @@ public TypeHolderDefault stringItem(String stringItem) { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -91,6 +87,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) { */ @NotNull @Valid @ApiModelProperty(required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -110,6 +107,7 @@ public TypeHolderDefault integerItem(Integer integerItem) { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -129,6 +127,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -156,6 +155,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java index da3cb34f1e7b..bbc653f248a2 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -25,22 +25,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderExample { - @JsonProperty("string_item") private String stringItem; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("float_item") private Float floatItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -76,6 +70,7 @@ public TypeHolderExample stringItem(String stringItem) { */ @NotNull @ApiModelProperty(example = "what", required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -95,6 +90,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { */ @NotNull @Valid @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -114,6 +110,7 @@ public TypeHolderExample floatItem(Float floatItem) { */ @NotNull @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("float_item") public Float getFloatItem() { return floatItem; } @@ -133,6 +130,7 @@ public TypeHolderExample integerItem(Integer integerItem) { */ @NotNull @ApiModelProperty(example = "-2", required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -152,6 +150,7 @@ public TypeHolderExample boolItem(Boolean boolItem) { */ @NotNull @ApiModelProperty(example = "true", required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -179,6 +178,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { */ @NotNull @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml index 1fa32524cf2f..260abafd6eaa 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml @@ -1174,6 +1174,31 @@ paths: x-accepts: application/json x-tags: - tag: pet + /fake/{petId}/response-object-different-names: + get: + operationId: responseObjectDifferentNames + parameters: + - description: ID of pet to update + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ResponseObjectWithDifferentFieldNames' + description: successful operation + tags: + - pet + x-accepts: application/json + x-tags: + - tag: pet components: requestBodies: UserArray: @@ -2114,6 +2139,22 @@ components: - nullable_required_array - required_array type: object + ResponseObjectWithDifferentFieldNames: + example: + UPPER_CASE_PROPERTY_SNAKE: UPPER_CASE_PROPERTY_SNAKE + lower-case-property-dashes: lower-case-property-dashes + property name with spaces: property name with spaces + normalPropertyName: normalPropertyName + properties: + normalPropertyName: + type: string + UPPER_CASE_PROPERTY_SNAKE: + type: string + lower-case-property-dashes: + type: string + property name with spaces: + type: string + type: object updatePetWithForm_request: properties: name: diff --git a/samples/server/petstore/springboot-reactive/.openapi-generator/FILES b/samples/server/petstore/springboot-reactive/.openapi-generator/FILES index a38d317b824f..d91ebbece087 100644 --- a/samples/server/petstore/springboot-reactive/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-reactive/.openapi-generator/FILES @@ -66,6 +66,7 @@ src/main/java/org/openapitools/model/OuterComposite.java src/main/java/org/openapitools/model/OuterEnum.java src/main/java/org/openapitools/model/Pet.java src/main/java/org/openapitools/model/ReadOnlyFirst.java +src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java src/main/java/org/openapitools/model/SpecialModelName.java src/main/java/org/openapitools/model/Tag.java src/main/java/org/openapitools/model/TypeHolderDefault.java 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 8e2522bda4ea..2dcd1304cba2 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,6 +15,7 @@ import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ResponseObjectWithDifferentFieldNames; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import io.swagger.annotations.*; @@ -195,6 +196,35 @@ default Mono> fakeOuterStringSerialize( } + /** + * GET /fake/{petId}/response-object-different-names + * + * @param petId ID of pet to update (required) + * @return successful operation (status code 200) + */ + @ApiOperation( + tags = { "pet" }, + value = "", + nickname = "responseObjectDifferentNames", + notes = "", + response = ResponseObjectWithDifferentFieldNames.class + ) + @ApiResponses({ + @ApiResponse(code = 200, message = "successful operation", response = ResponseObjectWithDifferentFieldNames.class) + }) + @RequestMapping( + method = RequestMethod.GET, + value = "/fake/{petId}/response-object-different-names", + produces = { "application/json" } + ) + default Mono> responseObjectDifferentNames( + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, + @ApiIgnore final ServerWebExchange exchange + ) { + return getDelegate().responseObjectDifferentNames(petId, exchange); + } + + /** * PUT /fake/body-with-file-schema * For this test, the body for this request much reference a schema named `File`. diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiController.java index db9b0dff167e..ea2bb6629564 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiController.java @@ -10,6 +10,7 @@ import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ResponseObjectWithDifferentFieldNames; import org.openapitools.model.User; import org.openapitools.model.XmlItem; 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 db5642bdaa15..1bc0667788a1 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,6 +10,7 @@ import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ResponseObjectWithDifferentFieldNames; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import org.springframework.http.HttpStatus; @@ -125,6 +126,28 @@ default Mono> fakeOuterStringSerialize(Mono body, } + /** + * GET /fake/{petId}/response-object-different-names + * + * @param petId ID of pet to update (required) + * @return successful operation (status code 200) + * @see FakeApi#responseObjectDifferentNames + */ + default Mono> responseObjectDifferentNames(Long petId, + ServerWebExchange exchange) { + Mono result = Mono.empty(); + exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); + for (MediaType mediaType : exchange.getRequest().getHeaders().getAccept()) { + if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { + String exampleString = "{ \"UPPER_CASE_PROPERTY_SNAKE\" : \"UPPER_CASE_PROPERTY_SNAKE\", \"lower-case-property-dashes\" : \"lower-case-property-dashes\", \"property name with spaces\" : \"property name with spaces\", \"normalPropertyName\" : \"normalPropertyName\" }"; + result = ApiUtil.getExampleResponse(exchange, mediaType, exampleString); + break; + } + } + return result.then(Mono.empty()); + + } + /** * PUT /fake/body-with-file-schema * For this test, the body for this request much reference a schema named `File`. diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 4d0595e38d0f..34712a94057a 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -29,45 +29,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesClass { - @JsonProperty("map_string") @Valid private Map mapString = new HashMap<>(); - @JsonProperty("map_number") @Valid private Map mapNumber = new HashMap<>(); - @JsonProperty("map_integer") @Valid private Map mapInteger = new HashMap<>(); - @JsonProperty("map_boolean") @Valid private Map mapBoolean = new HashMap<>(); - @JsonProperty("map_array_integer") @Valid private Map> mapArrayInteger = new HashMap<>(); - @JsonProperty("map_array_anytype") @Valid private Map> mapArrayAnytype = new HashMap<>(); - @JsonProperty("map_map_string") @Valid private Map> mapMapString = new HashMap<>(); - @JsonProperty("map_map_anytype") @Valid private Map> mapMapAnytype = new HashMap<>(); - @JsonProperty("anytype_1") private Object anytype1; - @JsonProperty("anytype_2") private JsonNullable anytype2 = JsonNullable.undefined(); - @JsonProperty("anytype_3") private Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { @@ -89,6 +78,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt */ @ApiModelProperty(value = "") + @JsonProperty("map_string") public Map getMapString() { return mapString; } @@ -116,6 +106,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_number") public Map getMapNumber() { return mapNumber; } @@ -143,6 +134,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege */ @ApiModelProperty(value = "") + @JsonProperty("map_integer") public Map getMapInteger() { return mapInteger; } @@ -170,6 +162,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea */ @ApiModelProperty(value = "") + @JsonProperty("map_boolean") public Map getMapBoolean() { return mapBoolean; } @@ -197,6 +190,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { return mapArrayInteger; } @@ -224,6 +218,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { return mapArrayAnytype; } @@ -251,6 +246,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { return mapMapString; } @@ -278,6 +274,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { return mapMapAnytype; } @@ -297,6 +294,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) { */ @ApiModelProperty(value = "") + @JsonProperty("anytype_1") public Object getAnytype1() { return anytype1; } @@ -316,6 +314,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) { */ @ApiModelProperty(value = "") + @JsonProperty("anytype_2") public JsonNullable getAnytype2() { return anytype2; } @@ -335,6 +334,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) { */ @ApiModelProperty(value = "") + @JsonProperty("anytype_3") public Object getAnytype3() { return anytype3; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java index f513931c7181..5da3d386b4d4 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -27,19 +27,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ContainerDefaultValue { - @JsonProperty("nullable_array") @Valid private JsonNullable> nullableArray = JsonNullable.undefined(); - @JsonProperty("nullable_required_array") @Valid private JsonNullable> nullableRequiredArray = JsonNullable.undefined(); - @JsonProperty("required_array") @Valid private List requiredArray = new ArrayList<>(); - @JsonProperty("nullable_array_with_default") @Valid private JsonNullable> nullableArrayWithDefault = JsonNullable.undefined(); @@ -79,6 +75,7 @@ public ContainerDefaultValue addNullableArrayItem(String nullableArrayItem) { */ @ApiModelProperty(value = "") + @JsonProperty("nullable_array") public JsonNullable> getNullableArray() { return nullableArray; } @@ -106,6 +103,7 @@ public ContainerDefaultValue addNullableRequiredArrayItem(String nullableRequire */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("nullable_required_array") public JsonNullable> getNullableRequiredArray() { return nullableRequiredArray; } @@ -133,6 +131,7 @@ public ContainerDefaultValue addRequiredArrayItem(String requiredArrayItem) { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("required_array") public List getRequiredArray() { return requiredArray; } @@ -160,6 +159,7 @@ public ContainerDefaultValue addNullableArrayWithDefaultItem(String nullableArra */ @ApiModelProperty(value = "") + @JsonProperty("nullable_array_with_default") public JsonNullable> getNullableArrayWithDefault() { return nullableArrayWithDefault; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 5bac01151ba3..e1106056505e 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -25,10 +25,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FileSchemaTestClass { - @JsonProperty("file") private File file; - @JsonProperty("files") @Valid private List<@Valid File> files; @@ -43,6 +41,7 @@ public FileSchemaTestClass file(File file) { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("file") public File getFile() { return file; } @@ -70,6 +69,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("files") public List<@Valid File> getFiles() { return files; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java index da6c47fcc8bb..159881692803 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java @@ -30,20 +30,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private Set photoUrls = new LinkedHashSet<>(); - @JsonProperty("tags") @Valid private List<@Valid Tag> tags; @@ -84,7 +79,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; /** @@ -115,6 +109,7 @@ public Pet id(Long id) { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -134,6 +129,7 @@ public Pet category(Category category) { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("category") public Category getCategory() { return category; } @@ -153,6 +149,7 @@ public Pet name(String name) { */ @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") + @JsonProperty("name") public String getName() { return name; } @@ -180,6 +177,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("photoUrls") public Set getPhotoUrls() { return photoUrls; } @@ -208,6 +206,7 @@ public Pet addTagsItem(Tag tagsItem) { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -227,6 +226,7 @@ public Pet status(StatusEnum status) { */ @ApiModelProperty(value = "pet status in the store") + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java new file mode 100644 index 000000000000..187960e94e4b --- /dev/null +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java @@ -0,0 +1,156 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * ResponseObjectWithDifferentFieldNames + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public class ResponseObjectWithDifferentFieldNames { + + private String normalPropertyName; + + private String UPPER_CASE_PROPERTY_SNAKE; + + private String lowerCasePropertyDashes; + + private String propertyNameWithSpaces; + + public ResponseObjectWithDifferentFieldNames normalPropertyName(String normalPropertyName) { + this.normalPropertyName = normalPropertyName; + return this; + } + + /** + * Get normalPropertyName + * @return normalPropertyName + */ + + @ApiModelProperty(value = "") + @JsonProperty("normalPropertyName") + public String getNormalPropertyName() { + return normalPropertyName; + } + + public void setNormalPropertyName(String normalPropertyName) { + this.normalPropertyName = normalPropertyName; + } + + public ResponseObjectWithDifferentFieldNames UPPER_CASE_PROPERTY_SNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; + return this; + } + + /** + * Get UPPER_CASE_PROPERTY_SNAKE + * @return UPPER_CASE_PROPERTY_SNAKE + */ + + @ApiModelProperty(value = "") + @JsonProperty("UPPER_CASE_PROPERTY_SNAKE") + public String getUPPERCASEPROPERTYSNAKE() { + return UPPER_CASE_PROPERTY_SNAKE; + } + + public void setUPPERCASEPROPERTYSNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; + } + + public ResponseObjectWithDifferentFieldNames lowerCasePropertyDashes(String lowerCasePropertyDashes) { + this.lowerCasePropertyDashes = lowerCasePropertyDashes; + return this; + } + + /** + * Get lowerCasePropertyDashes + * @return lowerCasePropertyDashes + */ + + @ApiModelProperty(value = "") + @JsonProperty("lower-case-property-dashes") + public String getLowerCasePropertyDashes() { + return lowerCasePropertyDashes; + } + + public void setLowerCasePropertyDashes(String lowerCasePropertyDashes) { + this.lowerCasePropertyDashes = lowerCasePropertyDashes; + } + + public ResponseObjectWithDifferentFieldNames propertyNameWithSpaces(String propertyNameWithSpaces) { + this.propertyNameWithSpaces = propertyNameWithSpaces; + return this; + } + + /** + * Get propertyNameWithSpaces + * @return propertyNameWithSpaces + */ + + @ApiModelProperty(value = "") + @JsonProperty("property name with spaces") + public String getPropertyNameWithSpaces() { + return propertyNameWithSpaces; + } + + public void setPropertyNameWithSpaces(String propertyNameWithSpaces) { + this.propertyNameWithSpaces = propertyNameWithSpaces; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ResponseObjectWithDifferentFieldNames responseObjectWithDifferentFieldNames = (ResponseObjectWithDifferentFieldNames) o; + return Objects.equals(this.normalPropertyName, responseObjectWithDifferentFieldNames.normalPropertyName) && + Objects.equals(this.UPPER_CASE_PROPERTY_SNAKE, responseObjectWithDifferentFieldNames.UPPER_CASE_PROPERTY_SNAKE) && + Objects.equals(this.lowerCasePropertyDashes, responseObjectWithDifferentFieldNames.lowerCasePropertyDashes) && + Objects.equals(this.propertyNameWithSpaces, responseObjectWithDifferentFieldNames.propertyNameWithSpaces); + } + + @Override + public int hashCode() { + return Objects.hash(normalPropertyName, UPPER_CASE_PROPERTY_SNAKE, lowerCasePropertyDashes, propertyNameWithSpaces); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ResponseObjectWithDifferentFieldNames {\n"); + sb.append(" normalPropertyName: ").append(toIndentedString(normalPropertyName)).append("\n"); + sb.append(" UPPER_CASE_PROPERTY_SNAKE: ").append(toIndentedString(UPPER_CASE_PROPERTY_SNAKE)).append("\n"); + sb.append(" lowerCasePropertyDashes: ").append(toIndentedString(lowerCasePropertyDashes)).append("\n"); + sb.append(" propertyNameWithSpaces: ").append(toIndentedString(propertyNameWithSpaces)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java index 7654de1cd322..da676b10f0df 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -25,19 +25,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderDefault { - @JsonProperty("string_item") private String stringItem = "what"; - @JsonProperty("number_item") private BigDecimal numberItem = new BigDecimal("1.234"); - @JsonProperty("integer_item") private Integer integerItem = -2; - @JsonProperty("bool_item") private Boolean boolItem = true; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); @@ -72,6 +67,7 @@ public TypeHolderDefault stringItem(String stringItem) { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -91,6 +87,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) { */ @NotNull @Valid @ApiModelProperty(required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -110,6 +107,7 @@ public TypeHolderDefault integerItem(Integer integerItem) { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -129,6 +127,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -156,6 +155,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java index da3cb34f1e7b..bbc653f248a2 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -25,22 +25,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderExample { - @JsonProperty("string_item") private String stringItem; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("float_item") private Float floatItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -76,6 +70,7 @@ public TypeHolderExample stringItem(String stringItem) { */ @NotNull @ApiModelProperty(example = "what", required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -95,6 +90,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { */ @NotNull @Valid @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -114,6 +110,7 @@ public TypeHolderExample floatItem(Float floatItem) { */ @NotNull @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("float_item") public Float getFloatItem() { return floatItem; } @@ -133,6 +130,7 @@ public TypeHolderExample integerItem(Integer integerItem) { */ @NotNull @ApiModelProperty(example = "-2", required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -152,6 +150,7 @@ public TypeHolderExample boolItem(Boolean boolItem) { */ @NotNull @ApiModelProperty(example = "true", required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -179,6 +178,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { */ @NotNull @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-reactive/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-reactive/src/main/resources/openapi.yaml index 1fa32524cf2f..260abafd6eaa 100644 --- a/samples/server/petstore/springboot-reactive/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-reactive/src/main/resources/openapi.yaml @@ -1174,6 +1174,31 @@ paths: x-accepts: application/json x-tags: - tag: pet + /fake/{petId}/response-object-different-names: + get: + operationId: responseObjectDifferentNames + parameters: + - description: ID of pet to update + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ResponseObjectWithDifferentFieldNames' + description: successful operation + tags: + - pet + x-accepts: application/json + x-tags: + - tag: pet components: requestBodies: UserArray: @@ -2114,6 +2139,22 @@ components: - nullable_required_array - required_array type: object + ResponseObjectWithDifferentFieldNames: + example: + UPPER_CASE_PROPERTY_SNAKE: UPPER_CASE_PROPERTY_SNAKE + lower-case-property-dashes: lower-case-property-dashes + property name with spaces: property name with spaces + normalPropertyName: normalPropertyName + properties: + normalPropertyName: + type: string + UPPER_CASE_PROPERTY_SNAKE: + type: string + lower-case-property-dashes: + type: string + property name with spaces: + type: string + type: object updatePetWithForm_request: properties: name: diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 5bac01151ba3..e1106056505e 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -25,10 +25,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FileSchemaTestClass { - @JsonProperty("file") private File file; - @JsonProperty("files") @Valid private List<@Valid File> files; @@ -43,6 +41,7 @@ public FileSchemaTestClass file(File file) { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("file") public File getFile() { return file; } @@ -70,6 +69,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("files") public List<@Valid File> getFiles() { return files; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Pet.java index 0e55c9b7873e..5e04a5fe734d 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Pet.java @@ -27,20 +27,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private List photoUrls = new ArrayList<>(); - @JsonProperty("tags") @Valid private List<@Valid Tag> tags; @@ -81,7 +76,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; /** @@ -112,6 +106,7 @@ public Pet id(Long id) { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -131,6 +126,7 @@ public Pet category(Category category) { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("category") public Category getCategory() { return category; } @@ -150,6 +146,7 @@ public Pet name(String name) { */ @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") + @JsonProperty("name") public String getName() { return name; } @@ -177,6 +174,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; } @@ -204,6 +202,7 @@ public Pet addTagsItem(Tag tagsItem) { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -223,6 +222,7 @@ public Pet status(StatusEnum status) { */ @ApiModelProperty(value = "pet status in the store") + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java index da3cb34f1e7b..bbc653f248a2 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -25,22 +25,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderExample { - @JsonProperty("string_item") private String stringItem; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("float_item") private Float floatItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -76,6 +70,7 @@ public TypeHolderExample stringItem(String stringItem) { */ @NotNull @ApiModelProperty(example = "what", required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -95,6 +90,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { */ @NotNull @Valid @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -114,6 +110,7 @@ public TypeHolderExample floatItem(Float floatItem) { */ @NotNull @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("float_item") public Float getFloatItem() { return floatItem; } @@ -133,6 +130,7 @@ public TypeHolderExample integerItem(Integer integerItem) { */ @NotNull @ApiModelProperty(example = "-2", required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -152,6 +150,7 @@ public TypeHolderExample boolItem(Boolean boolItem) { */ @NotNull @ApiModelProperty(example = "true", required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -179,6 +178,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { */ @NotNull @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 5bac01151ba3..e1106056505e 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -25,10 +25,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FileSchemaTestClass { - @JsonProperty("file") private File file; - @JsonProperty("files") @Valid private List<@Valid File> files; @@ -43,6 +41,7 @@ public FileSchemaTestClass file(File file) { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("file") public File getFile() { return file; } @@ -70,6 +69,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("files") public List<@Valid File> getFiles() { return files; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Pet.java index 0e55c9b7873e..5e04a5fe734d 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Pet.java @@ -27,20 +27,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private List photoUrls = new ArrayList<>(); - @JsonProperty("tags") @Valid private List<@Valid Tag> tags; @@ -81,7 +76,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; /** @@ -112,6 +106,7 @@ public Pet id(Long id) { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -131,6 +126,7 @@ public Pet category(Category category) { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("category") public Category getCategory() { return category; } @@ -150,6 +146,7 @@ public Pet name(String name) { */ @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") + @JsonProperty("name") public String getName() { return name; } @@ -177,6 +174,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; } @@ -204,6 +202,7 @@ public Pet addTagsItem(Tag tagsItem) { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -223,6 +222,7 @@ public Pet status(StatusEnum status) { */ @ApiModelProperty(value = "pet status in the store") + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderExample.java index da3cb34f1e7b..bbc653f248a2 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -25,22 +25,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderExample { - @JsonProperty("string_item") private String stringItem; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("float_item") private Float floatItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -76,6 +70,7 @@ public TypeHolderExample stringItem(String stringItem) { */ @NotNull @ApiModelProperty(example = "what", required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -95,6 +90,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { */ @NotNull @Valid @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -114,6 +110,7 @@ public TypeHolderExample floatItem(Float floatItem) { */ @NotNull @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("float_item") public Float getFloatItem() { return floatItem; } @@ -133,6 +130,7 @@ public TypeHolderExample integerItem(Integer integerItem) { */ @NotNull @ApiModelProperty(example = "-2", required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -152,6 +150,7 @@ public TypeHolderExample boolItem(Boolean boolItem) { */ @NotNull @ApiModelProperty(example = "true", required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -179,6 +178,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { */ @NotNull @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 5bac01151ba3..e1106056505e 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -25,10 +25,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FileSchemaTestClass { - @JsonProperty("file") private File file; - @JsonProperty("files") @Valid private List<@Valid File> files; @@ -43,6 +41,7 @@ public FileSchemaTestClass file(File file) { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("file") public File getFile() { return file; } @@ -70,6 +69,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("files") public List<@Valid File> getFiles() { return files; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Pet.java index 0e55c9b7873e..5e04a5fe734d 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Pet.java @@ -27,20 +27,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private List photoUrls = new ArrayList<>(); - @JsonProperty("tags") @Valid private List<@Valid Tag> tags; @@ -81,7 +76,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; /** @@ -112,6 +106,7 @@ public Pet id(Long id) { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -131,6 +126,7 @@ public Pet category(Category category) { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("category") public Category getCategory() { return category; } @@ -150,6 +146,7 @@ public Pet name(String name) { */ @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") + @JsonProperty("name") public String getName() { return name; } @@ -177,6 +174,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; } @@ -204,6 +202,7 @@ public Pet addTagsItem(Tag tagsItem) { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -223,6 +222,7 @@ public Pet status(StatusEnum status) { */ @ApiModelProperty(value = "pet status in the store") + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java index da3cb34f1e7b..bbc653f248a2 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -25,22 +25,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderExample { - @JsonProperty("string_item") private String stringItem; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("float_item") private Float floatItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -76,6 +70,7 @@ public TypeHolderExample stringItem(String stringItem) { */ @NotNull @ApiModelProperty(example = "what", required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -95,6 +90,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { */ @NotNull @Valid @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -114,6 +110,7 @@ public TypeHolderExample floatItem(Float floatItem) { */ @NotNull @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("float_item") public Float getFloatItem() { return floatItem; } @@ -133,6 +130,7 @@ public TypeHolderExample integerItem(Integer integerItem) { */ @NotNull @ApiModelProperty(example = "-2", required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -152,6 +150,7 @@ public TypeHolderExample boolItem(Boolean boolItem) { */ @NotNull @ApiModelProperty(example = "true", required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -179,6 +178,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { */ @NotNull @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 5bac01151ba3..e1106056505e 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -25,10 +25,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FileSchemaTestClass { - @JsonProperty("file") private File file; - @JsonProperty("files") @Valid private List<@Valid File> files; @@ -43,6 +41,7 @@ public FileSchemaTestClass file(File file) { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("file") public File getFile() { return file; } @@ -70,6 +69,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("files") public List<@Valid File> getFiles() { return files; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Pet.java index 0e55c9b7873e..5e04a5fe734d 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Pet.java @@ -27,20 +27,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private List photoUrls = new ArrayList<>(); - @JsonProperty("tags") @Valid private List<@Valid Tag> tags; @@ -81,7 +76,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; /** @@ -112,6 +106,7 @@ public Pet id(Long id) { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -131,6 +126,7 @@ public Pet category(Category category) { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("category") public Category getCategory() { return category; } @@ -150,6 +146,7 @@ public Pet name(String name) { */ @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") + @JsonProperty("name") public String getName() { return name; } @@ -177,6 +174,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; } @@ -204,6 +202,7 @@ public Pet addTagsItem(Tag tagsItem) { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -223,6 +222,7 @@ public Pet status(StatusEnum status) { */ @ApiModelProperty(value = "pet status in the store") + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderExample.java index da3cb34f1e7b..bbc653f248a2 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -25,22 +25,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderExample { - @JsonProperty("string_item") private String stringItem; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("float_item") private Float floatItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -76,6 +70,7 @@ public TypeHolderExample stringItem(String stringItem) { */ @NotNull @ApiModelProperty(example = "what", required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -95,6 +90,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { */ @NotNull @Valid @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -114,6 +110,7 @@ public TypeHolderExample floatItem(Float floatItem) { */ @NotNull @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("float_item") public Float getFloatItem() { return floatItem; } @@ -133,6 +130,7 @@ public TypeHolderExample integerItem(Integer integerItem) { */ @NotNull @ApiModelProperty(example = "-2", required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -152,6 +150,7 @@ public TypeHolderExample boolItem(Boolean boolItem) { */ @NotNull @ApiModelProperty(example = "true", required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -179,6 +178,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { */ @NotNull @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-useoptional/.openapi-generator/FILES b/samples/server/petstore/springboot-useoptional/.openapi-generator/FILES index 32921b847d0c..946be0025614 100644 --- a/samples/server/petstore/springboot-useoptional/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-useoptional/.openapi-generator/FILES @@ -61,6 +61,7 @@ src/main/java/org/openapitools/model/OuterComposite.java src/main/java/org/openapitools/model/OuterEnum.java src/main/java/org/openapitools/model/Pet.java src/main/java/org/openapitools/model/ReadOnlyFirst.java +src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java src/main/java/org/openapitools/model/SpecialModelName.java src/main/java/org/openapitools/model/Tag.java src/main/java/org/openapitools/model/TypeHolderDefault.java 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 adbc6c1f1e83..a00b75c4c9e1 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,6 +14,7 @@ import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ResponseObjectWithDifferentFieldNames; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import io.swagger.annotations.*; @@ -203,6 +204,44 @@ default ResponseEntity fakeOuterStringSerialize( } + /** + * GET /fake/{petId}/response-object-different-names + * + * @param petId ID of pet to update (required) + * @return successful operation (status code 200) + */ + @ApiOperation( + tags = { "pet" }, + value = "", + nickname = "responseObjectDifferentNames", + notes = "", + response = ResponseObjectWithDifferentFieldNames.class + ) + @ApiResponses({ + @ApiResponse(code = 200, message = "successful operation", response = ResponseObjectWithDifferentFieldNames.class) + }) + @RequestMapping( + method = RequestMethod.GET, + value = "/fake/{petId}/response-object-different-names", + produces = { "application/json" } + ) + default ResponseEntity responseObjectDifferentNames( + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId + ) { + getRequest().ifPresent(request -> { + for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { + if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { + String exampleString = "{ \"UPPER_CASE_PROPERTY_SNAKE\" : \"UPPER_CASE_PROPERTY_SNAKE\", \"lower-case-property-dashes\" : \"lower-case-property-dashes\", \"property name with spaces\" : \"property name with spaces\", \"normalPropertyName\" : \"normalPropertyName\" }"; + ApiUtil.setExampleResponse(request, "application/json", exampleString); + break; + } + } + }); + return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); + + } + + /** * PUT /fake/body-with-file-schema * For this test, the body for this request much reference a schema named `File`. diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApiController.java index 5ae5d5fed985..9121a3951829 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApiController.java @@ -9,6 +9,7 @@ import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ResponseObjectWithDifferentFieldNames; import org.openapitools.model.User; import org.openapitools.model.XmlItem; diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 4d0595e38d0f..34712a94057a 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -29,45 +29,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesClass { - @JsonProperty("map_string") @Valid private Map mapString = new HashMap<>(); - @JsonProperty("map_number") @Valid private Map mapNumber = new HashMap<>(); - @JsonProperty("map_integer") @Valid private Map mapInteger = new HashMap<>(); - @JsonProperty("map_boolean") @Valid private Map mapBoolean = new HashMap<>(); - @JsonProperty("map_array_integer") @Valid private Map> mapArrayInteger = new HashMap<>(); - @JsonProperty("map_array_anytype") @Valid private Map> mapArrayAnytype = new HashMap<>(); - @JsonProperty("map_map_string") @Valid private Map> mapMapString = new HashMap<>(); - @JsonProperty("map_map_anytype") @Valid private Map> mapMapAnytype = new HashMap<>(); - @JsonProperty("anytype_1") private Object anytype1; - @JsonProperty("anytype_2") private JsonNullable anytype2 = JsonNullable.undefined(); - @JsonProperty("anytype_3") private Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { @@ -89,6 +78,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt */ @ApiModelProperty(value = "") + @JsonProperty("map_string") public Map getMapString() { return mapString; } @@ -116,6 +106,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_number") public Map getMapNumber() { return mapNumber; } @@ -143,6 +134,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege */ @ApiModelProperty(value = "") + @JsonProperty("map_integer") public Map getMapInteger() { return mapInteger; } @@ -170,6 +162,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea */ @ApiModelProperty(value = "") + @JsonProperty("map_boolean") public Map getMapBoolean() { return mapBoolean; } @@ -197,6 +190,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { return mapArrayInteger; } @@ -224,6 +218,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { return mapArrayAnytype; } @@ -251,6 +246,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { return mapMapString; } @@ -278,6 +274,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { return mapMapAnytype; } @@ -297,6 +294,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) { */ @ApiModelProperty(value = "") + @JsonProperty("anytype_1") public Object getAnytype1() { return anytype1; } @@ -316,6 +314,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) { */ @ApiModelProperty(value = "") + @JsonProperty("anytype_2") public JsonNullable getAnytype2() { return anytype2; } @@ -335,6 +334,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) { */ @ApiModelProperty(value = "") + @JsonProperty("anytype_3") public Object getAnytype3() { return anytype3; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ContainerDefaultValue.java index f513931c7181..5da3d386b4d4 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -27,19 +27,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ContainerDefaultValue { - @JsonProperty("nullable_array") @Valid private JsonNullable> nullableArray = JsonNullable.undefined(); - @JsonProperty("nullable_required_array") @Valid private JsonNullable> nullableRequiredArray = JsonNullable.undefined(); - @JsonProperty("required_array") @Valid private List requiredArray = new ArrayList<>(); - @JsonProperty("nullable_array_with_default") @Valid private JsonNullable> nullableArrayWithDefault = JsonNullable.undefined(); @@ -79,6 +75,7 @@ public ContainerDefaultValue addNullableArrayItem(String nullableArrayItem) { */ @ApiModelProperty(value = "") + @JsonProperty("nullable_array") public JsonNullable> getNullableArray() { return nullableArray; } @@ -106,6 +103,7 @@ public ContainerDefaultValue addNullableRequiredArrayItem(String nullableRequire */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("nullable_required_array") public JsonNullable> getNullableRequiredArray() { return nullableRequiredArray; } @@ -133,6 +131,7 @@ public ContainerDefaultValue addRequiredArrayItem(String requiredArrayItem) { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("required_array") public List getRequiredArray() { return requiredArray; } @@ -160,6 +159,7 @@ public ContainerDefaultValue addNullableArrayWithDefaultItem(String nullableArra */ @ApiModelProperty(value = "") + @JsonProperty("nullable_array_with_default") public JsonNullable> getNullableArrayWithDefault() { return nullableArrayWithDefault; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 5bac01151ba3..e1106056505e 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -25,10 +25,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FileSchemaTestClass { - @JsonProperty("file") private File file; - @JsonProperty("files") @Valid private List<@Valid File> files; @@ -43,6 +41,7 @@ public FileSchemaTestClass file(File file) { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("file") public File getFile() { return file; } @@ -70,6 +69,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("files") public List<@Valid File> getFiles() { return files; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java index da6c47fcc8bb..159881692803 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java @@ -30,20 +30,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private Set photoUrls = new LinkedHashSet<>(); - @JsonProperty("tags") @Valid private List<@Valid Tag> tags; @@ -84,7 +79,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; /** @@ -115,6 +109,7 @@ public Pet id(Long id) { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -134,6 +129,7 @@ public Pet category(Category category) { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("category") public Category getCategory() { return category; } @@ -153,6 +149,7 @@ public Pet name(String name) { */ @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") + @JsonProperty("name") public String getName() { return name; } @@ -180,6 +177,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("photoUrls") public Set getPhotoUrls() { return photoUrls; } @@ -208,6 +206,7 @@ public Pet addTagsItem(Tag tagsItem) { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -227,6 +226,7 @@ public Pet status(StatusEnum status) { */ @ApiModelProperty(value = "pet status in the store") + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java new file mode 100644 index 000000000000..187960e94e4b --- /dev/null +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java @@ -0,0 +1,156 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * ResponseObjectWithDifferentFieldNames + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public class ResponseObjectWithDifferentFieldNames { + + private String normalPropertyName; + + private String UPPER_CASE_PROPERTY_SNAKE; + + private String lowerCasePropertyDashes; + + private String propertyNameWithSpaces; + + public ResponseObjectWithDifferentFieldNames normalPropertyName(String normalPropertyName) { + this.normalPropertyName = normalPropertyName; + return this; + } + + /** + * Get normalPropertyName + * @return normalPropertyName + */ + + @ApiModelProperty(value = "") + @JsonProperty("normalPropertyName") + public String getNormalPropertyName() { + return normalPropertyName; + } + + public void setNormalPropertyName(String normalPropertyName) { + this.normalPropertyName = normalPropertyName; + } + + public ResponseObjectWithDifferentFieldNames UPPER_CASE_PROPERTY_SNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; + return this; + } + + /** + * Get UPPER_CASE_PROPERTY_SNAKE + * @return UPPER_CASE_PROPERTY_SNAKE + */ + + @ApiModelProperty(value = "") + @JsonProperty("UPPER_CASE_PROPERTY_SNAKE") + public String getUPPERCASEPROPERTYSNAKE() { + return UPPER_CASE_PROPERTY_SNAKE; + } + + public void setUPPERCASEPROPERTYSNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; + } + + public ResponseObjectWithDifferentFieldNames lowerCasePropertyDashes(String lowerCasePropertyDashes) { + this.lowerCasePropertyDashes = lowerCasePropertyDashes; + return this; + } + + /** + * Get lowerCasePropertyDashes + * @return lowerCasePropertyDashes + */ + + @ApiModelProperty(value = "") + @JsonProperty("lower-case-property-dashes") + public String getLowerCasePropertyDashes() { + return lowerCasePropertyDashes; + } + + public void setLowerCasePropertyDashes(String lowerCasePropertyDashes) { + this.lowerCasePropertyDashes = lowerCasePropertyDashes; + } + + public ResponseObjectWithDifferentFieldNames propertyNameWithSpaces(String propertyNameWithSpaces) { + this.propertyNameWithSpaces = propertyNameWithSpaces; + return this; + } + + /** + * Get propertyNameWithSpaces + * @return propertyNameWithSpaces + */ + + @ApiModelProperty(value = "") + @JsonProperty("property name with spaces") + public String getPropertyNameWithSpaces() { + return propertyNameWithSpaces; + } + + public void setPropertyNameWithSpaces(String propertyNameWithSpaces) { + this.propertyNameWithSpaces = propertyNameWithSpaces; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ResponseObjectWithDifferentFieldNames responseObjectWithDifferentFieldNames = (ResponseObjectWithDifferentFieldNames) o; + return Objects.equals(this.normalPropertyName, responseObjectWithDifferentFieldNames.normalPropertyName) && + Objects.equals(this.UPPER_CASE_PROPERTY_SNAKE, responseObjectWithDifferentFieldNames.UPPER_CASE_PROPERTY_SNAKE) && + Objects.equals(this.lowerCasePropertyDashes, responseObjectWithDifferentFieldNames.lowerCasePropertyDashes) && + Objects.equals(this.propertyNameWithSpaces, responseObjectWithDifferentFieldNames.propertyNameWithSpaces); + } + + @Override + public int hashCode() { + return Objects.hash(normalPropertyName, UPPER_CASE_PROPERTY_SNAKE, lowerCasePropertyDashes, propertyNameWithSpaces); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ResponseObjectWithDifferentFieldNames {\n"); + sb.append(" normalPropertyName: ").append(toIndentedString(normalPropertyName)).append("\n"); + sb.append(" UPPER_CASE_PROPERTY_SNAKE: ").append(toIndentedString(UPPER_CASE_PROPERTY_SNAKE)).append("\n"); + sb.append(" lowerCasePropertyDashes: ").append(toIndentedString(lowerCasePropertyDashes)).append("\n"); + sb.append(" propertyNameWithSpaces: ").append(toIndentedString(propertyNameWithSpaces)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java index 7654de1cd322..da676b10f0df 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -25,19 +25,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderDefault { - @JsonProperty("string_item") private String stringItem = "what"; - @JsonProperty("number_item") private BigDecimal numberItem = new BigDecimal("1.234"); - @JsonProperty("integer_item") private Integer integerItem = -2; - @JsonProperty("bool_item") private Boolean boolItem = true; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); @@ -72,6 +67,7 @@ public TypeHolderDefault stringItem(String stringItem) { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -91,6 +87,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) { */ @NotNull @Valid @ApiModelProperty(required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -110,6 +107,7 @@ public TypeHolderDefault integerItem(Integer integerItem) { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -129,6 +127,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -156,6 +155,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java index da3cb34f1e7b..bbc653f248a2 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -25,22 +25,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderExample { - @JsonProperty("string_item") private String stringItem; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("float_item") private Float floatItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -76,6 +70,7 @@ public TypeHolderExample stringItem(String stringItem) { */ @NotNull @ApiModelProperty(example = "what", required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -95,6 +90,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { */ @NotNull @Valid @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -114,6 +110,7 @@ public TypeHolderExample floatItem(Float floatItem) { */ @NotNull @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("float_item") public Float getFloatItem() { return floatItem; } @@ -133,6 +130,7 @@ public TypeHolderExample integerItem(Integer integerItem) { */ @NotNull @ApiModelProperty(example = "-2", required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -152,6 +150,7 @@ public TypeHolderExample boolItem(Boolean boolItem) { */ @NotNull @ApiModelProperty(example = "true", required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -179,6 +178,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { */ @NotNull @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-useoptional/src/main/resources/openapi.yaml index 1fa32524cf2f..260abafd6eaa 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-useoptional/src/main/resources/openapi.yaml @@ -1174,6 +1174,31 @@ paths: x-accepts: application/json x-tags: - tag: pet + /fake/{petId}/response-object-different-names: + get: + operationId: responseObjectDifferentNames + parameters: + - description: ID of pet to update + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ResponseObjectWithDifferentFieldNames' + description: successful operation + tags: + - pet + x-accepts: application/json + x-tags: + - tag: pet components: requestBodies: UserArray: @@ -2114,6 +2139,22 @@ components: - nullable_required_array - required_array type: object + ResponseObjectWithDifferentFieldNames: + example: + UPPER_CASE_PROPERTY_SNAKE: UPPER_CASE_PROPERTY_SNAKE + lower-case-property-dashes: lower-case-property-dashes + property name with spaces: property name with spaces + normalPropertyName: normalPropertyName + properties: + normalPropertyName: + type: string + UPPER_CASE_PROPERTY_SNAKE: + type: string + lower-case-property-dashes: + type: string + property name with spaces: + type: string + type: object updatePetWithForm_request: properties: name: diff --git a/samples/server/petstore/springboot-virtualan/.openapi-generator/FILES b/samples/server/petstore/springboot-virtualan/.openapi-generator/FILES index 2f1080a41502..8ba55df4658b 100644 --- a/samples/server/petstore/springboot-virtualan/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-virtualan/.openapi-generator/FILES @@ -61,6 +61,7 @@ src/main/java/org/openapitools/virtualan/model/OuterComposite.java src/main/java/org/openapitools/virtualan/model/OuterEnum.java src/main/java/org/openapitools/virtualan/model/Pet.java src/main/java/org/openapitools/virtualan/model/ReadOnlyFirst.java +src/main/java/org/openapitools/virtualan/model/ResponseObjectWithDifferentFieldNames.java src/main/java/org/openapitools/virtualan/model/SpecialModelName.java src/main/java/org/openapitools/virtualan/model/Tag.java src/main/java/org/openapitools/virtualan/model/TypeHolderDefault.java 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 a902146a5f89..6ec4a6867acc 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,6 +14,7 @@ import org.openapitools.virtualan.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.virtualan.model.OuterComposite; +import org.openapitools.virtualan.model.ResponseObjectWithDifferentFieldNames; import org.openapitools.virtualan.model.User; import org.openapitools.virtualan.model.XmlItem; import io.swagger.v3.oas.annotations.ExternalDocumentation; @@ -221,6 +222,44 @@ default ResponseEntity fakeOuterStringSerialize( } + /** + * GET /fake/{petId}/response-object-different-names + * + * @param petId ID of pet to update (required) + * @return successful operation (status code 200) + */ + @ApiVirtual + @Operation( + operationId = "responseObjectDifferentNames", + tags = { "pet" }, + responses = { + @ApiResponse(responseCode = "200", description = "successful operation", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = ResponseObjectWithDifferentFieldNames.class)) + }) + } + ) + @RequestMapping( + method = RequestMethod.GET, + value = "/fake/{petId}/response-object-different-names", + produces = { "application/json" } + ) + default ResponseEntity responseObjectDifferentNames( + @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId + ) { + getRequest().ifPresent(request -> { + for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { + if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { + String exampleString = "{ \"UPPER_CASE_PROPERTY_SNAKE\" : \"UPPER_CASE_PROPERTY_SNAKE\", \"lower-case-property-dashes\" : \"lower-case-property-dashes\", \"property name with spaces\" : \"property name with spaces\", \"normalPropertyName\" : \"normalPropertyName\" }"; + ApiUtil.setExampleResponse(request, "application/json", exampleString); + break; + } + } + }); + return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); + + } + + /** * PUT /fake/body-with-file-schema * For this test, the body for this request much reference a schema named `File`. diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApiController.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApiController.java index d33842e20df7..6745966de43f 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApiController.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApiController.java @@ -9,6 +9,7 @@ import org.openapitools.virtualan.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.virtualan.model.OuterComposite; +import org.openapitools.virtualan.model.ResponseObjectWithDifferentFieldNames; import org.openapitools.virtualan.model.User; import org.openapitools.virtualan.model.XmlItem; diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesClass.java index 170518a544d4..daa9ffe49c65 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesClass.java @@ -28,45 +28,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesClass { - @JsonProperty("map_string") @Valid private Map mapString = new HashMap<>(); - @JsonProperty("map_number") @Valid private Map mapNumber = new HashMap<>(); - @JsonProperty("map_integer") @Valid private Map mapInteger = new HashMap<>(); - @JsonProperty("map_boolean") @Valid private Map mapBoolean = new HashMap<>(); - @JsonProperty("map_array_integer") @Valid private Map> mapArrayInteger = new HashMap<>(); - @JsonProperty("map_array_anytype") @Valid private Map> mapArrayAnytype = new HashMap<>(); - @JsonProperty("map_map_string") @Valid private Map> mapMapString = new HashMap<>(); - @JsonProperty("map_map_anytype") @Valid private Map> mapMapAnytype = new HashMap<>(); - @JsonProperty("anytype_1") private Object anytype1; - @JsonProperty("anytype_2") private JsonNullable anytype2 = JsonNullable.undefined(); - @JsonProperty("anytype_3") private Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { @@ -88,6 +77,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt */ @Schema(name = "map_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_string") public Map getMapString() { return mapString; } @@ -115,6 +105,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb */ @Valid @Schema(name = "map_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_number") public Map getMapNumber() { return mapNumber; } @@ -142,6 +133,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege */ @Schema(name = "map_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_integer") public Map getMapInteger() { return mapInteger; } @@ -169,6 +161,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea */ @Schema(name = "map_boolean", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_boolean") public Map getMapBoolean() { return mapBoolean; } @@ -196,6 +189,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { return mapArrayInteger; } @@ -223,6 +217,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List */ @Valid @Schema(name = "map_array_anytype", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { return mapArrayAnytype; } @@ -250,6 +245,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { return mapMapString; } @@ -277,6 +273,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { return mapMapAnytype; } @@ -296,6 +293,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) { */ @Schema(name = "anytype_1", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("anytype_1") public Object getAnytype1() { return anytype1; } @@ -315,6 +313,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) { */ @Schema(name = "anytype_2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("anytype_2") public JsonNullable getAnytype2() { return anytype2; } @@ -334,6 +333,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) { */ @Schema(name = "anytype_3", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("anytype_3") public Object getAnytype3() { return anytype3; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ContainerDefaultValue.java index ed71e7bf9a4c..9787053cbe38 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ContainerDefaultValue.java @@ -26,19 +26,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ContainerDefaultValue { - @JsonProperty("nullable_array") @Valid private JsonNullable> nullableArray = JsonNullable.undefined(); - @JsonProperty("nullable_required_array") @Valid private JsonNullable> nullableRequiredArray = JsonNullable.undefined(); - @JsonProperty("required_array") @Valid private List requiredArray = new ArrayList<>(); - @JsonProperty("nullable_array_with_default") @Valid private JsonNullable> nullableArrayWithDefault = JsonNullable.undefined(); @@ -78,6 +74,7 @@ public ContainerDefaultValue addNullableArrayItem(String nullableArrayItem) { */ @Schema(name = "nullable_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("nullable_array") public JsonNullable> getNullableArray() { return nullableArray; } @@ -105,6 +102,7 @@ public ContainerDefaultValue addNullableRequiredArrayItem(String nullableRequire */ @NotNull @Schema(name = "nullable_required_array", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("nullable_required_array") public JsonNullable> getNullableRequiredArray() { return nullableRequiredArray; } @@ -132,6 +130,7 @@ public ContainerDefaultValue addRequiredArrayItem(String requiredArrayItem) { */ @NotNull @Schema(name = "required_array", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("required_array") public List getRequiredArray() { return requiredArray; } @@ -159,6 +158,7 @@ public ContainerDefaultValue addNullableArrayWithDefaultItem(String nullableArra */ @Schema(name = "nullable_array_with_default", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("nullable_array_with_default") public JsonNullable> getNullableArrayWithDefault() { return nullableArrayWithDefault; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FileSchemaTestClass.java index 37db6d702e05..26c11a8e86b9 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FileSchemaTestClass.java @@ -24,10 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FileSchemaTestClass { - @JsonProperty("file") private File file; - @JsonProperty("files") @Valid private List<@Valid File> files; @@ -42,6 +40,7 @@ public FileSchemaTestClass file(File file) { */ @Valid @Schema(name = "file", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("file") public File getFile() { return file; } @@ -69,6 +68,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) { */ @Valid @Schema(name = "files", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("files") public List<@Valid File> getFiles() { return files; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Pet.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Pet.java index a6e1d1a95731..92c95332cbdd 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Pet.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Pet.java @@ -29,20 +29,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private Set photoUrls = new LinkedHashSet<>(); - @JsonProperty("tags") @Valid private List<@Valid Tag> tags; @@ -83,7 +78,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; /** @@ -114,6 +108,7 @@ public Pet id(Long id) { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -133,6 +128,7 @@ public Pet category(Category category) { */ @Valid @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("category") public Category getCategory() { return category; } @@ -152,6 +148,7 @@ public Pet name(String name) { */ @NotNull @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("name") public String getName() { return name; } @@ -179,6 +176,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { */ @NotNull @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("photoUrls") public Set getPhotoUrls() { return photoUrls; } @@ -207,6 +205,7 @@ public Pet addTagsItem(Tag tagsItem) { */ @Valid @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -226,6 +225,7 @@ public Pet status(StatusEnum status) { */ @Schema(name = "status", description = "pet status in the store", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ResponseObjectWithDifferentFieldNames.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ResponseObjectWithDifferentFieldNames.java new file mode 100644 index 000000000000..390bd1ee9e49 --- /dev/null +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ResponseObjectWithDifferentFieldNames.java @@ -0,0 +1,155 @@ +package org.openapitools.virtualan.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; +import io.swagger.v3.oas.annotations.media.Schema; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * ResponseObjectWithDifferentFieldNames + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public class ResponseObjectWithDifferentFieldNames { + + private String normalPropertyName; + + private String UPPER_CASE_PROPERTY_SNAKE; + + private String lowerCasePropertyDashes; + + private String propertyNameWithSpaces; + + public ResponseObjectWithDifferentFieldNames normalPropertyName(String normalPropertyName) { + this.normalPropertyName = normalPropertyName; + return this; + } + + /** + * Get normalPropertyName + * @return normalPropertyName + */ + + @Schema(name = "normalPropertyName", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("normalPropertyName") + public String getNormalPropertyName() { + return normalPropertyName; + } + + public void setNormalPropertyName(String normalPropertyName) { + this.normalPropertyName = normalPropertyName; + } + + public ResponseObjectWithDifferentFieldNames UPPER_CASE_PROPERTY_SNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; + return this; + } + + /** + * Get UPPER_CASE_PROPERTY_SNAKE + * @return UPPER_CASE_PROPERTY_SNAKE + */ + + @Schema(name = "UPPER_CASE_PROPERTY_SNAKE", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("UPPER_CASE_PROPERTY_SNAKE") + public String getUPPERCASEPROPERTYSNAKE() { + return UPPER_CASE_PROPERTY_SNAKE; + } + + public void setUPPERCASEPROPERTYSNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; + } + + public ResponseObjectWithDifferentFieldNames lowerCasePropertyDashes(String lowerCasePropertyDashes) { + this.lowerCasePropertyDashes = lowerCasePropertyDashes; + return this; + } + + /** + * Get lowerCasePropertyDashes + * @return lowerCasePropertyDashes + */ + + @Schema(name = "lower-case-property-dashes", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("lower-case-property-dashes") + public String getLowerCasePropertyDashes() { + return lowerCasePropertyDashes; + } + + public void setLowerCasePropertyDashes(String lowerCasePropertyDashes) { + this.lowerCasePropertyDashes = lowerCasePropertyDashes; + } + + public ResponseObjectWithDifferentFieldNames propertyNameWithSpaces(String propertyNameWithSpaces) { + this.propertyNameWithSpaces = propertyNameWithSpaces; + return this; + } + + /** + * Get propertyNameWithSpaces + * @return propertyNameWithSpaces + */ + + @Schema(name = "property name with spaces", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("property name with spaces") + public String getPropertyNameWithSpaces() { + return propertyNameWithSpaces; + } + + public void setPropertyNameWithSpaces(String propertyNameWithSpaces) { + this.propertyNameWithSpaces = propertyNameWithSpaces; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ResponseObjectWithDifferentFieldNames responseObjectWithDifferentFieldNames = (ResponseObjectWithDifferentFieldNames) o; + return Objects.equals(this.normalPropertyName, responseObjectWithDifferentFieldNames.normalPropertyName) && + Objects.equals(this.UPPER_CASE_PROPERTY_SNAKE, responseObjectWithDifferentFieldNames.UPPER_CASE_PROPERTY_SNAKE) && + Objects.equals(this.lowerCasePropertyDashes, responseObjectWithDifferentFieldNames.lowerCasePropertyDashes) && + Objects.equals(this.propertyNameWithSpaces, responseObjectWithDifferentFieldNames.propertyNameWithSpaces); + } + + @Override + public int hashCode() { + return Objects.hash(normalPropertyName, UPPER_CASE_PROPERTY_SNAKE, lowerCasePropertyDashes, propertyNameWithSpaces); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ResponseObjectWithDifferentFieldNames {\n"); + sb.append(" normalPropertyName: ").append(toIndentedString(normalPropertyName)).append("\n"); + sb.append(" UPPER_CASE_PROPERTY_SNAKE: ").append(toIndentedString(UPPER_CASE_PROPERTY_SNAKE)).append("\n"); + sb.append(" lowerCasePropertyDashes: ").append(toIndentedString(lowerCasePropertyDashes)).append("\n"); + sb.append(" propertyNameWithSpaces: ").append(toIndentedString(propertyNameWithSpaces)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderDefault.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderDefault.java index 0fd5ba6fa7b1..0deae5af294e 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderDefault.java @@ -24,19 +24,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderDefault { - @JsonProperty("string_item") private String stringItem = "what"; - @JsonProperty("number_item") private BigDecimal numberItem = new BigDecimal("1.234"); - @JsonProperty("integer_item") private Integer integerItem = -2; - @JsonProperty("bool_item") private Boolean boolItem = true; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); @@ -71,6 +66,7 @@ public TypeHolderDefault stringItem(String stringItem) { */ @NotNull @Schema(name = "string_item", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -90,6 +86,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) { */ @NotNull @Valid @Schema(name = "number_item", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -109,6 +106,7 @@ public TypeHolderDefault integerItem(Integer integerItem) { */ @NotNull @Schema(name = "integer_item", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -128,6 +126,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) { */ @NotNull @Schema(name = "bool_item", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -155,6 +154,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { */ @NotNull @Schema(name = "array_item", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderExample.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderExample.java index 21d9337da769..9c37a6348092 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderExample.java @@ -24,22 +24,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderExample { - @JsonProperty("string_item") private String stringItem; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("float_item") private Float floatItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -75,6 +69,7 @@ public TypeHolderExample stringItem(String stringItem) { */ @NotNull @Schema(name = "string_item", example = "what", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -94,6 +89,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { */ @NotNull @Valid @Schema(name = "number_item", example = "1.234", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -113,6 +109,7 @@ public TypeHolderExample floatItem(Float floatItem) { */ @NotNull @Schema(name = "float_item", example = "1.234", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("float_item") public Float getFloatItem() { return floatItem; } @@ -132,6 +129,7 @@ public TypeHolderExample integerItem(Integer integerItem) { */ @NotNull @Schema(name = "integer_item", example = "-2", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -151,6 +149,7 @@ public TypeHolderExample boolItem(Boolean boolItem) { */ @NotNull @Schema(name = "bool_item", example = "true", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -178,6 +177,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { */ @NotNull @Schema(name = "array_item", example = "[0,1,2,3]", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-virtualan/src/main/resources/openapi.yaml index 1fa32524cf2f..260abafd6eaa 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-virtualan/src/main/resources/openapi.yaml @@ -1174,6 +1174,31 @@ paths: x-accepts: application/json x-tags: - tag: pet + /fake/{petId}/response-object-different-names: + get: + operationId: responseObjectDifferentNames + parameters: + - description: ID of pet to update + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ResponseObjectWithDifferentFieldNames' + description: successful operation + tags: + - pet + x-accepts: application/json + x-tags: + - tag: pet components: requestBodies: UserArray: @@ -2114,6 +2139,22 @@ components: - nullable_required_array - required_array type: object + ResponseObjectWithDifferentFieldNames: + example: + UPPER_CASE_PROPERTY_SNAKE: UPPER_CASE_PROPERTY_SNAKE + lower-case-property-dashes: lower-case-property-dashes + property name with spaces: property name with spaces + normalPropertyName: normalPropertyName + properties: + normalPropertyName: + type: string + UPPER_CASE_PROPERTY_SNAKE: + type: string + lower-case-property-dashes: + type: string + property name with spaces: + type: string + type: object updatePetWithForm_request: properties: name: diff --git a/samples/server/petstore/springboot/.openapi-generator/FILES b/samples/server/petstore/springboot/.openapi-generator/FILES index ed149e7e75b9..1a5080e64349 100644 --- a/samples/server/petstore/springboot/.openapi-generator/FILES +++ b/samples/server/petstore/springboot/.openapi-generator/FILES @@ -60,6 +60,7 @@ src/main/java/org/openapitools/model/OuterCompositeDto.java src/main/java/org/openapitools/model/OuterEnumDto.java src/main/java/org/openapitools/model/PetDto.java src/main/java/org/openapitools/model/ReadOnlyFirstDto.java +src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java src/main/java/org/openapitools/model/ReturnDto.java src/main/java/org/openapitools/model/SpecialModelNameDto.java src/main/java/org/openapitools/model/TagDto.java 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 d169863b1042..49c9d624f080 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,6 +14,7 @@ import java.util.Map; import java.time.OffsetDateTime; import org.openapitools.model.OuterCompositeDto; +import org.openapitools.model.ResponseObjectWithDifferentFieldNamesDto; import org.openapitools.model.UserDto; import org.openapitools.model.XmlItemDto; import io.swagger.annotations.*; @@ -203,6 +204,44 @@ default ResponseEntity fakeOuterStringSerialize( } + /** + * GET /fake/{petId}/response-object-different-names + * + * @param petId ID of pet to update (required) + * @return successful operation (status code 200) + */ + @ApiOperation( + tags = { "pet" }, + value = "", + nickname = "responseObjectDifferentNames", + notes = "", + response = ResponseObjectWithDifferentFieldNamesDto.class + ) + @ApiResponses({ + @ApiResponse(code = 200, message = "successful operation", response = ResponseObjectWithDifferentFieldNamesDto.class) + }) + @RequestMapping( + method = RequestMethod.GET, + value = "/fake/{petId}/response-object-different-names", + produces = { "application/json" } + ) + default ResponseEntity responseObjectDifferentNames( + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId + ) { + getRequest().ifPresent(request -> { + for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { + if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { + String exampleString = "{ \"UPPER_CASE_PROPERTY_SNAKE\" : \"UPPER_CASE_PROPERTY_SNAKE\", \"lower-case-property-dashes\" : \"lower-case-property-dashes\", \"property name with spaces\" : \"property name with spaces\", \"normalPropertyName\" : \"normalPropertyName\" }"; + ApiUtil.setExampleResponse(request, "application/json", exampleString); + break; + } + } + }); + return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); + + } + + /** * PUT /fake/body-with-file-schema * For this test, the body for this request much reference a schema named `File`. diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApiController.java index 832b3bbf29fb..ad3ca0f55b62 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApiController.java @@ -9,6 +9,7 @@ import java.util.Map; import java.time.OffsetDateTime; import org.openapitools.model.OuterCompositeDto; +import org.openapitools.model.ResponseObjectWithDifferentFieldNamesDto; import org.openapitools.model.UserDto; import org.openapitools.model.XmlItemDto; diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java index fda780a36c33..cce9f53867ef 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java @@ -31,45 +31,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesClassDto { - @JsonProperty("map_string") @Valid private Map mapString = new HashMap<>(); - @JsonProperty("map_number") @Valid private Map mapNumber = new HashMap<>(); - @JsonProperty("map_integer") @Valid private Map mapInteger = new HashMap<>(); - @JsonProperty("map_boolean") @Valid private Map mapBoolean = new HashMap<>(); - @JsonProperty("map_array_integer") @Valid private Map> mapArrayInteger = new HashMap<>(); - @JsonProperty("map_array_anytype") @Valid private Map> mapArrayAnytype = new HashMap<>(); - @JsonProperty("map_map_string") @Valid private Map> mapMapString = new HashMap<>(); - @JsonProperty("map_map_anytype") @Valid private Map> mapMapAnytype = new HashMap<>(); - @JsonProperty("anytype_1") private Object anytype1; - @JsonProperty("anytype_2") private JsonNullable anytype2 = JsonNullable.undefined(); - @JsonProperty("anytype_3") private Object anytype3; public AdditionalPropertiesClassDto mapString(Map mapString) { @@ -91,6 +80,7 @@ public AdditionalPropertiesClassDto putMapStringItem(String key, String mapStrin */ @ApiModelProperty(value = "") + @JsonProperty("map_string") public Map getMapString() { return mapString; } @@ -118,6 +108,7 @@ public AdditionalPropertiesClassDto putMapNumberItem(String key, BigDecimal mapN */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_number") public Map getMapNumber() { return mapNumber; } @@ -145,6 +136,7 @@ public AdditionalPropertiesClassDto putMapIntegerItem(String key, Integer mapInt */ @ApiModelProperty(value = "") + @JsonProperty("map_integer") public Map getMapInteger() { return mapInteger; } @@ -172,6 +164,7 @@ public AdditionalPropertiesClassDto putMapBooleanItem(String key, Boolean mapBoo */ @ApiModelProperty(value = "") + @JsonProperty("map_boolean") public Map getMapBoolean() { return mapBoolean; } @@ -199,6 +192,7 @@ public AdditionalPropertiesClassDto putMapArrayIntegerItem(String key, List> getMapArrayInteger() { return mapArrayInteger; } @@ -226,6 +220,7 @@ public AdditionalPropertiesClassDto putMapArrayAnytypeItem(String key, List> getMapArrayAnytype() { return mapArrayAnytype; } @@ -253,6 +248,7 @@ public AdditionalPropertiesClassDto putMapMapStringItem(String key, Map> getMapMapString() { return mapMapString; } @@ -280,6 +276,7 @@ public AdditionalPropertiesClassDto putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { return mapMapAnytype; } @@ -299,6 +296,7 @@ public AdditionalPropertiesClassDto anytype1(Object anytype1) { */ @ApiModelProperty(value = "") + @JsonProperty("anytype_1") public Object getAnytype1() { return anytype1; } @@ -318,6 +316,7 @@ public AdditionalPropertiesClassDto anytype2(Object anytype2) { */ @ApiModelProperty(value = "") + @JsonProperty("anytype_2") public JsonNullable getAnytype2() { return anytype2; } @@ -337,6 +336,7 @@ public AdditionalPropertiesClassDto anytype3(Object anytype3) { */ @ApiModelProperty(value = "") + @JsonProperty("anytype_3") public Object getAnytype3() { return anytype3; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java index cea6d655ab4c..b7c7f4e573de 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java @@ -29,19 +29,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ContainerDefaultValueDto { - @JsonProperty("nullable_array") @Valid private JsonNullable> nullableArray = JsonNullable.undefined(); - @JsonProperty("nullable_required_array") @Valid private JsonNullable> nullableRequiredArray = JsonNullable.undefined(); - @JsonProperty("required_array") @Valid private List requiredArray = new ArrayList<>(); - @JsonProperty("nullable_array_with_default") @Valid private JsonNullable> nullableArrayWithDefault = JsonNullable.undefined(); @@ -81,6 +77,7 @@ public ContainerDefaultValueDto addNullableArrayItem(String nullableArrayItem) { */ @ApiModelProperty(value = "") + @JsonProperty("nullable_array") public JsonNullable> getNullableArray() { return nullableArray; } @@ -108,6 +105,7 @@ public ContainerDefaultValueDto addNullableRequiredArrayItem(String nullableRequ */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("nullable_required_array") public JsonNullable> getNullableRequiredArray() { return nullableRequiredArray; } @@ -135,6 +133,7 @@ public ContainerDefaultValueDto addRequiredArrayItem(String requiredArrayItem) { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("required_array") public List getRequiredArray() { return requiredArray; } @@ -162,6 +161,7 @@ public ContainerDefaultValueDto addNullableArrayWithDefaultItem(String nullableA */ @ApiModelProperty(value = "") + @JsonProperty("nullable_array_with_default") public JsonNullable> getNullableArrayWithDefault() { return nullableArrayWithDefault; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java index 347e615ed996..20934ecff640 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java @@ -27,10 +27,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FileSchemaTestClassDto { - @JsonProperty("file") private FileDto file; - @JsonProperty("files") @Valid private List<@Valid FileDto> files; @@ -45,6 +43,7 @@ public FileSchemaTestClassDto file(FileDto file) { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("file") public FileDto getFile() { return file; } @@ -72,6 +71,7 @@ public FileSchemaTestClassDto addFilesItem(FileDto filesItem) { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("files") public List<@Valid FileDto> getFiles() { return files; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/PetDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/PetDto.java index bbd680e89fa0..88d38a4e5031 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/PetDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/PetDto.java @@ -32,20 +32,15 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class PetDto { - @JsonProperty("id") private Long id; - @JsonProperty("category") private CategoryDto category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private Set photoUrls = new LinkedHashSet<>(); - @JsonProperty("tags") @Valid private List<@Valid TagDto> tags; @@ -86,7 +81,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonProperty("status") private StatusEnum status; /** @@ -117,6 +111,7 @@ public PetDto id(Long id) { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -136,6 +131,7 @@ public PetDto category(CategoryDto category) { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("category") public CategoryDto getCategory() { return category; } @@ -155,6 +151,7 @@ public PetDto name(String name) { */ @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") + @JsonProperty("name") public String getName() { return name; } @@ -182,6 +179,7 @@ public PetDto addPhotoUrlsItem(String photoUrlsItem) { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("photoUrls") public Set getPhotoUrls() { return photoUrls; } @@ -210,6 +208,7 @@ public PetDto addTagsItem(TagDto tagsItem) { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("tags") public List<@Valid TagDto> getTags() { return tags; } @@ -229,6 +228,7 @@ public PetDto status(StatusEnum status) { */ @ApiModelProperty(value = "pet status in the store") + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java new file mode 100644 index 000000000000..3276113a5c98 --- /dev/null +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java @@ -0,0 +1,158 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * ResponseObjectWithDifferentFieldNamesDto + */ + +@JsonTypeName("ResponseObjectWithDifferentFieldNames") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public class ResponseObjectWithDifferentFieldNamesDto { + + private String normalPropertyName; + + private String UPPER_CASE_PROPERTY_SNAKE; + + private String lowerCasePropertyDashes; + + private String propertyNameWithSpaces; + + public ResponseObjectWithDifferentFieldNamesDto normalPropertyName(String normalPropertyName) { + this.normalPropertyName = normalPropertyName; + return this; + } + + /** + * Get normalPropertyName + * @return normalPropertyName + */ + + @ApiModelProperty(value = "") + @JsonProperty("normalPropertyName") + public String getNormalPropertyName() { + return normalPropertyName; + } + + public void setNormalPropertyName(String normalPropertyName) { + this.normalPropertyName = normalPropertyName; + } + + public ResponseObjectWithDifferentFieldNamesDto UPPER_CASE_PROPERTY_SNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; + return this; + } + + /** + * Get UPPER_CASE_PROPERTY_SNAKE + * @return UPPER_CASE_PROPERTY_SNAKE + */ + + @ApiModelProperty(value = "") + @JsonProperty("UPPER_CASE_PROPERTY_SNAKE") + public String getUPPERCASEPROPERTYSNAKE() { + return UPPER_CASE_PROPERTY_SNAKE; + } + + public void setUPPERCASEPROPERTYSNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; + } + + public ResponseObjectWithDifferentFieldNamesDto lowerCasePropertyDashes(String lowerCasePropertyDashes) { + this.lowerCasePropertyDashes = lowerCasePropertyDashes; + return this; + } + + /** + * Get lowerCasePropertyDashes + * @return lowerCasePropertyDashes + */ + + @ApiModelProperty(value = "") + @JsonProperty("lower-case-property-dashes") + public String getLowerCasePropertyDashes() { + return lowerCasePropertyDashes; + } + + public void setLowerCasePropertyDashes(String lowerCasePropertyDashes) { + this.lowerCasePropertyDashes = lowerCasePropertyDashes; + } + + public ResponseObjectWithDifferentFieldNamesDto propertyNameWithSpaces(String propertyNameWithSpaces) { + this.propertyNameWithSpaces = propertyNameWithSpaces; + return this; + } + + /** + * Get propertyNameWithSpaces + * @return propertyNameWithSpaces + */ + + @ApiModelProperty(value = "") + @JsonProperty("property name with spaces") + public String getPropertyNameWithSpaces() { + return propertyNameWithSpaces; + } + + public void setPropertyNameWithSpaces(String propertyNameWithSpaces) { + this.propertyNameWithSpaces = propertyNameWithSpaces; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ResponseObjectWithDifferentFieldNamesDto responseObjectWithDifferentFieldNames = (ResponseObjectWithDifferentFieldNamesDto) o; + return Objects.equals(this.normalPropertyName, responseObjectWithDifferentFieldNames.normalPropertyName) && + Objects.equals(this.UPPER_CASE_PROPERTY_SNAKE, responseObjectWithDifferentFieldNames.UPPER_CASE_PROPERTY_SNAKE) && + Objects.equals(this.lowerCasePropertyDashes, responseObjectWithDifferentFieldNames.lowerCasePropertyDashes) && + Objects.equals(this.propertyNameWithSpaces, responseObjectWithDifferentFieldNames.propertyNameWithSpaces); + } + + @Override + public int hashCode() { + return Objects.hash(normalPropertyName, UPPER_CASE_PROPERTY_SNAKE, lowerCasePropertyDashes, propertyNameWithSpaces); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ResponseObjectWithDifferentFieldNamesDto {\n"); + sb.append(" normalPropertyName: ").append(toIndentedString(normalPropertyName)).append("\n"); + sb.append(" UPPER_CASE_PROPERTY_SNAKE: ").append(toIndentedString(UPPER_CASE_PROPERTY_SNAKE)).append("\n"); + sb.append(" lowerCasePropertyDashes: ").append(toIndentedString(lowerCasePropertyDashes)).append("\n"); + sb.append(" propertyNameWithSpaces: ").append(toIndentedString(propertyNameWithSpaces)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java index 465fb77c08c5..ef1a9c240ee7 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java @@ -27,19 +27,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderDefaultDto { - @JsonProperty("string_item") private String stringItem = "what"; - @JsonProperty("number_item") private BigDecimal numberItem = new BigDecimal("1.234"); - @JsonProperty("integer_item") private Integer integerItem = -2; - @JsonProperty("bool_item") private Boolean boolItem = true; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); @@ -74,6 +69,7 @@ public TypeHolderDefaultDto stringItem(String stringItem) { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -93,6 +89,7 @@ public TypeHolderDefaultDto numberItem(BigDecimal numberItem) { */ @NotNull @Valid @ApiModelProperty(required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -112,6 +109,7 @@ public TypeHolderDefaultDto integerItem(Integer integerItem) { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -131,6 +129,7 @@ public TypeHolderDefaultDto boolItem(Boolean boolItem) { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -158,6 +157,7 @@ public TypeHolderDefaultDto addArrayItemItem(Integer arrayItemItem) { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderExampleDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderExampleDto.java index 15dc401681a8..c4eb4d967212 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderExampleDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderExampleDto.java @@ -27,22 +27,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderExampleDto { - @JsonProperty("string_item") private String stringItem; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("float_item") private Float floatItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -78,6 +72,7 @@ public TypeHolderExampleDto stringItem(String stringItem) { */ @NotNull @ApiModelProperty(example = "what", required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -97,6 +92,7 @@ public TypeHolderExampleDto numberItem(BigDecimal numberItem) { */ @NotNull @Valid @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -116,6 +112,7 @@ public TypeHolderExampleDto floatItem(Float floatItem) { */ @NotNull @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("float_item") public Float getFloatItem() { return floatItem; } @@ -135,6 +132,7 @@ public TypeHolderExampleDto integerItem(Integer integerItem) { */ @NotNull @ApiModelProperty(example = "-2", required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -154,6 +152,7 @@ public TypeHolderExampleDto boolItem(Boolean boolItem) { */ @NotNull @ApiModelProperty(example = "true", required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -181,6 +180,7 @@ public TypeHolderExampleDto addArrayItemItem(Integer arrayItemItem) { */ @NotNull @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot/src/main/resources/openapi.yaml b/samples/server/petstore/springboot/src/main/resources/openapi.yaml index c2cce49a8004..2151d60d7584 100644 --- a/samples/server/petstore/springboot/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot/src/main/resources/openapi.yaml @@ -1174,6 +1174,31 @@ paths: x-accepts: application/json x-tags: - tag: pet + /fake/{petId}/response-object-different-names: + get: + operationId: responseObjectDifferentNames + parameters: + - description: ID of pet to update + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ResponseObjectWithDifferentFieldNames' + description: successful operation + tags: + - pet + x-accepts: application/json + x-tags: + - tag: pet components: requestBodies: UserArray: @@ -2106,6 +2131,22 @@ components: - nullable_required_array - required_array type: object + ResponseObjectWithDifferentFieldNames: + example: + UPPER_CASE_PROPERTY_SNAKE: UPPER_CASE_PROPERTY_SNAKE + lower-case-property-dashes: lower-case-property-dashes + property name with spaces: property name with spaces + normalPropertyName: normalPropertyName + properties: + normalPropertyName: + type: string + UPPER_CASE_PROPERTY_SNAKE: + type: string + lower-case-property-dashes: + type: string + property name with spaces: + type: string + type: object updatePetWithForm_request: properties: name: