diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/beanValidation.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/beanValidation.mustache index 6bed33003cbd..e427a43a0acd 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/beanValidation.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/beanValidation.mustache @@ -1,2 +1 @@ -{{#required}}{{^isReadOnly}} @NotNull -{{/isReadOnly}}{{/required}}{{>beanValidationCore}} \ No newline at end of file +{{#required}}{{^isReadOnly}}@NotNull {{/isReadOnly}}{{/required}}{{#isContainer}}{{^isPrimitiveType}}{{^isEnum}}@Valid {{/isEnum}}{{/isPrimitiveType}}{{/isContainer}}{{^isContainer}}{{^isPrimitiveType}}@Valid {{/isPrimitiveType}}{{/isContainer}}{{>beanValidationCore}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pojo.mustache index c7b55b1afa91..5bcfd364feef 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pojo.mustache @@ -32,7 +32,7 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#vendorExtens {{#vendorExtensions.x-field-extra-annotation}} {{{vendorExtensions.x-field-extra-annotation}}} {{/vendorExtensions.x-field-extra-annotation}} - private {{#useBeanValidation}}@Valid {{/useBeanValidation}}{{{datatypeWithEnum}}} {{name}}{{#defaultValue}} = {{{.}}}{{/defaultValue}}; + private {{#isContainer}}{{#useBeanValidation}}@Valid {{/useBeanValidation}}{{/isContainer}}{{{datatypeWithEnum}}} {{name}}{{#defaultValue}} = {{{.}}}{{/defaultValue}}; {{/vars}} {{#generateBuilders}} {{^additionalProperties}} @@ -72,7 +72,7 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#vendorExtens @ApiModelProperty({{#example}}example = "{{{.}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}"){{/useSwaggerAnnotations}}{{#useMicroProfileOpenAPIAnnotations}} @org.eclipse.microprofile.openapi.annotations.media.Schema({{#example}}example = "{{{.}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}description = "{{{description}}}"){{/useMicroProfileOpenAPIAnnotations}} @JsonProperty("{{baseName}}") -{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}} public {{>beanValidatedType}} {{getter}}() { + {{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}public {{>beanValidatedType}} {{getter}}() { return {{name}}; } diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSSpecServerCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSSpecServerCodegenTest.java index 4e312c8164e1..c11931e8a4fd 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSSpecServerCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSSpecServerCodegenTest.java @@ -714,6 +714,31 @@ public void testHandleDefaultValue_issue8535() throws Exception { .containsWithNameAndAttributes("DefaultValue", ImmutableMap.of("value", "\"true\"")); } + @Test + public void testValidAnnotation_issue14432() throws Exception { + File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); + output.deleteOnExit(); + + OpenAPI openAPI = new OpenAPIParser() + .readLocation("src/test/resources/3_0/issue_14432.yaml", null, new ParseOptions()).getOpenAPI(); + + codegen.setOutputDir(output.getAbsolutePath()); + + ClientOptInput input = new ClientOptInput() + .openAPI(openAPI) + .config(codegen); + + DefaultGenerator generator = new DefaultGenerator(); + Map files = generator.opts(input).generate().stream() + .collect(Collectors.toMap(File::getName, Function.identity())); + + JavaFileAssert.assertThat(files.get("ComplexObject.java")) + .fileContains("private @Valid List dates") + .fileDoesNotContains("private @Valid SymbolTypeEnum symbolType") + .fileDoesNotContains("@Valid String") + .fileDoesNotContains("@Valid Double"); + } + @Test public void arrayNullableDefaultValueTests() throws Exception { final File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); diff --git a/modules/openapi-generator/src/test/resources/3_0/issue_14432.yaml b/modules/openapi-generator/src/test/resources/3_0/issue_14432.yaml new file mode 100644 index 000000000000..6f0a9e77ae93 --- /dev/null +++ b/modules/openapi-generator/src/test/resources/3_0/issue_14432.yaml @@ -0,0 +1,30 @@ +openapi: "3.0.3" +info: + title: "Demo models" + version: "1.0" +paths: {} +components: + schemas: + ComplexObject: + type: "object" + properties: + id: + type: "string" + probability: + type: "number" + format: "double" + dates: + type: "array" + items: + type: "string" + format: "date" + symbolType: + type: "string" + enum: + - "SYMBOL1" + - "SYMBOL2" + - "SYMBOL3" + ComplexArray: + type: array + items: + $ref: '#/components/schemas/ComplexObject' diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java index b17edadb0087..1ab2c2ecbf1d 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -20,7 +20,7 @@ @JsonTypeName("AdditionalPropertiesAnyType") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class AdditionalPropertiesAnyType extends HashMap implements Serializable { - private @Valid String name; + private String name; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java index 18993dba3513..6b2390dfed9c 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -21,7 +21,7 @@ @JsonTypeName("AdditionalPropertiesArray") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class AdditionalPropertiesArray extends HashMap implements Serializable { - private @Valid String name; + private String name; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 5838ddee4c8e..a2e62819c2cf 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -20,7 +20,7 @@ @JsonTypeName("AdditionalPropertiesBoolean") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class AdditionalPropertiesBoolean extends HashMap implements Serializable { - private @Valid String name; + private String name; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java index 3e5585941f1d..8fe4b8cba4e3 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -30,9 +30,9 @@ public class AdditionalPropertiesClass implements Serializable { private @Valid Map> mapArrayAnytype = new HashMap<>(); private @Valid Map> mapMapString = new HashMap<>(); private @Valid Map> mapMapAnytype = new HashMap<>(); - private @Valid Object anytype1; - private @Valid Object anytype2; - private @Valid Object anytype3; + private Object anytype1; + private Object anytype2; + private Object anytype3; /** **/ @@ -79,7 +79,7 @@ public AdditionalPropertiesClass mapNumber(Map mapNumber) { @ApiModelProperty(value = "") @JsonProperty("map_number") - public Map getMapNumber() { + @Valid public Map getMapNumber() { return mapNumber; } @@ -184,7 +184,7 @@ public AdditionalPropertiesClass mapArrayInteger(Map> mapA @ApiModelProperty(value = "") @JsonProperty("map_array_integer") - public Map> getMapArrayInteger() { + @Valid public Map> getMapArrayInteger() { return mapArrayInteger; } @@ -219,7 +219,7 @@ public AdditionalPropertiesClass mapArrayAnytype(Map> mapAr @ApiModelProperty(value = "") @JsonProperty("map_array_anytype") - public Map> getMapArrayAnytype() { + @Valid public Map> getMapArrayAnytype() { return mapArrayAnytype; } @@ -254,7 +254,7 @@ public AdditionalPropertiesClass mapMapString(Map> m @ApiModelProperty(value = "") @JsonProperty("map_map_string") - public Map> getMapMapString() { + @Valid public Map> getMapMapString() { return mapMapString; } @@ -289,7 +289,7 @@ public AdditionalPropertiesClass mapMapAnytype(Map> @ApiModelProperty(value = "") @JsonProperty("map_map_anytype") - public Map> getMapMapAnytype() { + @Valid public Map> getMapMapAnytype() { return mapMapAnytype; } diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java index aac490cd9471..ab1879a09448 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -20,7 +20,7 @@ @JsonTypeName("AdditionalPropertiesInteger") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class AdditionalPropertiesInteger extends HashMap implements Serializable { - private @Valid String name; + private String name; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java index dad9369cea7b..9e3749ef252a 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -21,7 +21,7 @@ @JsonTypeName("AdditionalPropertiesNumber") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class AdditionalPropertiesNumber extends HashMap implements Serializable { - private @Valid String name; + private String name; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java index 5b728850fb70..0f6768aa5188 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -20,7 +20,7 @@ @JsonTypeName("AdditionalPropertiesObject") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class AdditionalPropertiesObject extends HashMap implements Serializable { - private @Valid String name; + private String name; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java index 7c3dc5397e69..8eb4b6a91d90 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java @@ -20,7 +20,7 @@ @JsonTypeName("AdditionalPropertiesString") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class AdditionalPropertiesString extends HashMap implements Serializable { - private @Valid String name; + private String name; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Animal.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Animal.java index fc2776061334..447f82b9382e 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Animal.java @@ -27,8 +27,8 @@ @JsonTypeName("Animal") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Animal implements Serializable { - private @Valid String className; - private @Valid String color = "red"; + private String className; + private String color = "red"; /** **/ @@ -40,8 +40,7 @@ public Animal className(String className) { @ApiModelProperty(required = true, value = "") @JsonProperty("className") - @NotNull - public String getClassName() { + @NotNull public String getClassName() { return className; } diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 544a79fe70ca..69b28f6f9a9c 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -34,7 +34,7 @@ public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArr @ApiModelProperty(value = "") @JsonProperty("ArrayArrayNumber") - public List> getArrayArrayNumber() { + @Valid public List<@Valid List<@Valid BigDecimal>> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java index 83074c3b923c..2ae289e784dc 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -34,7 +34,7 @@ public ArrayOfNumberOnly arrayNumber(List arrayNumber) { @ApiModelProperty(value = "") @JsonProperty("ArrayNumber") - public List getArrayNumber() { + @Valid public List<@Valid BigDecimal> getArrayNumber() { return arrayNumber; } diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayTest.java index f58ed8ad766f..a88ed211323f 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayTest.java @@ -71,7 +71,7 @@ public ArrayTest arrayArrayOfInteger(List> arrayArrayOfInteger) { @ApiModelProperty(value = "") @JsonProperty("array_array_of_integer") - public List> getArrayArrayOfInteger() { + @Valid public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; } @@ -106,7 +106,7 @@ public ArrayTest arrayArrayOfModel(List> arrayArrayOf @ApiModelProperty(value = "") @JsonProperty("array_array_of_model") - public List> getArrayArrayOfModel() { + @Valid public List<@Valid List<@Valid ReadOnlyFirst>> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/BigCat.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/BigCat.java index 7e5051685e55..ab7277ae311a 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/BigCat.java @@ -66,7 +66,7 @@ public static KindEnum fromValue(String value) { } } - private @Valid KindEnum kind; + private KindEnum kind; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Capitalization.java index 3dac2cb65b44..e93e8a2ea08f 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Capitalization.java @@ -18,12 +18,12 @@ @JsonTypeName("Capitalization") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Capitalization implements Serializable { - private @Valid String smallCamel; - private @Valid String capitalCamel; - private @Valid String smallSnake; - private @Valid String capitalSnake; - private @Valid String scAETHFlowPoints; - private @Valid String ATT_NAME; + private String smallCamel; + private String capitalCamel; + private String smallSnake; + private String capitalSnake; + private String scAETHFlowPoints; + private String ATT_NAME; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Cat.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Cat.java index 8de429f5d4f5..97057b7fdbd2 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Cat.java @@ -19,7 +19,7 @@ @JsonTypeName("Cat") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Cat extends Animal implements Serializable { - private @Valid Boolean declawed; + private Boolean declawed; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Category.java index cb17ff74b5d9..6c295ad590f9 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Category.java @@ -18,8 +18,8 @@ @JsonTypeName("Category") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Category implements Serializable { - private @Valid Long id; - private @Valid String name = "default-name"; + private Long id; + private String name = "default-name"; /** **/ @@ -50,8 +50,7 @@ public Category name(String name) { @ApiModelProperty(required = true, value = "") @JsonProperty("name") - @NotNull - public String getName() { + @NotNull public String getName() { return name; } diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ClassModel.java index ad3358d833ce..fb3c135e52c6 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ClassModel.java @@ -20,7 +20,7 @@ @JsonTypeName("ClassModel") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class ClassModel implements Serializable { - private @Valid String propertyClass; + private String propertyClass; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Client.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Client.java index c5a4a36d33a1..adf3a3aa08e0 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Client.java @@ -18,7 +18,7 @@ @JsonTypeName("Client") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Client implements Serializable { - private @Valid String client; + private String client; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Dog.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Dog.java index a7a698c48170..e8fa146419da 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Dog.java @@ -19,7 +19,7 @@ @JsonTypeName("Dog") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Dog extends Animal implements Serializable { - private @Valid String breed; + private String breed; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/EnumArrays.java index 08f67648afc1..ca6333204b92 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/EnumArrays.java @@ -68,7 +68,7 @@ public static JustSymbolEnum fromValue(String value) { } } - private @Valid JustSymbolEnum justSymbol; + private JustSymbolEnum justSymbol; public enum ArrayEnumEnum { FISH(String.valueOf("fish")), CRAB(String.valueOf("crab")); diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/EnumTest.java index 598f222af70e..44a341d07616 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/EnumTest.java @@ -67,7 +67,7 @@ public static EnumStringEnum fromValue(String value) { } } - private @Valid EnumStringEnum enumString; + private EnumStringEnum enumString; public enum EnumStringRequiredEnum { UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower")), EMPTY(String.valueOf("")); @@ -115,7 +115,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } - private @Valid EnumStringRequiredEnum enumStringRequired; + private EnumStringRequiredEnum enumStringRequired; public enum EnumIntegerEnum { NUMBER_1(Integer.valueOf(1)), NUMBER_MINUS_1(Integer.valueOf(-1)); @@ -163,7 +163,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } - private @Valid EnumIntegerEnum enumInteger; + private EnumIntegerEnum enumInteger; public enum EnumNumberEnum { NUMBER_1_DOT_1(Double.valueOf(1.1)), NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2)); @@ -211,8 +211,8 @@ public static EnumNumberEnum fromValue(Double value) { } } - private @Valid EnumNumberEnum enumNumber; - private @Valid OuterEnum outerEnum; + private EnumNumberEnum enumNumber; + private OuterEnum outerEnum; /** **/ @@ -243,8 +243,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) { @ApiModelProperty(required = true, value = "") @JsonProperty("enum_string_required") - @NotNull - public EnumStringRequiredEnum getEnumStringRequired() { + @NotNull public EnumStringRequiredEnum getEnumStringRequired() { return enumStringRequired; } @@ -301,7 +300,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) { @ApiModelProperty(value = "") @JsonProperty("outerEnum") - public OuterEnum getOuterEnum() { + @Valid public OuterEnum getOuterEnum() { return outerEnum; } diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/FileSchemaTestClass.java index e0353d057c1b..9f94927c4731 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/FileSchemaTestClass.java @@ -22,7 +22,7 @@ @JsonTypeName("FileSchemaTestClass") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class FileSchemaTestClass implements Serializable { - private @Valid ModelFile _file; + private ModelFile _file; private @Valid List<@Valid ModelFile> files = new ArrayList<>(); /** @@ -35,7 +35,7 @@ public FileSchemaTestClass _file(ModelFile _file) { @ApiModelProperty(value = "") @JsonProperty("file") - public ModelFile getFile() { + @Valid public ModelFile getFile() { return _file; } @@ -54,7 +54,7 @@ public FileSchemaTestClass files(List<@Valid ModelFile> files) { @ApiModelProperty(value = "") @JsonProperty("files") - public List getFiles() { + @Valid public List<@Valid ModelFile> getFiles() { return files; } diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/FormatTest.java index e90855b384a7..68f0341ab9b5 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/FormatTest.java @@ -25,20 +25,20 @@ @JsonTypeName("format_test") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class FormatTest implements Serializable { - private @Valid Integer integer; - private @Valid Integer int32; - private @Valid Long int64; - private @Valid BigDecimal number; - private @Valid Float _float; - private @Valid Double _double; - private @Valid String string; - private @Valid byte[] _byte; - private @Valid File binary; - private @Valid LocalDate date; - private @Valid Date dateTime; - private @Valid UUID uuid; - private @Valid String password; - private @Valid BigDecimal bigDecimal; + private Integer integer; + private Integer int32; + private Long int64; + private BigDecimal number; + private Float _float; + private Double _double; + private String string; + private byte[] _byte; + private File binary; + private LocalDate date; + private Date dateTime; + private UUID uuid; + private String password; + private BigDecimal bigDecimal; /** * minimum: 10 @@ -52,7 +52,7 @@ public FormatTest integer(Integer integer) { @ApiModelProperty(value = "") @JsonProperty("integer") - @Min(10) @Max(100) public Integer getInteger() { + @Min(10) @Max(100)public Integer getInteger() { return integer; } @@ -73,7 +73,7 @@ public FormatTest int32(Integer int32) { @ApiModelProperty(value = "") @JsonProperty("int32") - @Min(20) @Max(200) public Integer getInt32() { + @Min(20) @Max(200)public Integer getInt32() { return int32; } @@ -113,8 +113,7 @@ public FormatTest number(BigDecimal number) { @ApiModelProperty(required = true, value = "") @JsonProperty("number") - @NotNull - @DecimalMin("32.1") @DecimalMax("543.2") public BigDecimal getNumber() { + @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2")public BigDecimal getNumber() { return number; } @@ -135,7 +134,7 @@ public FormatTest _float(Float _float) { @ApiModelProperty(value = "") @JsonProperty("float") - @DecimalMin("54.3") @DecimalMax("987.6") public Float getFloat() { + @DecimalMin("54.3") @DecimalMax("987.6")public Float getFloat() { return _float; } @@ -156,7 +155,7 @@ public FormatTest _double(Double _double) { @ApiModelProperty(value = "") @JsonProperty("double") - @DecimalMin("67.8") @DecimalMax("123.4") public Double getDouble() { + @DecimalMin("67.8") @DecimalMax("123.4")public Double getDouble() { return _double; } @@ -175,7 +174,7 @@ public FormatTest string(String string) { @ApiModelProperty(value = "") @JsonProperty("string") - @Pattern(regexp="/[a-z]/i") public String getString() { + @Pattern(regexp="/[a-z]/i")public String getString() { return string; } @@ -194,8 +193,7 @@ public FormatTest _byte(byte[] _byte) { @ApiModelProperty(required = true, value = "") @JsonProperty("byte") - @NotNull - @Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$") public byte[] getByte() { + @NotNull @Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$")public byte[] getByte() { return _byte; } @@ -214,7 +212,7 @@ public FormatTest binary(File binary) { @ApiModelProperty(value = "") @JsonProperty("binary") - public File getBinary() { + @Valid public File getBinary() { return binary; } @@ -233,8 +231,7 @@ public FormatTest date(LocalDate date) { @ApiModelProperty(required = true, value = "") @JsonProperty("date") - @NotNull - public LocalDate getDate() { + @NotNull @Valid public LocalDate getDate() { return date; } @@ -253,7 +250,7 @@ public FormatTest dateTime(Date dateTime) { @ApiModelProperty(value = "") @JsonProperty("dateTime") - public Date getDateTime() { + @Valid public Date getDateTime() { return dateTime; } @@ -272,7 +269,7 @@ public FormatTest uuid(UUID uuid) { @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") @JsonProperty("uuid") - public UUID getUuid() { + @Valid public UUID getUuid() { return uuid; } @@ -291,8 +288,7 @@ public FormatTest password(String password) { @ApiModelProperty(required = true, value = "") @JsonProperty("password") - @NotNull - @Size(min=10,max=64) public String getPassword() { + @NotNull @Size(min=10,max=64)public String getPassword() { return password; } @@ -311,7 +307,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) { @ApiModelProperty(value = "") @JsonProperty("BigDecimal") - public BigDecimal getBigDecimal() { + @Valid public BigDecimal getBigDecimal() { return bigDecimal; } diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java index 9eed495407f8..1a8fc1a66c9f 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java @@ -19,8 +19,8 @@ @JsonTypeName("hasOnlyReadOnly") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class HasOnlyReadOnly implements Serializable { - private @Valid String bar; - private @Valid String foo; + private String bar; + private String foo; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/MapTest.java index 18612dca4028..ff0973b308ab 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/MapTest.java @@ -82,7 +82,7 @@ public MapTest mapMapOfString(Map> mapMapOfString) { @ApiModelProperty(value = "") @JsonProperty("map_map_of_string") - public Map> getMapMapOfString() { + @Valid public Map> getMapMapOfString() { return mapMapOfString; } diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 662bd380fbaf..fae42ecba0d6 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -23,8 +23,8 @@ @JsonTypeName("MixedPropertiesAndAdditionalPropertiesClass") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class MixedPropertiesAndAdditionalPropertiesClass implements Serializable { - private @Valid UUID uuid; - private @Valid Date dateTime; + private UUID uuid; + private Date dateTime; private @Valid Map map = new HashMap<>(); /** @@ -37,7 +37,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { @ApiModelProperty(value = "") @JsonProperty("uuid") - public UUID getUuid() { + @Valid public UUID getUuid() { return uuid; } @@ -56,7 +56,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(Date dateTime) { @ApiModelProperty(value = "") @JsonProperty("dateTime") - public Date getDateTime() { + @Valid public Date getDateTime() { return dateTime; } @@ -75,7 +75,7 @@ public MixedPropertiesAndAdditionalPropertiesClass map(Map map) @ApiModelProperty(value = "") @JsonProperty("map") - public Map getMap() { + @Valid public Map getMap() { return map; } diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Model200Response.java index 605c87682b90..08b32759360e 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Model200Response.java @@ -21,8 +21,8 @@ @JsonTypeName("200_response") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Model200Response implements Serializable { - private @Valid Integer name; - private @Valid String propertyClass; + private Integer name; + private String propertyClass; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelApiResponse.java index 9296170ed4a0..71e134bff553 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelApiResponse.java @@ -19,9 +19,9 @@ @JsonTypeName("ApiResponse") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class ModelApiResponse implements Serializable { - private @Valid Integer code; - private @Valid String type; - private @Valid String message; + private Integer code; + private String type; + private String message; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelFile.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelFile.java index 54637acdad85..6b80184356bb 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelFile.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelFile.java @@ -21,7 +21,7 @@ @JsonTypeName("File") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class ModelFile implements Serializable { - private @Valid String sourceURI; + private String sourceURI; /** * Test capitalization diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelList.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelList.java index f76710ae99f0..24fd6098f031 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelList.java @@ -19,7 +19,7 @@ @JsonTypeName("List") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class ModelList implements Serializable { - private @Valid String _123list; + private String _123list; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelReturn.java index e96dbdffdee1..7b17451db0bd 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelReturn.java @@ -21,7 +21,7 @@ @JsonTypeName("Return") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class ModelReturn implements Serializable { - private @Valid Integer _return; + private Integer _return; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Name.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Name.java index b6b144d96c0e..f3c659923a64 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Name.java @@ -20,10 +20,10 @@ @JsonTypeName("Name") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Name implements Serializable { - private @Valid Integer name; - private @Valid Integer snakeCase; - private @Valid String property; - private @Valid Integer _123number; + private Integer name; + private Integer snakeCase; + private String property; + private Integer _123number; /** **/ @@ -35,8 +35,7 @@ public Name name(Integer name) { @ApiModelProperty(required = true, value = "") @JsonProperty("name") - @NotNull - public Integer getName() { + @NotNull public Integer getName() { return name; } diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/NumberOnly.java index e9e320f283fd..7e3bdde9f943 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/NumberOnly.java @@ -19,7 +19,7 @@ @JsonTypeName("NumberOnly") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class NumberOnly implements Serializable { - private @Valid BigDecimal justNumber; + private BigDecimal justNumber; /** **/ @@ -31,7 +31,7 @@ public NumberOnly justNumber(BigDecimal justNumber) { @ApiModelProperty(value = "") @JsonProperty("JustNumber") - public BigDecimal getJustNumber() { + @Valid public BigDecimal getJustNumber() { return justNumber; } diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Order.java index c254310bc533..d42891bb4e43 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Order.java @@ -19,10 +19,10 @@ @JsonTypeName("Order") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Order implements Serializable { - private @Valid Long id; - private @Valid Long petId; - private @Valid Integer quantity; - private @Valid Date shipDate; + private Long id; + private Long petId; + private Integer quantity; + private Date shipDate; public enum StatusEnum { PLACED(String.valueOf("placed")), APPROVED(String.valueOf("approved")), DELIVERED(String.valueOf("delivered")); @@ -70,8 +70,8 @@ public static StatusEnum fromValue(String value) { } } - private @Valid StatusEnum status; - private @Valid Boolean complete = false; + private StatusEnum status; + private Boolean complete = false; /** **/ @@ -140,7 +140,7 @@ public Order shipDate(Date shipDate) { @ApiModelProperty(value = "") @JsonProperty("shipDate") - public Date getShipDate() { + @Valid public Date getShipDate() { return shipDate; } diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/OuterComposite.java index 133cd75a5d4d..04fd53a4d264 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/OuterComposite.java @@ -19,9 +19,9 @@ @JsonTypeName("OuterComposite") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class OuterComposite implements Serializable { - private @Valid BigDecimal myNumber; - private @Valid String myString; - private @Valid Boolean myBoolean; + private BigDecimal myNumber; + private String myString; + private Boolean myBoolean; /** **/ @@ -33,7 +33,7 @@ public OuterComposite myNumber(BigDecimal myNumber) { @ApiModelProperty(value = "") @JsonProperty("my_number") - public BigDecimal getMyNumber() { + @Valid public BigDecimal getMyNumber() { return myNumber; } diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Pet.java index 4828f7fcc2e7..f118f2af1916 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Pet.java @@ -26,9 +26,9 @@ @JsonTypeName("Pet") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Pet implements Serializable { - private @Valid Long id; - private @Valid Category category; - private @Valid String name; + private Long id; + private Category category; + private String name; private @Valid Set photoUrls = new LinkedHashSet<>(); private @Valid List<@Valid Tag> tags = new ArrayList<>(); public enum StatusEnum { @@ -78,7 +78,7 @@ public static StatusEnum fromValue(String value) { } } - private @Valid StatusEnum status; + private StatusEnum status; /** **/ @@ -109,7 +109,7 @@ public Pet category(Category category) { @ApiModelProperty(value = "") @JsonProperty("category") - public Category getCategory() { + @Valid public Category getCategory() { return category; } @@ -128,8 +128,7 @@ public Pet name(String name) { @ApiModelProperty(example = "doggie", required = true, value = "") @JsonProperty("name") - @NotNull - public String getName() { + @NotNull public String getName() { return name; } @@ -148,8 +147,7 @@ public Pet photoUrls(Set photoUrls) { @ApiModelProperty(required = true, value = "") @JsonProperty("photoUrls") - @NotNull - public Set getPhotoUrls() { + @NotNull public Set getPhotoUrls() { return photoUrls; } @@ -185,7 +183,7 @@ public Pet tags(List<@Valid Tag> tags) { @ApiModelProperty(value = "") @JsonProperty("tags") - public List getTags() { + @Valid public List<@Valid Tag> getTags() { return tags; } diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ReadOnlyFirst.java index da7e8d0e4862..d74df23fe236 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ReadOnlyFirst.java @@ -18,8 +18,8 @@ @JsonTypeName("ReadOnlyFirst") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class ReadOnlyFirst implements Serializable { - private @Valid String bar; - private @Valid String baz; + private String bar; + private String baz; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/SpecialModelName.java index 1a52b7894be1..ed1148cbcdf2 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/SpecialModelName.java @@ -19,7 +19,7 @@ @JsonTypeName("$special[model.name]") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class SpecialModelName implements Serializable { - private @Valid Long $specialPropertyName; + private Long $specialPropertyName; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Tag.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Tag.java index f0413e7790fd..faca0fee305e 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Tag.java @@ -18,8 +18,8 @@ @JsonTypeName("Tag") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Tag implements Serializable { - private @Valid Long id; - private @Valid String name; + private Long id; + private String name; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/TypeHolderDefault.java index c2b2d6b22104..832f1785068f 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/TypeHolderDefault.java @@ -22,10 +22,10 @@ @JsonTypeName("TypeHolderDefault") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class TypeHolderDefault implements Serializable { - private @Valid String stringItem = "what"; - private @Valid BigDecimal numberItem; - private @Valid Integer integerItem; - private @Valid Boolean boolItem = true; + private String stringItem = "what"; + private BigDecimal numberItem; + private Integer integerItem; + private Boolean boolItem = true; private @Valid List arrayItem = new ArrayList<>(); /** @@ -38,8 +38,7 @@ public TypeHolderDefault stringItem(String stringItem) { @ApiModelProperty(required = true, value = "") @JsonProperty("string_item") - @NotNull - public String getStringItem() { + @NotNull public String getStringItem() { return stringItem; } @@ -58,8 +57,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) { @ApiModelProperty(required = true, value = "") @JsonProperty("number_item") - @NotNull - public BigDecimal getNumberItem() { + @NotNull @Valid public BigDecimal getNumberItem() { return numberItem; } @@ -78,8 +76,7 @@ public TypeHolderDefault integerItem(Integer integerItem) { @ApiModelProperty(required = true, value = "") @JsonProperty("integer_item") - @NotNull - public Integer getIntegerItem() { + @NotNull public Integer getIntegerItem() { return integerItem; } @@ -98,8 +95,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) { @ApiModelProperty(required = true, value = "") @JsonProperty("bool_item") - @NotNull - public Boolean getBoolItem() { + @NotNull public Boolean getBoolItem() { return boolItem; } @@ -118,8 +114,7 @@ public TypeHolderDefault arrayItem(List arrayItem) { @ApiModelProperty(required = true, value = "") @JsonProperty("array_item") - @NotNull - public List getArrayItem() { + @NotNull public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/TypeHolderExample.java index b7c90b76c72a..01906a1d5511 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/TypeHolderExample.java @@ -22,11 +22,11 @@ @JsonTypeName("TypeHolderExample") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class TypeHolderExample implements Serializable { - private @Valid String stringItem; - private @Valid BigDecimal numberItem; - private @Valid Float floatItem; - private @Valid Integer integerItem; - private @Valid Boolean boolItem; + private String stringItem; + private BigDecimal numberItem; + private Float floatItem; + private Integer integerItem; + private Boolean boolItem; private @Valid List arrayItem = new ArrayList<>(); /** @@ -39,8 +39,7 @@ public TypeHolderExample stringItem(String stringItem) { @ApiModelProperty(example = "what", required = true, value = "") @JsonProperty("string_item") - @NotNull - public String getStringItem() { + @NotNull public String getStringItem() { return stringItem; } @@ -59,8 +58,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { @ApiModelProperty(example = "1.234", required = true, value = "") @JsonProperty("number_item") - @NotNull - public BigDecimal getNumberItem() { + @NotNull @Valid public BigDecimal getNumberItem() { return numberItem; } @@ -79,8 +77,7 @@ public TypeHolderExample floatItem(Float floatItem) { @ApiModelProperty(example = "1.234", required = true, value = "") @JsonProperty("float_item") - @NotNull - public Float getFloatItem() { + @NotNull public Float getFloatItem() { return floatItem; } @@ -99,8 +96,7 @@ public TypeHolderExample integerItem(Integer integerItem) { @ApiModelProperty(example = "-2", required = true, value = "") @JsonProperty("integer_item") - @NotNull - public Integer getIntegerItem() { + @NotNull public Integer getIntegerItem() { return integerItem; } @@ -119,8 +115,7 @@ public TypeHolderExample boolItem(Boolean boolItem) { @ApiModelProperty(example = "true", required = true, value = "") @JsonProperty("bool_item") - @NotNull - public Boolean getBoolItem() { + @NotNull public Boolean getBoolItem() { return boolItem; } @@ -139,8 +134,7 @@ public TypeHolderExample arrayItem(List arrayItem) { @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "") @JsonProperty("array_item") - @NotNull - public List getArrayItem() { + @NotNull public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/User.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/User.java index 7e05d065abc7..ca655111a4a8 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/User.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/User.java @@ -18,14 +18,14 @@ @JsonTypeName("User") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class User implements Serializable { - private @Valid Long id; - private @Valid String username; - private @Valid String firstName; - private @Valid String lastName; - private @Valid String email; - private @Valid String password; - private @Valid String phone; - private @Valid Integer userStatus; + private Long id; + private String username; + private String firstName; + private String lastName; + private String email; + private String password; + private String phone; + private Integer userStatus; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/XmlItem.java index b4e20d4ff6d0..4adfe6a7593d 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/XmlItem.java @@ -22,33 +22,33 @@ @JsonTypeName("XmlItem") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class XmlItem implements Serializable { - private @Valid String attributeString; - private @Valid BigDecimal attributeNumber; - private @Valid Integer attributeInteger; - private @Valid Boolean attributeBoolean; + private String attributeString; + private BigDecimal attributeNumber; + private Integer attributeInteger; + private Boolean attributeBoolean; private @Valid List wrappedArray = new ArrayList<>(); - private @Valid String nameString; - private @Valid BigDecimal nameNumber; - private @Valid Integer nameInteger; - private @Valid Boolean nameBoolean; + private String nameString; + private BigDecimal nameNumber; + private Integer nameInteger; + private Boolean nameBoolean; private @Valid List nameArray = new ArrayList<>(); private @Valid List nameWrappedArray = new ArrayList<>(); - private @Valid String prefixString; - private @Valid BigDecimal prefixNumber; - private @Valid Integer prefixInteger; - private @Valid Boolean prefixBoolean; + private String prefixString; + private BigDecimal prefixNumber; + private Integer prefixInteger; + private Boolean prefixBoolean; private @Valid List prefixArray = new ArrayList<>(); private @Valid List prefixWrappedArray = new ArrayList<>(); - private @Valid String namespaceString; - private @Valid BigDecimal namespaceNumber; - private @Valid Integer namespaceInteger; - private @Valid Boolean namespaceBoolean; + private String namespaceString; + private BigDecimal namespaceNumber; + private Integer namespaceInteger; + private Boolean namespaceBoolean; private @Valid List namespaceArray = new ArrayList<>(); private @Valid List namespaceWrappedArray = new ArrayList<>(); - private @Valid String prefixNsString; - private @Valid BigDecimal prefixNsNumber; - private @Valid Integer prefixNsInteger; - private @Valid Boolean prefixNsBoolean; + private String prefixNsString; + private BigDecimal prefixNsNumber; + private Integer prefixNsInteger; + private Boolean prefixNsBoolean; private @Valid List prefixNsArray = new ArrayList<>(); private @Valid List prefixNsWrappedArray = new ArrayList<>(); @@ -81,7 +81,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) { @ApiModelProperty(example = "1.234", value = "") @JsonProperty("attribute_number") - public BigDecimal getAttributeNumber() { + @Valid public BigDecimal getAttributeNumber() { return attributeNumber; } @@ -192,7 +192,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) { @ApiModelProperty(example = "1.234", value = "") @JsonProperty("name_number") - public BigDecimal getNameNumber() { + @Valid public BigDecimal getNameNumber() { return nameNumber; } @@ -338,7 +338,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) { @ApiModelProperty(example = "1.234", value = "") @JsonProperty("prefix_number") - public BigDecimal getPrefixNumber() { + @Valid public BigDecimal getPrefixNumber() { return prefixNumber; } @@ -484,7 +484,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) { @ApiModelProperty(example = "1.234", value = "") @JsonProperty("namespace_number") - public BigDecimal getNamespaceNumber() { + @Valid public BigDecimal getNamespaceNumber() { return namespaceNumber; } @@ -630,7 +630,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) { @ApiModelProperty(example = "1.234", value = "") @JsonProperty("prefix_ns_number") - public BigDecimal getPrefixNsNumber() { + @Valid public BigDecimal getPrefixNsNumber() { return prefixNsNumber; } diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java index b17edadb0087..1ab2c2ecbf1d 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -20,7 +20,7 @@ @JsonTypeName("AdditionalPropertiesAnyType") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class AdditionalPropertiesAnyType extends HashMap implements Serializable { - private @Valid String name; + private String name; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java index 18993dba3513..6b2390dfed9c 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -21,7 +21,7 @@ @JsonTypeName("AdditionalPropertiesArray") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class AdditionalPropertiesArray extends HashMap implements Serializable { - private @Valid String name; + private String name; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 5838ddee4c8e..a2e62819c2cf 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -20,7 +20,7 @@ @JsonTypeName("AdditionalPropertiesBoolean") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class AdditionalPropertiesBoolean extends HashMap implements Serializable { - private @Valid String name; + private String name; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java index 3e5585941f1d..8fe4b8cba4e3 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -30,9 +30,9 @@ public class AdditionalPropertiesClass implements Serializable { private @Valid Map> mapArrayAnytype = new HashMap<>(); private @Valid Map> mapMapString = new HashMap<>(); private @Valid Map> mapMapAnytype = new HashMap<>(); - private @Valid Object anytype1; - private @Valid Object anytype2; - private @Valid Object anytype3; + private Object anytype1; + private Object anytype2; + private Object anytype3; /** **/ @@ -79,7 +79,7 @@ public AdditionalPropertiesClass mapNumber(Map mapNumber) { @ApiModelProperty(value = "") @JsonProperty("map_number") - public Map getMapNumber() { + @Valid public Map getMapNumber() { return mapNumber; } @@ -184,7 +184,7 @@ public AdditionalPropertiesClass mapArrayInteger(Map> mapA @ApiModelProperty(value = "") @JsonProperty("map_array_integer") - public Map> getMapArrayInteger() { + @Valid public Map> getMapArrayInteger() { return mapArrayInteger; } @@ -219,7 +219,7 @@ public AdditionalPropertiesClass mapArrayAnytype(Map> mapAr @ApiModelProperty(value = "") @JsonProperty("map_array_anytype") - public Map> getMapArrayAnytype() { + @Valid public Map> getMapArrayAnytype() { return mapArrayAnytype; } @@ -254,7 +254,7 @@ public AdditionalPropertiesClass mapMapString(Map> m @ApiModelProperty(value = "") @JsonProperty("map_map_string") - public Map> getMapMapString() { + @Valid public Map> getMapMapString() { return mapMapString; } @@ -289,7 +289,7 @@ public AdditionalPropertiesClass mapMapAnytype(Map> @ApiModelProperty(value = "") @JsonProperty("map_map_anytype") - public Map> getMapMapAnytype() { + @Valid public Map> getMapMapAnytype() { return mapMapAnytype; } diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java index aac490cd9471..ab1879a09448 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -20,7 +20,7 @@ @JsonTypeName("AdditionalPropertiesInteger") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class AdditionalPropertiesInteger extends HashMap implements Serializable { - private @Valid String name; + private String name; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java index dad9369cea7b..9e3749ef252a 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -21,7 +21,7 @@ @JsonTypeName("AdditionalPropertiesNumber") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class AdditionalPropertiesNumber extends HashMap implements Serializable { - private @Valid String name; + private String name; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java index 5b728850fb70..0f6768aa5188 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -20,7 +20,7 @@ @JsonTypeName("AdditionalPropertiesObject") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class AdditionalPropertiesObject extends HashMap implements Serializable { - private @Valid String name; + private String name; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java index 7c3dc5397e69..8eb4b6a91d90 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java @@ -20,7 +20,7 @@ @JsonTypeName("AdditionalPropertiesString") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class AdditionalPropertiesString extends HashMap implements Serializable { - private @Valid String name; + private String name; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Animal.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Animal.java index fc2776061334..447f82b9382e 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Animal.java @@ -27,8 +27,8 @@ @JsonTypeName("Animal") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Animal implements Serializable { - private @Valid String className; - private @Valid String color = "red"; + private String className; + private String color = "red"; /** **/ @@ -40,8 +40,7 @@ public Animal className(String className) { @ApiModelProperty(required = true, value = "") @JsonProperty("className") - @NotNull - public String getClassName() { + @NotNull public String getClassName() { return className; } diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 544a79fe70ca..69b28f6f9a9c 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -34,7 +34,7 @@ public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArr @ApiModelProperty(value = "") @JsonProperty("ArrayArrayNumber") - public List> getArrayArrayNumber() { + @Valid public List<@Valid List<@Valid BigDecimal>> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java index 83074c3b923c..2ae289e784dc 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -34,7 +34,7 @@ public ArrayOfNumberOnly arrayNumber(List arrayNumber) { @ApiModelProperty(value = "") @JsonProperty("ArrayNumber") - public List getArrayNumber() { + @Valid public List<@Valid BigDecimal> getArrayNumber() { return arrayNumber; } diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayTest.java index f58ed8ad766f..a88ed211323f 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayTest.java @@ -71,7 +71,7 @@ public ArrayTest arrayArrayOfInteger(List> arrayArrayOfInteger) { @ApiModelProperty(value = "") @JsonProperty("array_array_of_integer") - public List> getArrayArrayOfInteger() { + @Valid public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; } @@ -106,7 +106,7 @@ public ArrayTest arrayArrayOfModel(List> arrayArrayOf @ApiModelProperty(value = "") @JsonProperty("array_array_of_model") - public List> getArrayArrayOfModel() { + @Valid public List<@Valid List<@Valid ReadOnlyFirst>> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/BigCat.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/BigCat.java index 7e5051685e55..ab7277ae311a 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/BigCat.java @@ -66,7 +66,7 @@ public static KindEnum fromValue(String value) { } } - private @Valid KindEnum kind; + private KindEnum kind; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Capitalization.java index 3dac2cb65b44..e93e8a2ea08f 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Capitalization.java @@ -18,12 +18,12 @@ @JsonTypeName("Capitalization") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Capitalization implements Serializable { - private @Valid String smallCamel; - private @Valid String capitalCamel; - private @Valid String smallSnake; - private @Valid String capitalSnake; - private @Valid String scAETHFlowPoints; - private @Valid String ATT_NAME; + private String smallCamel; + private String capitalCamel; + private String smallSnake; + private String capitalSnake; + private String scAETHFlowPoints; + private String ATT_NAME; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Cat.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Cat.java index 8de429f5d4f5..97057b7fdbd2 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Cat.java @@ -19,7 +19,7 @@ @JsonTypeName("Cat") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Cat extends Animal implements Serializable { - private @Valid Boolean declawed; + private Boolean declawed; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Category.java index cb17ff74b5d9..6c295ad590f9 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Category.java @@ -18,8 +18,8 @@ @JsonTypeName("Category") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Category implements Serializable { - private @Valid Long id; - private @Valid String name = "default-name"; + private Long id; + private String name = "default-name"; /** **/ @@ -50,8 +50,7 @@ public Category name(String name) { @ApiModelProperty(required = true, value = "") @JsonProperty("name") - @NotNull - public String getName() { + @NotNull public String getName() { return name; } diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ClassModel.java index ad3358d833ce..fb3c135e52c6 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ClassModel.java @@ -20,7 +20,7 @@ @JsonTypeName("ClassModel") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class ClassModel implements Serializable { - private @Valid String propertyClass; + private String propertyClass; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Client.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Client.java index c5a4a36d33a1..adf3a3aa08e0 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Client.java @@ -18,7 +18,7 @@ @JsonTypeName("Client") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Client implements Serializable { - private @Valid String client; + private String client; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Dog.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Dog.java index a7a698c48170..e8fa146419da 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Dog.java @@ -19,7 +19,7 @@ @JsonTypeName("Dog") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Dog extends Animal implements Serializable { - private @Valid String breed; + private String breed; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumArrays.java index 08f67648afc1..ca6333204b92 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumArrays.java @@ -68,7 +68,7 @@ public static JustSymbolEnum fromValue(String value) { } } - private @Valid JustSymbolEnum justSymbol; + private JustSymbolEnum justSymbol; public enum ArrayEnumEnum { FISH(String.valueOf("fish")), CRAB(String.valueOf("crab")); diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumTest.java index 598f222af70e..44a341d07616 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumTest.java @@ -67,7 +67,7 @@ public static EnumStringEnum fromValue(String value) { } } - private @Valid EnumStringEnum enumString; + private EnumStringEnum enumString; public enum EnumStringRequiredEnum { UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower")), EMPTY(String.valueOf("")); @@ -115,7 +115,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } - private @Valid EnumStringRequiredEnum enumStringRequired; + private EnumStringRequiredEnum enumStringRequired; public enum EnumIntegerEnum { NUMBER_1(Integer.valueOf(1)), NUMBER_MINUS_1(Integer.valueOf(-1)); @@ -163,7 +163,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } - private @Valid EnumIntegerEnum enumInteger; + private EnumIntegerEnum enumInteger; public enum EnumNumberEnum { NUMBER_1_DOT_1(Double.valueOf(1.1)), NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2)); @@ -211,8 +211,8 @@ public static EnumNumberEnum fromValue(Double value) { } } - private @Valid EnumNumberEnum enumNumber; - private @Valid OuterEnum outerEnum; + private EnumNumberEnum enumNumber; + private OuterEnum outerEnum; /** **/ @@ -243,8 +243,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) { @ApiModelProperty(required = true, value = "") @JsonProperty("enum_string_required") - @NotNull - public EnumStringRequiredEnum getEnumStringRequired() { + @NotNull public EnumStringRequiredEnum getEnumStringRequired() { return enumStringRequired; } @@ -301,7 +300,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) { @ApiModelProperty(value = "") @JsonProperty("outerEnum") - public OuterEnum getOuterEnum() { + @Valid public OuterEnum getOuterEnum() { return outerEnum; } diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FileSchemaTestClass.java index e0353d057c1b..9f94927c4731 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FileSchemaTestClass.java @@ -22,7 +22,7 @@ @JsonTypeName("FileSchemaTestClass") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class FileSchemaTestClass implements Serializable { - private @Valid ModelFile _file; + private ModelFile _file; private @Valid List<@Valid ModelFile> files = new ArrayList<>(); /** @@ -35,7 +35,7 @@ public FileSchemaTestClass _file(ModelFile _file) { @ApiModelProperty(value = "") @JsonProperty("file") - public ModelFile getFile() { + @Valid public ModelFile getFile() { return _file; } @@ -54,7 +54,7 @@ public FileSchemaTestClass files(List<@Valid ModelFile> files) { @ApiModelProperty(value = "") @JsonProperty("files") - public List getFiles() { + @Valid public List<@Valid ModelFile> getFiles() { return files; } diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FormatTest.java index e90855b384a7..68f0341ab9b5 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FormatTest.java @@ -25,20 +25,20 @@ @JsonTypeName("format_test") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class FormatTest implements Serializable { - private @Valid Integer integer; - private @Valid Integer int32; - private @Valid Long int64; - private @Valid BigDecimal number; - private @Valid Float _float; - private @Valid Double _double; - private @Valid String string; - private @Valid byte[] _byte; - private @Valid File binary; - private @Valid LocalDate date; - private @Valid Date dateTime; - private @Valid UUID uuid; - private @Valid String password; - private @Valid BigDecimal bigDecimal; + private Integer integer; + private Integer int32; + private Long int64; + private BigDecimal number; + private Float _float; + private Double _double; + private String string; + private byte[] _byte; + private File binary; + private LocalDate date; + private Date dateTime; + private UUID uuid; + private String password; + private BigDecimal bigDecimal; /** * minimum: 10 @@ -52,7 +52,7 @@ public FormatTest integer(Integer integer) { @ApiModelProperty(value = "") @JsonProperty("integer") - @Min(10) @Max(100) public Integer getInteger() { + @Min(10) @Max(100)public Integer getInteger() { return integer; } @@ -73,7 +73,7 @@ public FormatTest int32(Integer int32) { @ApiModelProperty(value = "") @JsonProperty("int32") - @Min(20) @Max(200) public Integer getInt32() { + @Min(20) @Max(200)public Integer getInt32() { return int32; } @@ -113,8 +113,7 @@ public FormatTest number(BigDecimal number) { @ApiModelProperty(required = true, value = "") @JsonProperty("number") - @NotNull - @DecimalMin("32.1") @DecimalMax("543.2") public BigDecimal getNumber() { + @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2")public BigDecimal getNumber() { return number; } @@ -135,7 +134,7 @@ public FormatTest _float(Float _float) { @ApiModelProperty(value = "") @JsonProperty("float") - @DecimalMin("54.3") @DecimalMax("987.6") public Float getFloat() { + @DecimalMin("54.3") @DecimalMax("987.6")public Float getFloat() { return _float; } @@ -156,7 +155,7 @@ public FormatTest _double(Double _double) { @ApiModelProperty(value = "") @JsonProperty("double") - @DecimalMin("67.8") @DecimalMax("123.4") public Double getDouble() { + @DecimalMin("67.8") @DecimalMax("123.4")public Double getDouble() { return _double; } @@ -175,7 +174,7 @@ public FormatTest string(String string) { @ApiModelProperty(value = "") @JsonProperty("string") - @Pattern(regexp="/[a-z]/i") public String getString() { + @Pattern(regexp="/[a-z]/i")public String getString() { return string; } @@ -194,8 +193,7 @@ public FormatTest _byte(byte[] _byte) { @ApiModelProperty(required = true, value = "") @JsonProperty("byte") - @NotNull - @Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$") public byte[] getByte() { + @NotNull @Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$")public byte[] getByte() { return _byte; } @@ -214,7 +212,7 @@ public FormatTest binary(File binary) { @ApiModelProperty(value = "") @JsonProperty("binary") - public File getBinary() { + @Valid public File getBinary() { return binary; } @@ -233,8 +231,7 @@ public FormatTest date(LocalDate date) { @ApiModelProperty(required = true, value = "") @JsonProperty("date") - @NotNull - public LocalDate getDate() { + @NotNull @Valid public LocalDate getDate() { return date; } @@ -253,7 +250,7 @@ public FormatTest dateTime(Date dateTime) { @ApiModelProperty(value = "") @JsonProperty("dateTime") - public Date getDateTime() { + @Valid public Date getDateTime() { return dateTime; } @@ -272,7 +269,7 @@ public FormatTest uuid(UUID uuid) { @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") @JsonProperty("uuid") - public UUID getUuid() { + @Valid public UUID getUuid() { return uuid; } @@ -291,8 +288,7 @@ public FormatTest password(String password) { @ApiModelProperty(required = true, value = "") @JsonProperty("password") - @NotNull - @Size(min=10,max=64) public String getPassword() { + @NotNull @Size(min=10,max=64)public String getPassword() { return password; } @@ -311,7 +307,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) { @ApiModelProperty(value = "") @JsonProperty("BigDecimal") - public BigDecimal getBigDecimal() { + @Valid public BigDecimal getBigDecimal() { return bigDecimal; } diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java index 9eed495407f8..1a8fc1a66c9f 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java @@ -19,8 +19,8 @@ @JsonTypeName("hasOnlyReadOnly") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class HasOnlyReadOnly implements Serializable { - private @Valid String bar; - private @Valid String foo; + private String bar; + private String foo; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/MapTest.java index 18612dca4028..ff0973b308ab 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/MapTest.java @@ -82,7 +82,7 @@ public MapTest mapMapOfString(Map> mapMapOfString) { @ApiModelProperty(value = "") @JsonProperty("map_map_of_string") - public Map> getMapMapOfString() { + @Valid public Map> getMapMapOfString() { return mapMapOfString; } diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 662bd380fbaf..fae42ecba0d6 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -23,8 +23,8 @@ @JsonTypeName("MixedPropertiesAndAdditionalPropertiesClass") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class MixedPropertiesAndAdditionalPropertiesClass implements Serializable { - private @Valid UUID uuid; - private @Valid Date dateTime; + private UUID uuid; + private Date dateTime; private @Valid Map map = new HashMap<>(); /** @@ -37,7 +37,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { @ApiModelProperty(value = "") @JsonProperty("uuid") - public UUID getUuid() { + @Valid public UUID getUuid() { return uuid; } @@ -56,7 +56,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(Date dateTime) { @ApiModelProperty(value = "") @JsonProperty("dateTime") - public Date getDateTime() { + @Valid public Date getDateTime() { return dateTime; } @@ -75,7 +75,7 @@ public MixedPropertiesAndAdditionalPropertiesClass map(Map map) @ApiModelProperty(value = "") @JsonProperty("map") - public Map getMap() { + @Valid public Map getMap() { return map; } diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Model200Response.java index 605c87682b90..08b32759360e 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Model200Response.java @@ -21,8 +21,8 @@ @JsonTypeName("200_response") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Model200Response implements Serializable { - private @Valid Integer name; - private @Valid String propertyClass; + private Integer name; + private String propertyClass; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ModelApiResponse.java index 9296170ed4a0..71e134bff553 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ModelApiResponse.java @@ -19,9 +19,9 @@ @JsonTypeName("ApiResponse") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class ModelApiResponse implements Serializable { - private @Valid Integer code; - private @Valid String type; - private @Valid String message; + private Integer code; + private String type; + private String message; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ModelFile.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ModelFile.java index 54637acdad85..6b80184356bb 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ModelFile.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ModelFile.java @@ -21,7 +21,7 @@ @JsonTypeName("File") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class ModelFile implements Serializable { - private @Valid String sourceURI; + private String sourceURI; /** * Test capitalization diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ModelList.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ModelList.java index f76710ae99f0..24fd6098f031 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ModelList.java @@ -19,7 +19,7 @@ @JsonTypeName("List") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class ModelList implements Serializable { - private @Valid String _123list; + private String _123list; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ModelReturn.java index e96dbdffdee1..7b17451db0bd 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ModelReturn.java @@ -21,7 +21,7 @@ @JsonTypeName("Return") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class ModelReturn implements Serializable { - private @Valid Integer _return; + private Integer _return; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Name.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Name.java index b6b144d96c0e..f3c659923a64 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Name.java @@ -20,10 +20,10 @@ @JsonTypeName("Name") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Name implements Serializable { - private @Valid Integer name; - private @Valid Integer snakeCase; - private @Valid String property; - private @Valid Integer _123number; + private Integer name; + private Integer snakeCase; + private String property; + private Integer _123number; /** **/ @@ -35,8 +35,7 @@ public Name name(Integer name) { @ApiModelProperty(required = true, value = "") @JsonProperty("name") - @NotNull - public Integer getName() { + @NotNull public Integer getName() { return name; } diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/NumberOnly.java index e9e320f283fd..7e3bdde9f943 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/NumberOnly.java @@ -19,7 +19,7 @@ @JsonTypeName("NumberOnly") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class NumberOnly implements Serializable { - private @Valid BigDecimal justNumber; + private BigDecimal justNumber; /** **/ @@ -31,7 +31,7 @@ public NumberOnly justNumber(BigDecimal justNumber) { @ApiModelProperty(value = "") @JsonProperty("JustNumber") - public BigDecimal getJustNumber() { + @Valid public BigDecimal getJustNumber() { return justNumber; } diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Order.java index c254310bc533..d42891bb4e43 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Order.java @@ -19,10 +19,10 @@ @JsonTypeName("Order") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Order implements Serializable { - private @Valid Long id; - private @Valid Long petId; - private @Valid Integer quantity; - private @Valid Date shipDate; + private Long id; + private Long petId; + private Integer quantity; + private Date shipDate; public enum StatusEnum { PLACED(String.valueOf("placed")), APPROVED(String.valueOf("approved")), DELIVERED(String.valueOf("delivered")); @@ -70,8 +70,8 @@ public static StatusEnum fromValue(String value) { } } - private @Valid StatusEnum status; - private @Valid Boolean complete = false; + private StatusEnum status; + private Boolean complete = false; /** **/ @@ -140,7 +140,7 @@ public Order shipDate(Date shipDate) { @ApiModelProperty(value = "") @JsonProperty("shipDate") - public Date getShipDate() { + @Valid public Date getShipDate() { return shipDate; } diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/OuterComposite.java index 133cd75a5d4d..04fd53a4d264 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/OuterComposite.java @@ -19,9 +19,9 @@ @JsonTypeName("OuterComposite") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class OuterComposite implements Serializable { - private @Valid BigDecimal myNumber; - private @Valid String myString; - private @Valid Boolean myBoolean; + private BigDecimal myNumber; + private String myString; + private Boolean myBoolean; /** **/ @@ -33,7 +33,7 @@ public OuterComposite myNumber(BigDecimal myNumber) { @ApiModelProperty(value = "") @JsonProperty("my_number") - public BigDecimal getMyNumber() { + @Valid public BigDecimal getMyNumber() { return myNumber; } diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Pet.java index 4828f7fcc2e7..f118f2af1916 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Pet.java @@ -26,9 +26,9 @@ @JsonTypeName("Pet") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Pet implements Serializable { - private @Valid Long id; - private @Valid Category category; - private @Valid String name; + private Long id; + private Category category; + private String name; private @Valid Set photoUrls = new LinkedHashSet<>(); private @Valid List<@Valid Tag> tags = new ArrayList<>(); public enum StatusEnum { @@ -78,7 +78,7 @@ public static StatusEnum fromValue(String value) { } } - private @Valid StatusEnum status; + private StatusEnum status; /** **/ @@ -109,7 +109,7 @@ public Pet category(Category category) { @ApiModelProperty(value = "") @JsonProperty("category") - public Category getCategory() { + @Valid public Category getCategory() { return category; } @@ -128,8 +128,7 @@ public Pet name(String name) { @ApiModelProperty(example = "doggie", required = true, value = "") @JsonProperty("name") - @NotNull - public String getName() { + @NotNull public String getName() { return name; } @@ -148,8 +147,7 @@ public Pet photoUrls(Set photoUrls) { @ApiModelProperty(required = true, value = "") @JsonProperty("photoUrls") - @NotNull - public Set getPhotoUrls() { + @NotNull public Set getPhotoUrls() { return photoUrls; } @@ -185,7 +183,7 @@ public Pet tags(List<@Valid Tag> tags) { @ApiModelProperty(value = "") @JsonProperty("tags") - public List getTags() { + @Valid public List<@Valid Tag> getTags() { return tags; } diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ReadOnlyFirst.java index da7e8d0e4862..d74df23fe236 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ReadOnlyFirst.java @@ -18,8 +18,8 @@ @JsonTypeName("ReadOnlyFirst") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class ReadOnlyFirst implements Serializable { - private @Valid String bar; - private @Valid String baz; + private String bar; + private String baz; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/SpecialModelName.java index 1a52b7894be1..ed1148cbcdf2 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/SpecialModelName.java @@ -19,7 +19,7 @@ @JsonTypeName("$special[model.name]") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class SpecialModelName implements Serializable { - private @Valid Long $specialPropertyName; + private Long $specialPropertyName; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Tag.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Tag.java index f0413e7790fd..faca0fee305e 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Tag.java @@ -18,8 +18,8 @@ @JsonTypeName("Tag") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Tag implements Serializable { - private @Valid Long id; - private @Valid String name; + private Long id; + private String name; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/TypeHolderDefault.java index c2b2d6b22104..832f1785068f 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/TypeHolderDefault.java @@ -22,10 +22,10 @@ @JsonTypeName("TypeHolderDefault") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class TypeHolderDefault implements Serializable { - private @Valid String stringItem = "what"; - private @Valid BigDecimal numberItem; - private @Valid Integer integerItem; - private @Valid Boolean boolItem = true; + private String stringItem = "what"; + private BigDecimal numberItem; + private Integer integerItem; + private Boolean boolItem = true; private @Valid List arrayItem = new ArrayList<>(); /** @@ -38,8 +38,7 @@ public TypeHolderDefault stringItem(String stringItem) { @ApiModelProperty(required = true, value = "") @JsonProperty("string_item") - @NotNull - public String getStringItem() { + @NotNull public String getStringItem() { return stringItem; } @@ -58,8 +57,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) { @ApiModelProperty(required = true, value = "") @JsonProperty("number_item") - @NotNull - public BigDecimal getNumberItem() { + @NotNull @Valid public BigDecimal getNumberItem() { return numberItem; } @@ -78,8 +76,7 @@ public TypeHolderDefault integerItem(Integer integerItem) { @ApiModelProperty(required = true, value = "") @JsonProperty("integer_item") - @NotNull - public Integer getIntegerItem() { + @NotNull public Integer getIntegerItem() { return integerItem; } @@ -98,8 +95,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) { @ApiModelProperty(required = true, value = "") @JsonProperty("bool_item") - @NotNull - public Boolean getBoolItem() { + @NotNull public Boolean getBoolItem() { return boolItem; } @@ -118,8 +114,7 @@ public TypeHolderDefault arrayItem(List arrayItem) { @ApiModelProperty(required = true, value = "") @JsonProperty("array_item") - @NotNull - public List getArrayItem() { + @NotNull public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/TypeHolderExample.java index b7c90b76c72a..01906a1d5511 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/TypeHolderExample.java @@ -22,11 +22,11 @@ @JsonTypeName("TypeHolderExample") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class TypeHolderExample implements Serializable { - private @Valid String stringItem; - private @Valid BigDecimal numberItem; - private @Valid Float floatItem; - private @Valid Integer integerItem; - private @Valid Boolean boolItem; + private String stringItem; + private BigDecimal numberItem; + private Float floatItem; + private Integer integerItem; + private Boolean boolItem; private @Valid List arrayItem = new ArrayList<>(); /** @@ -39,8 +39,7 @@ public TypeHolderExample stringItem(String stringItem) { @ApiModelProperty(example = "what", required = true, value = "") @JsonProperty("string_item") - @NotNull - public String getStringItem() { + @NotNull public String getStringItem() { return stringItem; } @@ -59,8 +58,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { @ApiModelProperty(example = "1.234", required = true, value = "") @JsonProperty("number_item") - @NotNull - public BigDecimal getNumberItem() { + @NotNull @Valid public BigDecimal getNumberItem() { return numberItem; } @@ -79,8 +77,7 @@ public TypeHolderExample floatItem(Float floatItem) { @ApiModelProperty(example = "1.234", required = true, value = "") @JsonProperty("float_item") - @NotNull - public Float getFloatItem() { + @NotNull public Float getFloatItem() { return floatItem; } @@ -99,8 +96,7 @@ public TypeHolderExample integerItem(Integer integerItem) { @ApiModelProperty(example = "-2", required = true, value = "") @JsonProperty("integer_item") - @NotNull - public Integer getIntegerItem() { + @NotNull public Integer getIntegerItem() { return integerItem; } @@ -119,8 +115,7 @@ public TypeHolderExample boolItem(Boolean boolItem) { @ApiModelProperty(example = "true", required = true, value = "") @JsonProperty("bool_item") - @NotNull - public Boolean getBoolItem() { + @NotNull public Boolean getBoolItem() { return boolItem; } @@ -139,8 +134,7 @@ public TypeHolderExample arrayItem(List arrayItem) { @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "") @JsonProperty("array_item") - @NotNull - public List getArrayItem() { + @NotNull public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/User.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/User.java index 7e05d065abc7..ca655111a4a8 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/User.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/User.java @@ -18,14 +18,14 @@ @JsonTypeName("User") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class User implements Serializable { - private @Valid Long id; - private @Valid String username; - private @Valid String firstName; - private @Valid String lastName; - private @Valid String email; - private @Valid String password; - private @Valid String phone; - private @Valid Integer userStatus; + private Long id; + private String username; + private String firstName; + private String lastName; + private String email; + private String password; + private String phone; + private Integer userStatus; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/XmlItem.java index b4e20d4ff6d0..4adfe6a7593d 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/XmlItem.java @@ -22,33 +22,33 @@ @JsonTypeName("XmlItem") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class XmlItem implements Serializable { - private @Valid String attributeString; - private @Valid BigDecimal attributeNumber; - private @Valid Integer attributeInteger; - private @Valid Boolean attributeBoolean; + private String attributeString; + private BigDecimal attributeNumber; + private Integer attributeInteger; + private Boolean attributeBoolean; private @Valid List wrappedArray = new ArrayList<>(); - private @Valid String nameString; - private @Valid BigDecimal nameNumber; - private @Valid Integer nameInteger; - private @Valid Boolean nameBoolean; + private String nameString; + private BigDecimal nameNumber; + private Integer nameInteger; + private Boolean nameBoolean; private @Valid List nameArray = new ArrayList<>(); private @Valid List nameWrappedArray = new ArrayList<>(); - private @Valid String prefixString; - private @Valid BigDecimal prefixNumber; - private @Valid Integer prefixInteger; - private @Valid Boolean prefixBoolean; + private String prefixString; + private BigDecimal prefixNumber; + private Integer prefixInteger; + private Boolean prefixBoolean; private @Valid List prefixArray = new ArrayList<>(); private @Valid List prefixWrappedArray = new ArrayList<>(); - private @Valid String namespaceString; - private @Valid BigDecimal namespaceNumber; - private @Valid Integer namespaceInteger; - private @Valid Boolean namespaceBoolean; + private String namespaceString; + private BigDecimal namespaceNumber; + private Integer namespaceInteger; + private Boolean namespaceBoolean; private @Valid List namespaceArray = new ArrayList<>(); private @Valid List namespaceWrappedArray = new ArrayList<>(); - private @Valid String prefixNsString; - private @Valid BigDecimal prefixNsNumber; - private @Valid Integer prefixNsInteger; - private @Valid Boolean prefixNsBoolean; + private String prefixNsString; + private BigDecimal prefixNsNumber; + private Integer prefixNsInteger; + private Boolean prefixNsBoolean; private @Valid List prefixNsArray = new ArrayList<>(); private @Valid List prefixNsWrappedArray = new ArrayList<>(); @@ -81,7 +81,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) { @ApiModelProperty(example = "1.234", value = "") @JsonProperty("attribute_number") - public BigDecimal getAttributeNumber() { + @Valid public BigDecimal getAttributeNumber() { return attributeNumber; } @@ -192,7 +192,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) { @ApiModelProperty(example = "1.234", value = "") @JsonProperty("name_number") - public BigDecimal getNameNumber() { + @Valid public BigDecimal getNameNumber() { return nameNumber; } @@ -338,7 +338,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) { @ApiModelProperty(example = "1.234", value = "") @JsonProperty("prefix_number") - public BigDecimal getPrefixNumber() { + @Valid public BigDecimal getPrefixNumber() { return prefixNumber; } @@ -484,7 +484,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) { @ApiModelProperty(example = "1.234", value = "") @JsonProperty("namespace_number") - public BigDecimal getNamespaceNumber() { + @Valid public BigDecimal getNamespaceNumber() { return namespaceNumber; } @@ -630,7 +630,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) { @ApiModelProperty(example = "1.234", value = "") @JsonProperty("prefix_ns_number") - public BigDecimal getPrefixNsNumber() { + @Valid public BigDecimal getPrefixNsNumber() { return prefixNsNumber; } diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 7c654db08ef3..8e5899aed870 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -20,7 +20,7 @@ @JsonTypeName("AdditionalPropertiesAnyType") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class AdditionalPropertiesAnyType extends HashMap implements Serializable { - private @Valid String name; + private String name; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java index 9331ec5dd767..019c2d017407 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -21,7 +21,7 @@ @JsonTypeName("AdditionalPropertiesArray") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class AdditionalPropertiesArray extends HashMap implements Serializable { - private @Valid String name; + private String name; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 2cc0655e0994..6a65bbc0213c 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -20,7 +20,7 @@ @JsonTypeName("AdditionalPropertiesBoolean") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class AdditionalPropertiesBoolean extends HashMap implements Serializable { - private @Valid String name; + private String name; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java index eec69e452670..343b27fab118 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -30,9 +30,9 @@ public class AdditionalPropertiesClass implements Serializable { private @Valid Map> mapArrayAnytype = new HashMap<>(); private @Valid Map> mapMapString = new HashMap<>(); private @Valid Map> mapMapAnytype = new HashMap<>(); - private @Valid Object anytype1; - private @Valid Object anytype2; - private @Valid Object anytype3; + private Object anytype1; + private Object anytype2; + private Object anytype3; protected AdditionalPropertiesClass(AdditionalPropertiesClassBuilder b) { this.mapString = b.mapString; @@ -96,7 +96,7 @@ public AdditionalPropertiesClass mapNumber(Map mapNumber) { @ApiModelProperty(value = "") @JsonProperty("map_number") - public Map getMapNumber() { + @Valid public Map getMapNumber() { return mapNumber; } @@ -201,7 +201,7 @@ public AdditionalPropertiesClass mapArrayInteger(Map> mapA @ApiModelProperty(value = "") @JsonProperty("map_array_integer") - public Map> getMapArrayInteger() { + @Valid public Map> getMapArrayInteger() { return mapArrayInteger; } @@ -236,7 +236,7 @@ public AdditionalPropertiesClass mapArrayAnytype(Map> mapAr @ApiModelProperty(value = "") @JsonProperty("map_array_anytype") - public Map> getMapArrayAnytype() { + @Valid public Map> getMapArrayAnytype() { return mapArrayAnytype; } @@ -271,7 +271,7 @@ public AdditionalPropertiesClass mapMapString(Map> m @ApiModelProperty(value = "") @JsonProperty("map_map_string") - public Map> getMapMapString() { + @Valid public Map> getMapMapString() { return mapMapString; } @@ -306,7 +306,7 @@ public AdditionalPropertiesClass mapMapAnytype(Map> @ApiModelProperty(value = "") @JsonProperty("map_map_anytype") - public Map> getMapMapAnytype() { + @Valid public Map> getMapMapAnytype() { return mapMapAnytype; } diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java index eb3382b7e198..85918f7823b5 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -20,7 +20,7 @@ @JsonTypeName("AdditionalPropertiesInteger") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class AdditionalPropertiesInteger extends HashMap implements Serializable { - private @Valid String name; + private String name; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java index b0f789e96ce6..8fdc5e72b9ee 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -21,7 +21,7 @@ @JsonTypeName("AdditionalPropertiesNumber") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class AdditionalPropertiesNumber extends HashMap implements Serializable { - private @Valid String name; + private String name; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java index 88bc8e4a7d93..2fa39184c1d3 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -20,7 +20,7 @@ @JsonTypeName("AdditionalPropertiesObject") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class AdditionalPropertiesObject extends HashMap implements Serializable { - private @Valid String name; + private String name; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java index 91f76a3e2ca4..9efc27f68d34 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java @@ -20,7 +20,7 @@ @JsonTypeName("AdditionalPropertiesString") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class AdditionalPropertiesString extends HashMap implements Serializable { - private @Valid String name; + private String name; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Animal.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Animal.java index de8b7cae84e2..0b0bf972e277 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Animal.java @@ -27,8 +27,8 @@ @JsonTypeName("Animal") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Animal implements Serializable { - private @Valid String className; - private @Valid String color = "red"; + private String className; + private String color = "red"; protected Animal(AnimalBuilder b) { this.className = b.className; @@ -48,8 +48,7 @@ public Animal className(String className) { @ApiModelProperty(required = true, value = "") @JsonProperty("className") - @NotNull - public String getClassName() { + @NotNull public String getClassName() { return className; } diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index c1ca312074ab..8c9889981eef 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -41,7 +41,7 @@ public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArr @ApiModelProperty(value = "") @JsonProperty("ArrayArrayNumber") - public List> getArrayArrayNumber() { + @Valid public List<@Valid List<@Valid BigDecimal>> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java index d59a6aa45415..01df0f0d7df8 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -41,7 +41,7 @@ public ArrayOfNumberOnly arrayNumber(List arrayNumber) { @ApiModelProperty(value = "") @JsonProperty("ArrayNumber") - public List getArrayNumber() { + @Valid public List<@Valid BigDecimal> getArrayNumber() { return arrayNumber; } diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ArrayTest.java index d76cd36445ac..5d82c7bd9a7b 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ArrayTest.java @@ -80,7 +80,7 @@ public ArrayTest arrayArrayOfInteger(List> arrayArrayOfInteger) { @ApiModelProperty(value = "") @JsonProperty("array_array_of_integer") - public List> getArrayArrayOfInteger() { + @Valid public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; } @@ -115,7 +115,7 @@ public ArrayTest arrayArrayOfModel(List> arrayArrayOf @ApiModelProperty(value = "") @JsonProperty("array_array_of_model") - public List> getArrayArrayOfModel() { + @Valid public List<@Valid List<@Valid ReadOnlyFirst>> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/BigCat.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/BigCat.java index 1001f3a3cc5c..06bd44cf46cc 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/BigCat.java @@ -66,7 +66,7 @@ public static KindEnum fromValue(String value) { } } - private @Valid KindEnum kind; + private KindEnum kind; protected BigCat(BigCatBuilder b) { super(b); diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Capitalization.java index 9a2dbf060916..7ab81ecdf049 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Capitalization.java @@ -18,12 +18,12 @@ @JsonTypeName("Capitalization") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Capitalization implements Serializable { - private @Valid String smallCamel; - private @Valid String capitalCamel; - private @Valid String smallSnake; - private @Valid String capitalSnake; - private @Valid String scAETHFlowPoints; - private @Valid String ATT_NAME; + private String smallCamel; + private String capitalCamel; + private String smallSnake; + private String capitalSnake; + private String scAETHFlowPoints; + private String ATT_NAME; protected Capitalization(CapitalizationBuilder b) { this.smallCamel = b.smallCamel; diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Cat.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Cat.java index 7cb43b0f5b4b..295a8be58a34 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Cat.java @@ -19,7 +19,7 @@ @JsonTypeName("Cat") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Cat extends Animal implements Serializable { - private @Valid Boolean declawed; + private Boolean declawed; protected Cat(CatBuilder b) { super(b); diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Category.java index 5bf8400e3130..1debe3d3c8c9 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Category.java @@ -18,8 +18,8 @@ @JsonTypeName("Category") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Category implements Serializable { - private @Valid Long id; - private @Valid String name = "default-name"; + private Long id; + private String name = "default-name"; protected Category(CategoryBuilder b) { this.id = b.id; @@ -58,8 +58,7 @@ public Category name(String name) { @ApiModelProperty(required = true, value = "") @JsonProperty("name") - @NotNull - public String getName() { + @NotNull public String getName() { return name; } diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ClassModel.java index 1d317a8c3bd9..813f049e7104 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ClassModel.java @@ -20,7 +20,7 @@ @JsonTypeName("ClassModel") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class ClassModel implements Serializable { - private @Valid String propertyClass; + private String propertyClass; protected ClassModel(ClassModelBuilder b) { this.propertyClass = b.propertyClass; diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Client.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Client.java index 9a95280e9322..d0541b5b8cce 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Client.java @@ -18,7 +18,7 @@ @JsonTypeName("Client") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Client implements Serializable { - private @Valid String client; + private String client; protected Client(ClientBuilder b) { this.client = b.client; diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Dog.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Dog.java index b60dc11e8251..4dc463656beb 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Dog.java @@ -19,7 +19,7 @@ @JsonTypeName("Dog") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Dog extends Animal implements Serializable { - private @Valid String breed; + private String breed; protected Dog(DogBuilder b) { super(b); diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/EnumArrays.java index c55d1446e11b..fde8c8b9bb7d 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/EnumArrays.java @@ -68,7 +68,7 @@ public static JustSymbolEnum fromValue(String value) { } } - private @Valid JustSymbolEnum justSymbol; + private JustSymbolEnum justSymbol; public enum ArrayEnumEnum { FISH(String.valueOf("fish")), CRAB(String.valueOf("crab")); diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/EnumTest.java index 0bcaa36567f2..e1ce3d7326f1 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/EnumTest.java @@ -67,7 +67,7 @@ public static EnumStringEnum fromValue(String value) { } } - private @Valid EnumStringEnum enumString; + private EnumStringEnum enumString; public enum EnumStringRequiredEnum { UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower")), EMPTY(String.valueOf("")); @@ -115,7 +115,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } - private @Valid EnumStringRequiredEnum enumStringRequired; + private EnumStringRequiredEnum enumStringRequired; public enum EnumIntegerEnum { NUMBER_1(Integer.valueOf(1)), NUMBER_MINUS_1(Integer.valueOf(-1)); @@ -163,7 +163,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } - private @Valid EnumIntegerEnum enumInteger; + private EnumIntegerEnum enumInteger; public enum EnumNumberEnum { NUMBER_1_DOT_1(Double.valueOf(1.1)), NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2)); @@ -211,8 +211,8 @@ public static EnumNumberEnum fromValue(Double value) { } } - private @Valid EnumNumberEnum enumNumber; - private @Valid OuterEnum outerEnum; + private EnumNumberEnum enumNumber; + private OuterEnum outerEnum; protected EnumTest(EnumTestBuilder b) { this.enumString = b.enumString; @@ -254,8 +254,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) { @ApiModelProperty(required = true, value = "") @JsonProperty("enum_string_required") - @NotNull - public EnumStringRequiredEnum getEnumStringRequired() { + @NotNull public EnumStringRequiredEnum getEnumStringRequired() { return enumStringRequired; } @@ -312,7 +311,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) { @ApiModelProperty(value = "") @JsonProperty("outerEnum") - public OuterEnum getOuterEnum() { + @Valid public OuterEnum getOuterEnum() { return outerEnum; } diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/FileSchemaTestClass.java index 8ab54ca8c097..555c3208044f 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/FileSchemaTestClass.java @@ -22,7 +22,7 @@ @JsonTypeName("FileSchemaTestClass") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class FileSchemaTestClass implements Serializable { - private @Valid ModelFile _file; + private ModelFile _file; private @Valid List<@Valid ModelFile> files = new ArrayList<>(); protected FileSchemaTestClass(FileSchemaTestClassBuilder b) { @@ -43,7 +43,7 @@ public FileSchemaTestClass _file(ModelFile _file) { @ApiModelProperty(value = "") @JsonProperty("file") - public ModelFile getFile() { + @Valid public ModelFile getFile() { return _file; } @@ -62,7 +62,7 @@ public FileSchemaTestClass files(List<@Valid ModelFile> files) { @ApiModelProperty(value = "") @JsonProperty("files") - public List getFiles() { + @Valid public List<@Valid ModelFile> getFiles() { return files; } diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/FormatTest.java index 188efc9685df..e77109d3158e 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/FormatTest.java @@ -25,20 +25,20 @@ @JsonTypeName("format_test") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class FormatTest implements Serializable { - private @Valid Integer integer; - private @Valid Integer int32; - private @Valid Long int64; - private @Valid BigDecimal number; - private @Valid Float _float; - private @Valid Double _double; - private @Valid String string; - private @Valid byte[] _byte; - private @Valid File binary; - private @Valid LocalDate date; - private @Valid Date dateTime; - private @Valid UUID uuid; - private @Valid String password; - private @Valid BigDecimal bigDecimal; + private Integer integer; + private Integer int32; + private Long int64; + private BigDecimal number; + private Float _float; + private Double _double; + private String string; + private byte[] _byte; + private File binary; + private LocalDate date; + private Date dateTime; + private UUID uuid; + private String password; + private BigDecimal bigDecimal; protected FormatTest(FormatTestBuilder b) { this.integer = b.integer; @@ -72,7 +72,7 @@ public FormatTest integer(Integer integer) { @ApiModelProperty(value = "") @JsonProperty("integer") - @Min(10) @Max(100) public Integer getInteger() { + @Min(10) @Max(100)public Integer getInteger() { return integer; } @@ -93,7 +93,7 @@ public FormatTest int32(Integer int32) { @ApiModelProperty(value = "") @JsonProperty("int32") - @Min(20) @Max(200) public Integer getInt32() { + @Min(20) @Max(200)public Integer getInt32() { return int32; } @@ -133,8 +133,7 @@ public FormatTest number(BigDecimal number) { @ApiModelProperty(required = true, value = "") @JsonProperty("number") - @NotNull - @DecimalMin("32.1") @DecimalMax("543.2") public BigDecimal getNumber() { + @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2")public BigDecimal getNumber() { return number; } @@ -155,7 +154,7 @@ public FormatTest _float(Float _float) { @ApiModelProperty(value = "") @JsonProperty("float") - @DecimalMin("54.3") @DecimalMax("987.6") public Float getFloat() { + @DecimalMin("54.3") @DecimalMax("987.6")public Float getFloat() { return _float; } @@ -176,7 +175,7 @@ public FormatTest _double(Double _double) { @ApiModelProperty(value = "") @JsonProperty("double") - @DecimalMin("67.8") @DecimalMax("123.4") public Double getDouble() { + @DecimalMin("67.8") @DecimalMax("123.4")public Double getDouble() { return _double; } @@ -195,7 +194,7 @@ public FormatTest string(String string) { @ApiModelProperty(value = "") @JsonProperty("string") - @Pattern(regexp="/[a-z]/i") public String getString() { + @Pattern(regexp="/[a-z]/i")public String getString() { return string; } @@ -214,8 +213,7 @@ public FormatTest _byte(byte[] _byte) { @ApiModelProperty(required = true, value = "") @JsonProperty("byte") - @NotNull - @Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$") public byte[] getByte() { + @NotNull @Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$")public byte[] getByte() { return _byte; } @@ -234,7 +232,7 @@ public FormatTest binary(File binary) { @ApiModelProperty(value = "") @JsonProperty("binary") - public File getBinary() { + @Valid public File getBinary() { return binary; } @@ -253,8 +251,7 @@ public FormatTest date(LocalDate date) { @ApiModelProperty(required = true, value = "") @JsonProperty("date") - @NotNull - public LocalDate getDate() { + @NotNull @Valid public LocalDate getDate() { return date; } @@ -273,7 +270,7 @@ public FormatTest dateTime(Date dateTime) { @ApiModelProperty(value = "") @JsonProperty("dateTime") - public Date getDateTime() { + @Valid public Date getDateTime() { return dateTime; } @@ -292,7 +289,7 @@ public FormatTest uuid(UUID uuid) { @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") @JsonProperty("uuid") - public UUID getUuid() { + @Valid public UUID getUuid() { return uuid; } @@ -311,8 +308,7 @@ public FormatTest password(String password) { @ApiModelProperty(required = true, value = "") @JsonProperty("password") - @NotNull - @Size(min=10,max=64) public String getPassword() { + @NotNull @Size(min=10,max=64)public String getPassword() { return password; } @@ -331,7 +327,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) { @ApiModelProperty(value = "") @JsonProperty("BigDecimal") - public BigDecimal getBigDecimal() { + @Valid public BigDecimal getBigDecimal() { return bigDecimal; } diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java index 6817d054eafd..b644770aaff7 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java @@ -19,8 +19,8 @@ @JsonTypeName("hasOnlyReadOnly") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class HasOnlyReadOnly implements Serializable { - private @Valid String bar; - private @Valid String foo; + private String bar; + private String foo; protected HasOnlyReadOnly(HasOnlyReadOnlyBuilder b) { this.bar = b.bar; diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/MapTest.java index 963ea9bba1cf..7564c90117cc 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/MapTest.java @@ -92,7 +92,7 @@ public MapTest mapMapOfString(Map> mapMapOfString) { @ApiModelProperty(value = "") @JsonProperty("map_map_of_string") - public Map> getMapMapOfString() { + @Valid public Map> getMapMapOfString() { return mapMapOfString; } diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 6aadc1c97397..0674fe2f5718 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -23,8 +23,8 @@ @JsonTypeName("MixedPropertiesAndAdditionalPropertiesClass") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class MixedPropertiesAndAdditionalPropertiesClass implements Serializable { - private @Valid UUID uuid; - private @Valid Date dateTime; + private UUID uuid; + private Date dateTime; private @Valid Map map = new HashMap<>(); protected MixedPropertiesAndAdditionalPropertiesClass(MixedPropertiesAndAdditionalPropertiesClassBuilder b) { @@ -46,7 +46,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { @ApiModelProperty(value = "") @JsonProperty("uuid") - public UUID getUuid() { + @Valid public UUID getUuid() { return uuid; } @@ -65,7 +65,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(Date dateTime) { @ApiModelProperty(value = "") @JsonProperty("dateTime") - public Date getDateTime() { + @Valid public Date getDateTime() { return dateTime; } @@ -84,7 +84,7 @@ public MixedPropertiesAndAdditionalPropertiesClass map(Map map) @ApiModelProperty(value = "") @JsonProperty("map") - public Map getMap() { + @Valid public Map getMap() { return map; } diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Model200Response.java index a02cd1505f4f..375ef180a693 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Model200Response.java @@ -21,8 +21,8 @@ @JsonTypeName("200_response") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Model200Response implements Serializable { - private @Valid Integer name; - private @Valid String propertyClass; + private Integer name; + private String propertyClass; protected Model200Response(Model200ResponseBuilder b) { this.name = b.name; diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ModelApiResponse.java index 274b744ecca2..e158b9a3e351 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ModelApiResponse.java @@ -19,9 +19,9 @@ @JsonTypeName("ApiResponse") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class ModelApiResponse implements Serializable { - private @Valid Integer code; - private @Valid String type; - private @Valid String message; + private Integer code; + private String type; + private String message; protected ModelApiResponse(ModelApiResponseBuilder b) { this.code = b.code; diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ModelFile.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ModelFile.java index 0e5d3b6a88a2..34128b68a01a 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ModelFile.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ModelFile.java @@ -21,7 +21,7 @@ @JsonTypeName("File") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class ModelFile implements Serializable { - private @Valid String sourceURI; + private String sourceURI; protected ModelFile(ModelFileBuilder b) { this.sourceURI = b.sourceURI; diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ModelList.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ModelList.java index 040a7bc7b55b..2c499f5ad92c 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ModelList.java @@ -19,7 +19,7 @@ @JsonTypeName("List") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class ModelList implements Serializable { - private @Valid String _123list; + private String _123list; protected ModelList(ModelListBuilder b) { this._123list = b._123list; diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ModelReturn.java index 8d6c927ddfca..989a4780b6ea 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ModelReturn.java @@ -21,7 +21,7 @@ @JsonTypeName("Return") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class ModelReturn implements Serializable { - private @Valid Integer _return; + private Integer _return; protected ModelReturn(ModelReturnBuilder b) { this._return = b._return; diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Name.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Name.java index 4a7cc9206969..2b4097663adb 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Name.java @@ -20,10 +20,10 @@ @JsonTypeName("Name") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Name implements Serializable { - private @Valid Integer name; - private @Valid Integer snakeCase; - private @Valid String property; - private @Valid Integer _123number; + private Integer name; + private Integer snakeCase; + private String property; + private Integer _123number; protected Name(NameBuilder b) { this.name = b.name; @@ -45,8 +45,7 @@ public Name name(Integer name) { @ApiModelProperty(required = true, value = "") @JsonProperty("name") - @NotNull - public Integer getName() { + @NotNull public Integer getName() { return name; } diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/NumberOnly.java index a9aa70aae3b9..994f3617fcf7 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/NumberOnly.java @@ -19,7 +19,7 @@ @JsonTypeName("NumberOnly") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class NumberOnly implements Serializable { - private @Valid BigDecimal justNumber; + private BigDecimal justNumber; protected NumberOnly(NumberOnlyBuilder b) { this.justNumber = b.justNumber; @@ -38,7 +38,7 @@ public NumberOnly justNumber(BigDecimal justNumber) { @ApiModelProperty(value = "") @JsonProperty("JustNumber") - public BigDecimal getJustNumber() { + @Valid public BigDecimal getJustNumber() { return justNumber; } diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Order.java index 8cf48d00c5e7..4777386d9756 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Order.java @@ -19,10 +19,10 @@ @JsonTypeName("Order") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Order implements Serializable { - private @Valid Long id; - private @Valid Long petId; - private @Valid Integer quantity; - private @Valid Date shipDate; + private Long id; + private Long petId; + private Integer quantity; + private Date shipDate; public enum StatusEnum { PLACED(String.valueOf("placed")), APPROVED(String.valueOf("approved")), DELIVERED(String.valueOf("delivered")); @@ -70,8 +70,8 @@ public static StatusEnum fromValue(String value) { } } - private @Valid StatusEnum status; - private @Valid Boolean complete = false; + private StatusEnum status; + private Boolean complete = false; protected Order(OrderBuilder b) { this.id = b.id; @@ -152,7 +152,7 @@ public Order shipDate(Date shipDate) { @ApiModelProperty(value = "") @JsonProperty("shipDate") - public Date getShipDate() { + @Valid public Date getShipDate() { return shipDate; } diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/OuterComposite.java index 2621925465ca..83727b8d9efc 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/OuterComposite.java @@ -19,9 +19,9 @@ @JsonTypeName("OuterComposite") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class OuterComposite implements Serializable { - private @Valid BigDecimal myNumber; - private @Valid String myString; - private @Valid Boolean myBoolean; + private BigDecimal myNumber; + private String myString; + private Boolean myBoolean; protected OuterComposite(OuterCompositeBuilder b) { this.myNumber = b.myNumber; @@ -42,7 +42,7 @@ public OuterComposite myNumber(BigDecimal myNumber) { @ApiModelProperty(value = "") @JsonProperty("my_number") - public BigDecimal getMyNumber() { + @Valid public BigDecimal getMyNumber() { return myNumber; } diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Pet.java index 23fe64a6cd9d..7b6e16eca732 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Pet.java @@ -26,9 +26,9 @@ @JsonTypeName("Pet") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Pet implements Serializable { - private @Valid Long id; - private @Valid Category category; - private @Valid String name; + private Long id; + private Category category; + private String name; private @Valid Set photoUrls = new LinkedHashSet<>(); private @Valid List<@Valid Tag> tags = new ArrayList<>(); public enum StatusEnum { @@ -78,7 +78,7 @@ public static StatusEnum fromValue(String value) { } } - private @Valid StatusEnum status; + private StatusEnum status; protected Pet(PetBuilder b) { this.id = b.id; @@ -121,7 +121,7 @@ public Pet category(Category category) { @ApiModelProperty(value = "") @JsonProperty("category") - public Category getCategory() { + @Valid public Category getCategory() { return category; } @@ -140,8 +140,7 @@ public Pet name(String name) { @ApiModelProperty(example = "doggie", required = true, value = "") @JsonProperty("name") - @NotNull - public String getName() { + @NotNull public String getName() { return name; } @@ -160,8 +159,7 @@ public Pet photoUrls(Set photoUrls) { @ApiModelProperty(required = true, value = "") @JsonProperty("photoUrls") - @NotNull - public Set getPhotoUrls() { + @NotNull public Set getPhotoUrls() { return photoUrls; } @@ -197,7 +195,7 @@ public Pet tags(List<@Valid Tag> tags) { @ApiModelProperty(value = "") @JsonProperty("tags") - public List getTags() { + @Valid public List<@Valid Tag> getTags() { return tags; } diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ReadOnlyFirst.java index 260f86c3652c..f13943649f10 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ReadOnlyFirst.java @@ -18,8 +18,8 @@ @JsonTypeName("ReadOnlyFirst") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class ReadOnlyFirst implements Serializable { - private @Valid String bar; - private @Valid String baz; + private String bar; + private String baz; protected ReadOnlyFirst(ReadOnlyFirstBuilder b) { this.bar = b.bar; diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/SpecialModelName.java index 425623cce91c..616b1304772b 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/SpecialModelName.java @@ -19,7 +19,7 @@ @JsonTypeName("$special[model.name]") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class SpecialModelName implements Serializable { - private @Valid Long $specialPropertyName; + private Long $specialPropertyName; protected SpecialModelName(SpecialModelNameBuilder b) { this.$specialPropertyName = b.$specialPropertyName; diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Tag.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Tag.java index b50132c39c0a..a7c6a2933e63 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Tag.java @@ -18,8 +18,8 @@ @JsonTypeName("Tag") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Tag implements Serializable { - private @Valid Long id; - private @Valid String name; + private Long id; + private String name; protected Tag(TagBuilder b) { this.id = b.id; diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/TypeHolderDefault.java index 0aed59ea7dbc..6685e5ca9e44 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/TypeHolderDefault.java @@ -22,10 +22,10 @@ @JsonTypeName("TypeHolderDefault") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class TypeHolderDefault implements Serializable { - private @Valid String stringItem = "what"; - private @Valid BigDecimal numberItem; - private @Valid Integer integerItem; - private @Valid Boolean boolItem = true; + private String stringItem = "what"; + private BigDecimal numberItem; + private Integer integerItem; + private Boolean boolItem = true; private @Valid List arrayItem = new ArrayList<>(); protected TypeHolderDefault(TypeHolderDefaultBuilder b) { @@ -49,8 +49,7 @@ public TypeHolderDefault stringItem(String stringItem) { @ApiModelProperty(required = true, value = "") @JsonProperty("string_item") - @NotNull - public String getStringItem() { + @NotNull public String getStringItem() { return stringItem; } @@ -69,8 +68,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) { @ApiModelProperty(required = true, value = "") @JsonProperty("number_item") - @NotNull - public BigDecimal getNumberItem() { + @NotNull @Valid public BigDecimal getNumberItem() { return numberItem; } @@ -89,8 +87,7 @@ public TypeHolderDefault integerItem(Integer integerItem) { @ApiModelProperty(required = true, value = "") @JsonProperty("integer_item") - @NotNull - public Integer getIntegerItem() { + @NotNull public Integer getIntegerItem() { return integerItem; } @@ -109,8 +106,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) { @ApiModelProperty(required = true, value = "") @JsonProperty("bool_item") - @NotNull - public Boolean getBoolItem() { + @NotNull public Boolean getBoolItem() { return boolItem; } @@ -129,8 +125,7 @@ public TypeHolderDefault arrayItem(List arrayItem) { @ApiModelProperty(required = true, value = "") @JsonProperty("array_item") - @NotNull - public List getArrayItem() { + @NotNull public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/TypeHolderExample.java index 1484f7f3c5dc..cd17af3c41bb 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/TypeHolderExample.java @@ -22,11 +22,11 @@ @JsonTypeName("TypeHolderExample") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class TypeHolderExample implements Serializable { - private @Valid String stringItem; - private @Valid BigDecimal numberItem; - private @Valid Float floatItem; - private @Valid Integer integerItem; - private @Valid Boolean boolItem; + private String stringItem; + private BigDecimal numberItem; + private Float floatItem; + private Integer integerItem; + private Boolean boolItem; private @Valid List arrayItem = new ArrayList<>(); protected TypeHolderExample(TypeHolderExampleBuilder b) { @@ -51,8 +51,7 @@ public TypeHolderExample stringItem(String stringItem) { @ApiModelProperty(example = "what", required = true, value = "") @JsonProperty("string_item") - @NotNull - public String getStringItem() { + @NotNull public String getStringItem() { return stringItem; } @@ -71,8 +70,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { @ApiModelProperty(example = "1.234", required = true, value = "") @JsonProperty("number_item") - @NotNull - public BigDecimal getNumberItem() { + @NotNull @Valid public BigDecimal getNumberItem() { return numberItem; } @@ -91,8 +89,7 @@ public TypeHolderExample floatItem(Float floatItem) { @ApiModelProperty(example = "1.234", required = true, value = "") @JsonProperty("float_item") - @NotNull - public Float getFloatItem() { + @NotNull public Float getFloatItem() { return floatItem; } @@ -111,8 +108,7 @@ public TypeHolderExample integerItem(Integer integerItem) { @ApiModelProperty(example = "-2", required = true, value = "") @JsonProperty("integer_item") - @NotNull - public Integer getIntegerItem() { + @NotNull public Integer getIntegerItem() { return integerItem; } @@ -131,8 +127,7 @@ public TypeHolderExample boolItem(Boolean boolItem) { @ApiModelProperty(example = "true", required = true, value = "") @JsonProperty("bool_item") - @NotNull - public Boolean getBoolItem() { + @NotNull public Boolean getBoolItem() { return boolItem; } @@ -151,8 +146,7 @@ public TypeHolderExample arrayItem(List arrayItem) { @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "") @JsonProperty("array_item") - @NotNull - public List getArrayItem() { + @NotNull public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/User.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/User.java index b348973b9527..3d9bf36aca0c 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/User.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/User.java @@ -18,14 +18,14 @@ @JsonTypeName("User") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class User implements Serializable { - private @Valid Long id; - private @Valid String username; - private @Valid String firstName; - private @Valid String lastName; - private @Valid String email; - private @Valid String password; - private @Valid String phone; - private @Valid Integer userStatus; + private Long id; + private String username; + private String firstName; + private String lastName; + private String email; + private String password; + private String phone; + private Integer userStatus; protected User(UserBuilder b) { this.id = b.id; diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/XmlItem.java index f3745ff63786..6cc05353e0af 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/XmlItem.java @@ -22,33 +22,33 @@ @JsonTypeName("XmlItem") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class XmlItem implements Serializable { - private @Valid String attributeString; - private @Valid BigDecimal attributeNumber; - private @Valid Integer attributeInteger; - private @Valid Boolean attributeBoolean; + private String attributeString; + private BigDecimal attributeNumber; + private Integer attributeInteger; + private Boolean attributeBoolean; private @Valid List wrappedArray = new ArrayList<>(); - private @Valid String nameString; - private @Valid BigDecimal nameNumber; - private @Valid Integer nameInteger; - private @Valid Boolean nameBoolean; + private String nameString; + private BigDecimal nameNumber; + private Integer nameInteger; + private Boolean nameBoolean; private @Valid List nameArray = new ArrayList<>(); private @Valid List nameWrappedArray = new ArrayList<>(); - private @Valid String prefixString; - private @Valid BigDecimal prefixNumber; - private @Valid Integer prefixInteger; - private @Valid Boolean prefixBoolean; + private String prefixString; + private BigDecimal prefixNumber; + private Integer prefixInteger; + private Boolean prefixBoolean; private @Valid List prefixArray = new ArrayList<>(); private @Valid List prefixWrappedArray = new ArrayList<>(); - private @Valid String namespaceString; - private @Valid BigDecimal namespaceNumber; - private @Valid Integer namespaceInteger; - private @Valid Boolean namespaceBoolean; + private String namespaceString; + private BigDecimal namespaceNumber; + private Integer namespaceInteger; + private Boolean namespaceBoolean; private @Valid List namespaceArray = new ArrayList<>(); private @Valid List namespaceWrappedArray = new ArrayList<>(); - private @Valid String prefixNsString; - private @Valid BigDecimal prefixNsNumber; - private @Valid Integer prefixNsInteger; - private @Valid Boolean prefixNsBoolean; + private String prefixNsString; + private BigDecimal prefixNsNumber; + private Integer prefixNsInteger; + private Boolean prefixNsBoolean; private @Valid List prefixNsArray = new ArrayList<>(); private @Valid List prefixNsWrappedArray = new ArrayList<>(); @@ -116,7 +116,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) { @ApiModelProperty(example = "1.234", value = "") @JsonProperty("attribute_number") - public BigDecimal getAttributeNumber() { + @Valid public BigDecimal getAttributeNumber() { return attributeNumber; } @@ -227,7 +227,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) { @ApiModelProperty(example = "1.234", value = "") @JsonProperty("name_number") - public BigDecimal getNameNumber() { + @Valid public BigDecimal getNameNumber() { return nameNumber; } @@ -373,7 +373,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) { @ApiModelProperty(example = "1.234", value = "") @JsonProperty("prefix_number") - public BigDecimal getPrefixNumber() { + @Valid public BigDecimal getPrefixNumber() { return prefixNumber; } @@ -519,7 +519,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) { @ApiModelProperty(example = "1.234", value = "") @JsonProperty("namespace_number") - public BigDecimal getNamespaceNumber() { + @Valid public BigDecimal getNamespaceNumber() { return namespaceNumber; } @@ -665,7 +665,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) { @ApiModelProperty(example = "1.234", value = "") @JsonProperty("prefix_ns_number") - public BigDecimal getPrefixNsNumber() { + @Valid public BigDecimal getPrefixNsNumber() { return prefixNsNumber; } diff --git a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 61964f36576f..1f1eef4714bf 100644 --- a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -18,7 +18,7 @@ @JsonTypeName("AdditionalPropertiesAnyType") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class AdditionalPropertiesAnyType extends HashMap implements Serializable { - private @Valid String name; + private String name; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java index e2d6892fa0fe..99b8f6b76e6b 100644 --- a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -19,7 +19,7 @@ @JsonTypeName("AdditionalPropertiesArray") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class AdditionalPropertiesArray extends HashMap implements Serializable { - private @Valid String name; + private String name; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 5db007063a54..bb34e58e817a 100644 --- a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -18,7 +18,7 @@ @JsonTypeName("AdditionalPropertiesBoolean") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class AdditionalPropertiesBoolean extends HashMap implements Serializable { - private @Valid String name; + private String name; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java index e1fa7f24ee31..f480d8ac5f6b 100644 --- a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -28,9 +28,9 @@ public class AdditionalPropertiesClass implements Serializable { private @Valid Map> mapArrayAnytype = new HashMap<>(); private @Valid Map> mapMapString = new HashMap<>(); private @Valid Map> mapMapAnytype = new HashMap<>(); - private @Valid Object anytype1; - private @Valid Object anytype2; - private @Valid Object anytype3; + private Object anytype1; + private Object anytype2; + private Object anytype3; protected AdditionalPropertiesClass(AdditionalPropertiesClassBuilder b) { this.mapString = b.mapString; @@ -94,7 +94,7 @@ public AdditionalPropertiesClass mapNumber(Map mapNumber) { @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "") @JsonProperty("map_number") - public Map getMapNumber() { + @Valid public Map getMapNumber() { return mapNumber; } @@ -199,7 +199,7 @@ public AdditionalPropertiesClass mapArrayInteger(Map> mapA @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "") @JsonProperty("map_array_integer") - public Map> getMapArrayInteger() { + @Valid public Map> getMapArrayInteger() { return mapArrayInteger; } @@ -234,7 +234,7 @@ public AdditionalPropertiesClass mapArrayAnytype(Map> mapAr @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "") @JsonProperty("map_array_anytype") - public Map> getMapArrayAnytype() { + @Valid public Map> getMapArrayAnytype() { return mapArrayAnytype; } @@ -269,7 +269,7 @@ public AdditionalPropertiesClass mapMapString(Map> m @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "") @JsonProperty("map_map_string") - public Map> getMapMapString() { + @Valid public Map> getMapMapString() { return mapMapString; } @@ -304,7 +304,7 @@ public AdditionalPropertiesClass mapMapAnytype(Map> @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "") @JsonProperty("map_map_anytype") - public Map> getMapMapAnytype() { + @Valid public Map> getMapMapAnytype() { return mapMapAnytype; } diff --git a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java index f3ae2648525c..2d7961459872 100644 --- a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -18,7 +18,7 @@ @JsonTypeName("AdditionalPropertiesInteger") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class AdditionalPropertiesInteger extends HashMap implements Serializable { - private @Valid String name; + private String name; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java index 83d20c517f63..97ade36b064b 100644 --- a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -19,7 +19,7 @@ @JsonTypeName("AdditionalPropertiesNumber") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class AdditionalPropertiesNumber extends HashMap implements Serializable { - private @Valid String name; + private String name; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java index b9cb7be1d39a..ce2afb15ef74 100644 --- a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -18,7 +18,7 @@ @JsonTypeName("AdditionalPropertiesObject") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class AdditionalPropertiesObject extends HashMap implements Serializable { - private @Valid String name; + private String name; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java index 461258a2335d..1fda37af1587 100644 --- a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java @@ -18,7 +18,7 @@ @JsonTypeName("AdditionalPropertiesString") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class AdditionalPropertiesString extends HashMap implements Serializable { - private @Valid String name; + private String name; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Animal.java b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Animal.java index 71b252d8fefe..9fe3c5047df8 100644 --- a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Animal.java @@ -25,8 +25,8 @@ @JsonTypeName("Animal") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Animal implements Serializable { - private @Valid String className; - private @Valid String color = "red"; + private String className; + private String color = "red"; protected Animal(AnimalBuilder b) { this.className = b.className; @@ -46,8 +46,7 @@ public Animal className(String className) { @org.eclipse.microprofile.openapi.annotations.media.Schema(required = true, description = "") @JsonProperty("className") - @NotNull - public String getClassName() { + @NotNull public String getClassName() { return className; } diff --git a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 1c28ed8e719a..c88ada708f52 100644 --- a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -39,7 +39,7 @@ public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArr @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "") @JsonProperty("ArrayArrayNumber") - public List> getArrayArrayNumber() { + @Valid public List<@Valid List<@Valid BigDecimal>> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java index 55be283941d8..eded2af23bc0 100644 --- a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -39,7 +39,7 @@ public ArrayOfNumberOnly arrayNumber(List arrayNumber) { @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "") @JsonProperty("ArrayNumber") - public List getArrayNumber() { + @Valid public List<@Valid BigDecimal> getArrayNumber() { return arrayNumber; } diff --git a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/ArrayTest.java index 8e5a15293277..22112b0ddbd7 100644 --- a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/ArrayTest.java @@ -78,7 +78,7 @@ public ArrayTest arrayArrayOfInteger(List> arrayArrayOfInteger) { @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "") @JsonProperty("array_array_of_integer") - public List> getArrayArrayOfInteger() { + @Valid public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; } @@ -113,7 +113,7 @@ public ArrayTest arrayArrayOfModel(List> arrayArrayOf @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "") @JsonProperty("array_array_of_model") - public List> getArrayArrayOfModel() { + @Valid public List<@Valid List<@Valid ReadOnlyFirst>> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/BigCat.java b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/BigCat.java index 8639e6122d04..47842269e44c 100644 --- a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/BigCat.java @@ -64,7 +64,7 @@ public static KindEnum fromValue(String value) { } } - private @Valid KindEnum kind; + private KindEnum kind; protected BigCat(BigCatBuilder b) { super(b); diff --git a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Capitalization.java index ccc9011b3f0a..6acbf5cedd1e 100644 --- a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Capitalization.java @@ -16,12 +16,12 @@ @JsonTypeName("Capitalization") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Capitalization implements Serializable { - private @Valid String smallCamel; - private @Valid String capitalCamel; - private @Valid String smallSnake; - private @Valid String capitalSnake; - private @Valid String scAETHFlowPoints; - private @Valid String ATT_NAME; + private String smallCamel; + private String capitalCamel; + private String smallSnake; + private String capitalSnake; + private String scAETHFlowPoints; + private String ATT_NAME; protected Capitalization(CapitalizationBuilder b) { this.smallCamel = b.smallCamel; diff --git a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Cat.java b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Cat.java index f35b6110b0ad..9917d941c971 100644 --- a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Cat.java @@ -17,7 +17,7 @@ @JsonTypeName("Cat") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Cat extends Animal implements Serializable { - private @Valid Boolean declawed; + private Boolean declawed; protected Cat(CatBuilder b) { super(b); diff --git a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Category.java index 68b808108310..8b56ec044192 100644 --- a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Category.java @@ -16,8 +16,8 @@ @JsonTypeName("Category") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Category implements Serializable { - private @Valid Long id; - private @Valid String name = "default-name"; + private Long id; + private String name = "default-name"; protected Category(CategoryBuilder b) { this.id = b.id; @@ -56,8 +56,7 @@ public Category name(String name) { @org.eclipse.microprofile.openapi.annotations.media.Schema(required = true, description = "") @JsonProperty("name") - @NotNull - public String getName() { + @NotNull public String getName() { return name; } diff --git a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/ClassModel.java index 4638ee922f56..f235033c9a7b 100644 --- a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/ClassModel.java @@ -18,7 +18,7 @@ @JsonTypeName("ClassModel") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class ClassModel implements Serializable { - private @Valid String propertyClass; + private String propertyClass; protected ClassModel(ClassModelBuilder b) { this.propertyClass = b.propertyClass; diff --git a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Client.java b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Client.java index bae86aeb5a01..270417c29a89 100644 --- a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Client.java @@ -16,7 +16,7 @@ @JsonTypeName("Client") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Client implements Serializable { - private @Valid String client; + private String client; protected Client(ClientBuilder b) { this.client = b.client; diff --git a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Dog.java b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Dog.java index b213226f0cfc..ea4ed8fc6e8b 100644 --- a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Dog.java @@ -17,7 +17,7 @@ @JsonTypeName("Dog") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Dog extends Animal implements Serializable { - private @Valid String breed; + private String breed; protected Dog(DogBuilder b) { super(b); diff --git a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/EnumArrays.java index 954bcf2ef582..98c6b9aa6ff0 100644 --- a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/EnumArrays.java @@ -66,7 +66,7 @@ public static JustSymbolEnum fromValue(String value) { } } - private @Valid JustSymbolEnum justSymbol; + private JustSymbolEnum justSymbol; public enum ArrayEnumEnum { FISH(String.valueOf("fish")), CRAB(String.valueOf("crab")); diff --git a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/EnumTest.java index 392eaa7c6a62..ed2387bc0cab 100644 --- a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/EnumTest.java @@ -65,7 +65,7 @@ public static EnumStringEnum fromValue(String value) { } } - private @Valid EnumStringEnum enumString; + private EnumStringEnum enumString; public enum EnumStringRequiredEnum { UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower")), EMPTY(String.valueOf("")); @@ -113,7 +113,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } - private @Valid EnumStringRequiredEnum enumStringRequired; + private EnumStringRequiredEnum enumStringRequired; public enum EnumIntegerEnum { NUMBER_1(Integer.valueOf(1)), NUMBER_MINUS_1(Integer.valueOf(-1)); @@ -161,7 +161,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } - private @Valid EnumIntegerEnum enumInteger; + private EnumIntegerEnum enumInteger; public enum EnumNumberEnum { NUMBER_1_DOT_1(Double.valueOf(1.1)), NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2)); @@ -209,8 +209,8 @@ public static EnumNumberEnum fromValue(Double value) { } } - private @Valid EnumNumberEnum enumNumber; - private @Valid OuterEnum outerEnum; + private EnumNumberEnum enumNumber; + private OuterEnum outerEnum; protected EnumTest(EnumTestBuilder b) { this.enumString = b.enumString; @@ -252,8 +252,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) { @org.eclipse.microprofile.openapi.annotations.media.Schema(required = true, description = "") @JsonProperty("enum_string_required") - @NotNull - public EnumStringRequiredEnum getEnumStringRequired() { + @NotNull public EnumStringRequiredEnum getEnumStringRequired() { return enumStringRequired; } @@ -310,7 +309,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) { @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "") @JsonProperty("outerEnum") - public OuterEnum getOuterEnum() { + @Valid public OuterEnum getOuterEnum() { return outerEnum; } diff --git a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/FileSchemaTestClass.java index 2ac3016d7f02..d5d8a6c538f1 100644 --- a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/FileSchemaTestClass.java @@ -20,7 +20,7 @@ @JsonTypeName("FileSchemaTestClass") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class FileSchemaTestClass implements Serializable { - private @Valid ModelFile _file; + private ModelFile _file; private @Valid List<@Valid ModelFile> files = new ArrayList<>(); protected FileSchemaTestClass(FileSchemaTestClassBuilder b) { @@ -41,7 +41,7 @@ public FileSchemaTestClass _file(ModelFile _file) { @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "") @JsonProperty("file") - public ModelFile getFile() { + @Valid public ModelFile getFile() { return _file; } @@ -60,7 +60,7 @@ public FileSchemaTestClass files(List<@Valid ModelFile> files) { @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "") @JsonProperty("files") - public List getFiles() { + @Valid public List<@Valid ModelFile> getFiles() { return files; } diff --git a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/FormatTest.java index 0ff8dc4d8a32..4daf822a87d9 100644 --- a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/FormatTest.java @@ -23,20 +23,20 @@ @JsonTypeName("format_test") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class FormatTest implements Serializable { - private @Valid Integer integer; - private @Valid Integer int32; - private @Valid Long int64; - private @Valid BigDecimal number; - private @Valid Float _float; - private @Valid Double _double; - private @Valid String string; - private @Valid byte[] _byte; - private @Valid File binary; - private @Valid LocalDate date; - private @Valid LocalDateTime dateTime; - private @Valid UUID uuid; - private @Valid String password; - private @Valid BigDecimal bigDecimal; + private Integer integer; + private Integer int32; + private Long int64; + private BigDecimal number; + private Float _float; + private Double _double; + private String string; + private byte[] _byte; + private File binary; + private LocalDate date; + private LocalDateTime dateTime; + private UUID uuid; + private String password; + private BigDecimal bigDecimal; protected FormatTest(FormatTestBuilder b) { this.integer = b.integer; @@ -70,7 +70,7 @@ public FormatTest integer(Integer integer) { @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "") @JsonProperty("integer") - @Min(10) @Max(100) public Integer getInteger() { + @Min(10) @Max(100)public Integer getInteger() { return integer; } @@ -91,7 +91,7 @@ public FormatTest int32(Integer int32) { @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "") @JsonProperty("int32") - @Min(20) @Max(200) public Integer getInt32() { + @Min(20) @Max(200)public Integer getInt32() { return int32; } @@ -131,8 +131,7 @@ public FormatTest number(BigDecimal number) { @org.eclipse.microprofile.openapi.annotations.media.Schema(required = true, description = "") @JsonProperty("number") - @NotNull - @DecimalMin("32.1") @DecimalMax("543.2") public BigDecimal getNumber() { + @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2")public BigDecimal getNumber() { return number; } @@ -153,7 +152,7 @@ public FormatTest _float(Float _float) { @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "") @JsonProperty("float") - @DecimalMin("54.3") @DecimalMax("987.6") public Float getFloat() { + @DecimalMin("54.3") @DecimalMax("987.6")public Float getFloat() { return _float; } @@ -174,7 +173,7 @@ public FormatTest _double(Double _double) { @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "") @JsonProperty("double") - @DecimalMin("67.8") @DecimalMax("123.4") public Double getDouble() { + @DecimalMin("67.8") @DecimalMax("123.4")public Double getDouble() { return _double; } @@ -193,7 +192,7 @@ public FormatTest string(String string) { @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "") @JsonProperty("string") - @Pattern(regexp="/[a-z]/i") public String getString() { + @Pattern(regexp="/[a-z]/i")public String getString() { return string; } @@ -212,8 +211,7 @@ public FormatTest _byte(byte[] _byte) { @org.eclipse.microprofile.openapi.annotations.media.Schema(required = true, description = "") @JsonProperty("byte") - @NotNull - @Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$") public byte[] getByte() { + @NotNull @Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$")public byte[] getByte() { return _byte; } @@ -232,7 +230,7 @@ public FormatTest binary(File binary) { @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "") @JsonProperty("binary") - public File getBinary() { + @Valid public File getBinary() { return binary; } @@ -251,8 +249,7 @@ public FormatTest date(LocalDate date) { @org.eclipse.microprofile.openapi.annotations.media.Schema(required = true, description = "") @JsonProperty("date") - @NotNull - public LocalDate getDate() { + @NotNull @Valid public LocalDate getDate() { return date; } @@ -271,7 +268,7 @@ public FormatTest dateTime(LocalDateTime dateTime) { @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "") @JsonProperty("dateTime") - public LocalDateTime getDateTime() { + @Valid public LocalDateTime getDateTime() { return dateTime; } @@ -290,7 +287,7 @@ public FormatTest uuid(UUID uuid) { @org.eclipse.microprofile.openapi.annotations.media.Schema(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", description = "") @JsonProperty("uuid") - public UUID getUuid() { + @Valid public UUID getUuid() { return uuid; } @@ -309,8 +306,7 @@ public FormatTest password(String password) { @org.eclipse.microprofile.openapi.annotations.media.Schema(required = true, description = "") @JsonProperty("password") - @NotNull - @Size(min=10,max=64) public String getPassword() { + @NotNull @Size(min=10,max=64)public String getPassword() { return password; } @@ -329,7 +325,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) { @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "") @JsonProperty("BigDecimal") - public BigDecimal getBigDecimal() { + @Valid public BigDecimal getBigDecimal() { return bigDecimal; } diff --git a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java index 579839b3712a..1e1d6e6a9f85 100644 --- a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java @@ -17,8 +17,8 @@ @JsonTypeName("hasOnlyReadOnly") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class HasOnlyReadOnly implements Serializable { - private @Valid String bar; - private @Valid String foo; + private String bar; + private String foo; protected HasOnlyReadOnly(HasOnlyReadOnlyBuilder b) { this.bar = b.bar; diff --git a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/MapTest.java index 0716e45914f8..8edf5b5e886c 100644 --- a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/MapTest.java @@ -90,7 +90,7 @@ public MapTest mapMapOfString(Map> mapMapOfString) { @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "") @JsonProperty("map_map_of_string") - public Map> getMapMapOfString() { + @Valid public Map> getMapMapOfString() { return mapMapOfString; } diff --git a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index d72f263ffa6c..be71565f10ca 100644 --- a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -21,8 +21,8 @@ @JsonTypeName("MixedPropertiesAndAdditionalPropertiesClass") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class MixedPropertiesAndAdditionalPropertiesClass implements Serializable { - private @Valid UUID uuid; - private @Valid LocalDateTime dateTime; + private UUID uuid; + private LocalDateTime dateTime; private @Valid Map map = new HashMap<>(); protected MixedPropertiesAndAdditionalPropertiesClass(MixedPropertiesAndAdditionalPropertiesClassBuilder b) { @@ -44,7 +44,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "") @JsonProperty("uuid") - public UUID getUuid() { + @Valid public UUID getUuid() { return uuid; } @@ -63,7 +63,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(LocalDateTime dateTi @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "") @JsonProperty("dateTime") - public LocalDateTime getDateTime() { + @Valid public LocalDateTime getDateTime() { return dateTime; } @@ -82,7 +82,7 @@ public MixedPropertiesAndAdditionalPropertiesClass map(Map map) @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "") @JsonProperty("map") - public Map getMap() { + @Valid public Map getMap() { return map; } diff --git a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Model200Response.java index c8271e3273fe..451723509f86 100644 --- a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Model200Response.java @@ -19,8 +19,8 @@ @JsonTypeName("200_response") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Model200Response implements Serializable { - private @Valid Integer name; - private @Valid String propertyClass; + private Integer name; + private String propertyClass; protected Model200Response(Model200ResponseBuilder b) { this.name = b.name; diff --git a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/ModelApiResponse.java index 2f76a5e6522e..fb7c7ea9cb8e 100644 --- a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/ModelApiResponse.java @@ -17,9 +17,9 @@ @JsonTypeName("ApiResponse") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class ModelApiResponse implements Serializable { - private @Valid Integer code; - private @Valid String type; - private @Valid String message; + private Integer code; + private String type; + private String message; protected ModelApiResponse(ModelApiResponseBuilder b) { this.code = b.code; diff --git a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/ModelFile.java b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/ModelFile.java index 3d53d8703f7a..c7ab36d19968 100644 --- a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/ModelFile.java +++ b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/ModelFile.java @@ -19,7 +19,7 @@ @JsonTypeName("File") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class ModelFile implements Serializable { - private @Valid String sourceURI; + private String sourceURI; protected ModelFile(ModelFileBuilder b) { this.sourceURI = b.sourceURI; diff --git a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/ModelList.java b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/ModelList.java index 6b24a70cd782..e7afdefe1128 100644 --- a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/ModelList.java @@ -17,7 +17,7 @@ @JsonTypeName("List") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class ModelList implements Serializable { - private @Valid String _123list; + private String _123list; protected ModelList(ModelListBuilder b) { this._123list = b._123list; diff --git a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/ModelReturn.java index 1fd6743d0318..a19c63ba168d 100644 --- a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/ModelReturn.java @@ -19,7 +19,7 @@ @JsonTypeName("Return") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class ModelReturn implements Serializable { - private @Valid Integer _return; + private Integer _return; protected ModelReturn(ModelReturnBuilder b) { this._return = b._return; diff --git a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Name.java b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Name.java index c10e29c2ea6e..b275b372e104 100644 --- a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Name.java @@ -18,10 +18,10 @@ @JsonTypeName("Name") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Name implements Serializable { - private @Valid Integer name; - private @Valid Integer snakeCase; - private @Valid String property; - private @Valid Integer _123number; + private Integer name; + private Integer snakeCase; + private String property; + private Integer _123number; protected Name(NameBuilder b) { this.name = b.name; @@ -43,8 +43,7 @@ public Name name(Integer name) { @org.eclipse.microprofile.openapi.annotations.media.Schema(required = true, description = "") @JsonProperty("name") - @NotNull - public Integer getName() { + @NotNull public Integer getName() { return name; } diff --git a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/NumberOnly.java index d8865b514cad..be0488ea8c77 100644 --- a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/NumberOnly.java @@ -17,7 +17,7 @@ @JsonTypeName("NumberOnly") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class NumberOnly implements Serializable { - private @Valid BigDecimal justNumber; + private BigDecimal justNumber; protected NumberOnly(NumberOnlyBuilder b) { this.justNumber = b.justNumber; @@ -36,7 +36,7 @@ public NumberOnly justNumber(BigDecimal justNumber) { @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "") @JsonProperty("JustNumber") - public BigDecimal getJustNumber() { + @Valid public BigDecimal getJustNumber() { return justNumber; } diff --git a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Order.java index d3b15b8e5fd9..bcf0838cd8dd 100644 --- a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Order.java @@ -17,10 +17,10 @@ @JsonTypeName("Order") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Order implements Serializable { - private @Valid Long id; - private @Valid Long petId; - private @Valid Integer quantity; - private @Valid LocalDateTime shipDate; + private Long id; + private Long petId; + private Integer quantity; + private LocalDateTime shipDate; public enum StatusEnum { PLACED(String.valueOf("placed")), APPROVED(String.valueOf("approved")), DELIVERED(String.valueOf("delivered")); @@ -68,8 +68,8 @@ public static StatusEnum fromValue(String value) { } } - private @Valid StatusEnum status; - private @Valid Boolean complete = false; + private StatusEnum status; + private Boolean complete = false; protected Order(OrderBuilder b) { this.id = b.id; @@ -150,7 +150,7 @@ public Order shipDate(LocalDateTime shipDate) { @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "") @JsonProperty("shipDate") - public LocalDateTime getShipDate() { + @Valid public LocalDateTime getShipDate() { return shipDate; } diff --git a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/OuterComposite.java index cfe0ea91e874..8ccd8ebc54b1 100644 --- a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/OuterComposite.java @@ -17,9 +17,9 @@ @JsonTypeName("OuterComposite") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class OuterComposite implements Serializable { - private @Valid BigDecimal myNumber; - private @Valid String myString; - private @Valid Boolean myBoolean; + private BigDecimal myNumber; + private String myString; + private Boolean myBoolean; protected OuterComposite(OuterCompositeBuilder b) { this.myNumber = b.myNumber; @@ -40,7 +40,7 @@ public OuterComposite myNumber(BigDecimal myNumber) { @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "") @JsonProperty("my_number") - public BigDecimal getMyNumber() { + @Valid public BigDecimal getMyNumber() { return myNumber; } diff --git a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Pet.java index cda86f596fa3..019110368986 100644 --- a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Pet.java @@ -24,9 +24,9 @@ @JsonTypeName("Pet") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Pet implements Serializable { - private @Valid Long id; - private @Valid Category category; - private @Valid String name; + private Long id; + private Category category; + private String name; private @Valid Set photoUrls = new LinkedHashSet<>(); private @Valid List<@Valid Tag> tags = new ArrayList<>(); public enum StatusEnum { @@ -76,7 +76,7 @@ public static StatusEnum fromValue(String value) { } } - private @Valid StatusEnum status; + private StatusEnum status; protected Pet(PetBuilder b) { this.id = b.id; @@ -119,7 +119,7 @@ public Pet category(Category category) { @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "") @JsonProperty("category") - public Category getCategory() { + @Valid public Category getCategory() { return category; } @@ -138,8 +138,7 @@ public Pet name(String name) { @org.eclipse.microprofile.openapi.annotations.media.Schema(example = "doggie", required = true, description = "") @JsonProperty("name") - @NotNull - public String getName() { + @NotNull public String getName() { return name; } @@ -158,8 +157,7 @@ public Pet photoUrls(Set photoUrls) { @org.eclipse.microprofile.openapi.annotations.media.Schema(required = true, description = "") @JsonProperty("photoUrls") - @NotNull - public Set getPhotoUrls() { + @NotNull public Set getPhotoUrls() { return photoUrls; } @@ -195,7 +193,7 @@ public Pet tags(List<@Valid Tag> tags) { @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "") @JsonProperty("tags") - public List getTags() { + @Valid public List<@Valid Tag> getTags() { return tags; } diff --git a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/ReadOnlyFirst.java index 522992237b44..b888e6c492e7 100644 --- a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/ReadOnlyFirst.java @@ -16,8 +16,8 @@ @JsonTypeName("ReadOnlyFirst") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class ReadOnlyFirst implements Serializable { - private @Valid String bar; - private @Valid String baz; + private String bar; + private String baz; protected ReadOnlyFirst(ReadOnlyFirstBuilder b) { this.bar = b.bar; diff --git a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/SpecialModelName.java index 40428be36120..ec5a5a3c7476 100644 --- a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/SpecialModelName.java @@ -17,7 +17,7 @@ @JsonTypeName("$special[model.name]") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class SpecialModelName implements Serializable { - private @Valid Long $specialPropertyName; + private Long $specialPropertyName; protected SpecialModelName(SpecialModelNameBuilder b) { this.$specialPropertyName = b.$specialPropertyName; diff --git a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Tag.java b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Tag.java index 38aee8f91911..d01c1f8fdd4f 100644 --- a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Tag.java @@ -16,8 +16,8 @@ @JsonTypeName("Tag") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Tag implements Serializable { - private @Valid Long id; - private @Valid String name; + private Long id; + private String name; protected Tag(TagBuilder b) { this.id = b.id; diff --git a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/TypeHolderDefault.java index c4ccf5c9a9cb..45c2bb57a075 100644 --- a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/TypeHolderDefault.java @@ -20,10 +20,10 @@ @JsonTypeName("TypeHolderDefault") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class TypeHolderDefault implements Serializable { - private @Valid String stringItem = "what"; - private @Valid BigDecimal numberItem; - private @Valid Integer integerItem; - private @Valid Boolean boolItem = true; + private String stringItem = "what"; + private BigDecimal numberItem; + private Integer integerItem; + private Boolean boolItem = true; private @Valid List arrayItem = new ArrayList<>(); protected TypeHolderDefault(TypeHolderDefaultBuilder b) { @@ -47,8 +47,7 @@ public TypeHolderDefault stringItem(String stringItem) { @org.eclipse.microprofile.openapi.annotations.media.Schema(required = true, description = "") @JsonProperty("string_item") - @NotNull - public String getStringItem() { + @NotNull public String getStringItem() { return stringItem; } @@ -67,8 +66,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) { @org.eclipse.microprofile.openapi.annotations.media.Schema(required = true, description = "") @JsonProperty("number_item") - @NotNull - public BigDecimal getNumberItem() { + @NotNull @Valid public BigDecimal getNumberItem() { return numberItem; } @@ -87,8 +85,7 @@ public TypeHolderDefault integerItem(Integer integerItem) { @org.eclipse.microprofile.openapi.annotations.media.Schema(required = true, description = "") @JsonProperty("integer_item") - @NotNull - public Integer getIntegerItem() { + @NotNull public Integer getIntegerItem() { return integerItem; } @@ -107,8 +104,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) { @org.eclipse.microprofile.openapi.annotations.media.Schema(required = true, description = "") @JsonProperty("bool_item") - @NotNull - public Boolean getBoolItem() { + @NotNull public Boolean getBoolItem() { return boolItem; } @@ -127,8 +123,7 @@ public TypeHolderDefault arrayItem(List arrayItem) { @org.eclipse.microprofile.openapi.annotations.media.Schema(required = true, description = "") @JsonProperty("array_item") - @NotNull - public List getArrayItem() { + @NotNull public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/TypeHolderExample.java index a34b848b78e8..27d41486c488 100644 --- a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/TypeHolderExample.java @@ -20,11 +20,11 @@ @JsonTypeName("TypeHolderExample") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class TypeHolderExample implements Serializable { - private @Valid String stringItem; - private @Valid BigDecimal numberItem; - private @Valid Float floatItem; - private @Valid Integer integerItem; - private @Valid Boolean boolItem; + private String stringItem; + private BigDecimal numberItem; + private Float floatItem; + private Integer integerItem; + private Boolean boolItem; private @Valid List arrayItem = new ArrayList<>(); protected TypeHolderExample(TypeHolderExampleBuilder b) { @@ -49,8 +49,7 @@ public TypeHolderExample stringItem(String stringItem) { @org.eclipse.microprofile.openapi.annotations.media.Schema(example = "what", required = true, description = "") @JsonProperty("string_item") - @NotNull - public String getStringItem() { + @NotNull public String getStringItem() { return stringItem; } @@ -69,8 +68,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { @org.eclipse.microprofile.openapi.annotations.media.Schema(example = "1.234", required = true, description = "") @JsonProperty("number_item") - @NotNull - public BigDecimal getNumberItem() { + @NotNull @Valid public BigDecimal getNumberItem() { return numberItem; } @@ -89,8 +87,7 @@ public TypeHolderExample floatItem(Float floatItem) { @org.eclipse.microprofile.openapi.annotations.media.Schema(example = "1.234", required = true, description = "") @JsonProperty("float_item") - @NotNull - public Float getFloatItem() { + @NotNull public Float getFloatItem() { return floatItem; } @@ -109,8 +106,7 @@ public TypeHolderExample integerItem(Integer integerItem) { @org.eclipse.microprofile.openapi.annotations.media.Schema(example = "-2", required = true, description = "") @JsonProperty("integer_item") - @NotNull - public Integer getIntegerItem() { + @NotNull public Integer getIntegerItem() { return integerItem; } @@ -129,8 +125,7 @@ public TypeHolderExample boolItem(Boolean boolItem) { @org.eclipse.microprofile.openapi.annotations.media.Schema(example = "true", required = true, description = "") @JsonProperty("bool_item") - @NotNull - public Boolean getBoolItem() { + @NotNull public Boolean getBoolItem() { return boolItem; } @@ -149,8 +144,7 @@ public TypeHolderExample arrayItem(List arrayItem) { @org.eclipse.microprofile.openapi.annotations.media.Schema(example = "[0, 1, 2, 3]", required = true, description = "") @JsonProperty("array_item") - @NotNull - public List getArrayItem() { + @NotNull public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/User.java b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/User.java index 3980ae12e1f8..35e1d1a6c728 100644 --- a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/User.java +++ b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/User.java @@ -16,14 +16,14 @@ @JsonTypeName("User") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class User implements Serializable { - private @Valid Long id; - private @Valid String username; - private @Valid String firstName; - private @Valid String lastName; - private @Valid String email; - private @Valid String password; - private @Valid String phone; - private @Valid Integer userStatus; + private Long id; + private String username; + private String firstName; + private String lastName; + private String email; + private String password; + private String phone; + private Integer userStatus; protected User(UserBuilder b) { this.id = b.id; diff --git a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/XmlItem.java index 523d7c141425..40f1d7cb1402 100644 --- a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/XmlItem.java @@ -20,33 +20,33 @@ @JsonTypeName("XmlItem") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class XmlItem implements Serializable { - private @Valid String attributeString; - private @Valid BigDecimal attributeNumber; - private @Valid Integer attributeInteger; - private @Valid Boolean attributeBoolean; + private String attributeString; + private BigDecimal attributeNumber; + private Integer attributeInteger; + private Boolean attributeBoolean; private @Valid List wrappedArray = new ArrayList<>(); - private @Valid String nameString; - private @Valid BigDecimal nameNumber; - private @Valid Integer nameInteger; - private @Valid Boolean nameBoolean; + private String nameString; + private BigDecimal nameNumber; + private Integer nameInteger; + private Boolean nameBoolean; private @Valid List nameArray = new ArrayList<>(); private @Valid List nameWrappedArray = new ArrayList<>(); - private @Valid String prefixString; - private @Valid BigDecimal prefixNumber; - private @Valid Integer prefixInteger; - private @Valid Boolean prefixBoolean; + private String prefixString; + private BigDecimal prefixNumber; + private Integer prefixInteger; + private Boolean prefixBoolean; private @Valid List prefixArray = new ArrayList<>(); private @Valid List prefixWrappedArray = new ArrayList<>(); - private @Valid String namespaceString; - private @Valid BigDecimal namespaceNumber; - private @Valid Integer namespaceInteger; - private @Valid Boolean namespaceBoolean; + private String namespaceString; + private BigDecimal namespaceNumber; + private Integer namespaceInteger; + private Boolean namespaceBoolean; private @Valid List namespaceArray = new ArrayList<>(); private @Valid List namespaceWrappedArray = new ArrayList<>(); - private @Valid String prefixNsString; - private @Valid BigDecimal prefixNsNumber; - private @Valid Integer prefixNsInteger; - private @Valid Boolean prefixNsBoolean; + private String prefixNsString; + private BigDecimal prefixNsNumber; + private Integer prefixNsInteger; + private Boolean prefixNsBoolean; private @Valid List prefixNsArray = new ArrayList<>(); private @Valid List prefixNsWrappedArray = new ArrayList<>(); @@ -114,7 +114,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) { @org.eclipse.microprofile.openapi.annotations.media.Schema(example = "1.234", description = "") @JsonProperty("attribute_number") - public BigDecimal getAttributeNumber() { + @Valid public BigDecimal getAttributeNumber() { return attributeNumber; } @@ -225,7 +225,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) { @org.eclipse.microprofile.openapi.annotations.media.Schema(example = "1.234", description = "") @JsonProperty("name_number") - public BigDecimal getNameNumber() { + @Valid public BigDecimal getNameNumber() { return nameNumber; } @@ -371,7 +371,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) { @org.eclipse.microprofile.openapi.annotations.media.Schema(example = "1.234", description = "") @JsonProperty("prefix_number") - public BigDecimal getPrefixNumber() { + @Valid public BigDecimal getPrefixNumber() { return prefixNumber; } @@ -517,7 +517,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) { @org.eclipse.microprofile.openapi.annotations.media.Schema(example = "1.234", description = "") @JsonProperty("namespace_number") - public BigDecimal getNamespaceNumber() { + @Valid public BigDecimal getNamespaceNumber() { return namespaceNumber; } @@ -663,7 +663,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) { @org.eclipse.microprofile.openapi.annotations.media.Schema(example = "1.234", description = "") @JsonProperty("prefix_ns_number") - public BigDecimal getPrefixNsNumber() { + @Valid public BigDecimal getPrefixNsNumber() { return prefixNsNumber; } diff --git a/samples/server/petstore/jaxrs-spec-required-and-readonly-property/src/gen/java/org/openapitools/model/ReadonlyAndRequiredProperties.java b/samples/server/petstore/jaxrs-spec-required-and-readonly-property/src/gen/java/org/openapitools/model/ReadonlyAndRequiredProperties.java index 1d4898e9fdfa..dc27b575d7aa 100644 --- a/samples/server/petstore/jaxrs-spec-required-and-readonly-property/src/gen/java/org/openapitools/model/ReadonlyAndRequiredProperties.java +++ b/samples/server/petstore/jaxrs-spec-required-and-readonly-property/src/gen/java/org/openapitools/model/ReadonlyAndRequiredProperties.java @@ -18,10 +18,10 @@ @JsonTypeName("ReadonlyAndRequiredProperties") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class ReadonlyAndRequiredProperties implements Serializable { - private @Valid String requiredYesReadonlyYes; - private @Valid String requiredYesReadonlyNo; - private @Valid String requiredNoReadonlyYes; - private @Valid String requiredNoReadonlyNo; + private String requiredYesReadonlyYes; + private String requiredYesReadonlyNo; + private String requiredNoReadonlyYes; + private String requiredNoReadonlyNo; protected ReadonlyAndRequiredProperties(ReadonlyAndRequiredPropertiesBuilder b) { this.requiredYesReadonlyYes = b.requiredYesReadonlyYes; @@ -62,8 +62,7 @@ public ReadonlyAndRequiredProperties requiredYesReadonlyNo(String requiredYesRea @ApiModelProperty(required = true, value = "") @JsonProperty("requiredYesReadonlyNo") - @NotNull - public String getRequiredYesReadonlyNo() { + @NotNull public String getRequiredYesReadonlyNo() { return requiredYesReadonlyNo; } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java index b17edadb0087..1ab2c2ecbf1d 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -20,7 +20,7 @@ @JsonTypeName("AdditionalPropertiesAnyType") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class AdditionalPropertiesAnyType extends HashMap implements Serializable { - private @Valid String name; + private String name; /** **/ diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java index 18993dba3513..6b2390dfed9c 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -21,7 +21,7 @@ @JsonTypeName("AdditionalPropertiesArray") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class AdditionalPropertiesArray extends HashMap implements Serializable { - private @Valid String name; + private String name; /** **/ diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 5838ddee4c8e..a2e62819c2cf 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -20,7 +20,7 @@ @JsonTypeName("AdditionalPropertiesBoolean") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class AdditionalPropertiesBoolean extends HashMap implements Serializable { - private @Valid String name; + private String name; /** **/ diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java index d48885c9e8e7..418f8f40ca82 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -30,9 +30,9 @@ public class AdditionalPropertiesClass implements Serializable { private @Valid Map> mapArrayAnytype = new HashMap<>(); private @Valid Map> mapMapString = new HashMap<>(); private @Valid Map> mapMapAnytype = new HashMap<>(); - private @Valid Object anytype1; - private @Valid Object anytype2; - private @Valid Object anytype3; + private Object anytype1; + private Object anytype2; + private Object anytype3; protected AdditionalPropertiesClass(AdditionalPropertiesClassBuilder b) { this.mapString = b.mapString; @@ -96,7 +96,7 @@ public AdditionalPropertiesClass mapNumber(Map mapNumber) { @ApiModelProperty(value = "") @JsonProperty("map_number") - public Map getMapNumber() { + @Valid public Map getMapNumber() { return mapNumber; } @@ -201,7 +201,7 @@ public AdditionalPropertiesClass mapArrayInteger(Map> mapA @ApiModelProperty(value = "") @JsonProperty("map_array_integer") - public Map> getMapArrayInteger() { + @Valid public Map> getMapArrayInteger() { return mapArrayInteger; } @@ -236,7 +236,7 @@ public AdditionalPropertiesClass mapArrayAnytype(Map> mapAr @ApiModelProperty(value = "") @JsonProperty("map_array_anytype") - public Map> getMapArrayAnytype() { + @Valid public Map> getMapArrayAnytype() { return mapArrayAnytype; } @@ -271,7 +271,7 @@ public AdditionalPropertiesClass mapMapString(Map> m @ApiModelProperty(value = "") @JsonProperty("map_map_string") - public Map> getMapMapString() { + @Valid public Map> getMapMapString() { return mapMapString; } @@ -306,7 +306,7 @@ public AdditionalPropertiesClass mapMapAnytype(Map> @ApiModelProperty(value = "") @JsonProperty("map_map_anytype") - public Map> getMapMapAnytype() { + @Valid public Map> getMapMapAnytype() { return mapMapAnytype; } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java index aac490cd9471..ab1879a09448 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -20,7 +20,7 @@ @JsonTypeName("AdditionalPropertiesInteger") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class AdditionalPropertiesInteger extends HashMap implements Serializable { - private @Valid String name; + private String name; /** **/ diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java index dad9369cea7b..9e3749ef252a 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -21,7 +21,7 @@ @JsonTypeName("AdditionalPropertiesNumber") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class AdditionalPropertiesNumber extends HashMap implements Serializable { - private @Valid String name; + private String name; /** **/ diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java index 5b728850fb70..0f6768aa5188 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -20,7 +20,7 @@ @JsonTypeName("AdditionalPropertiesObject") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class AdditionalPropertiesObject extends HashMap implements Serializable { - private @Valid String name; + private String name; /** **/ diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java index 7c3dc5397e69..8eb4b6a91d90 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java @@ -20,7 +20,7 @@ @JsonTypeName("AdditionalPropertiesString") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class AdditionalPropertiesString extends HashMap implements Serializable { - private @Valid String name; + private String name; /** **/ diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Animal.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Animal.java index fa3e550cf068..fcaa2774e5c3 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Animal.java @@ -27,8 +27,8 @@ @JsonTypeName("Animal") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Animal implements Serializable { - private @Valid String className; - private @Valid String color = "red"; + private String className; + private String color = "red"; protected Animal(AnimalBuilder b) { this.className = b.className; @@ -48,8 +48,7 @@ public Animal className(String className) { @ApiModelProperty(required = true, value = "") @JsonProperty("className") - @NotNull - public String getClassName() { + @NotNull public String getClassName() { return className; } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 13401f3d90c7..4a3c6548387a 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -41,7 +41,7 @@ public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArr @ApiModelProperty(value = "") @JsonProperty("ArrayArrayNumber") - public List> getArrayArrayNumber() { + @Valid public List<@Valid List<@Valid BigDecimal>> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java index ed92ac73c24f..cd605bc99f28 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -41,7 +41,7 @@ public ArrayOfNumberOnly arrayNumber(List arrayNumber) { @ApiModelProperty(value = "") @JsonProperty("ArrayNumber") - public List getArrayNumber() { + @Valid public List<@Valid BigDecimal> getArrayNumber() { return arrayNumber; } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayTest.java index 7790ae114e31..9710fe573127 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayTest.java @@ -80,7 +80,7 @@ public ArrayTest arrayArrayOfInteger(List> arrayArrayOfInteger) { @ApiModelProperty(value = "") @JsonProperty("array_array_of_integer") - public List> getArrayArrayOfInteger() { + @Valid public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; } @@ -115,7 +115,7 @@ public ArrayTest arrayArrayOfModel(List> arrayArrayOf @ApiModelProperty(value = "") @JsonProperty("array_array_of_model") - public List> getArrayArrayOfModel() { + @Valid public List<@Valid List<@Valid ReadOnlyFirst>> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/BigCat.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/BigCat.java index 92e662094f5f..83e8973110d4 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/BigCat.java @@ -66,7 +66,7 @@ public static KindEnum fromValue(String value) { } } - private @Valid KindEnum kind; + private KindEnum kind; protected BigCat(BigCatBuilder b) { super(b); diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Capitalization.java index e4e5f5996f98..82e9e1f71da0 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Capitalization.java @@ -18,12 +18,12 @@ @JsonTypeName("Capitalization") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Capitalization implements Serializable { - private @Valid String smallCamel; - private @Valid String capitalCamel; - private @Valid String smallSnake; - private @Valid String capitalSnake; - private @Valid String scAETHFlowPoints; - private @Valid String ATT_NAME; + private String smallCamel; + private String capitalCamel; + private String smallSnake; + private String capitalSnake; + private String scAETHFlowPoints; + private String ATT_NAME; protected Capitalization(CapitalizationBuilder b) { this.smallCamel = b.smallCamel; diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Cat.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Cat.java index 0b6d7ccc0d19..834a175c33c7 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Cat.java @@ -19,7 +19,7 @@ @JsonTypeName("Cat") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Cat extends Animal implements Serializable { - private @Valid Boolean declawed; + private Boolean declawed; protected Cat(CatBuilder b) { super(b); diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Category.java index 4e2ae2d58c87..27a54adcea49 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Category.java @@ -18,8 +18,8 @@ @JsonTypeName("Category") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Category implements Serializable { - private @Valid Long id; - private @Valid String name = "default-name"; + private Long id; + private String name = "default-name"; protected Category(CategoryBuilder b) { this.id = b.id; @@ -58,8 +58,7 @@ public Category name(String name) { @ApiModelProperty(required = true, value = "") @JsonProperty("name") - @NotNull - public String getName() { + @NotNull public String getName() { return name; } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ClassModel.java index e91381ecb7d0..2d051703dc8c 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ClassModel.java @@ -20,7 +20,7 @@ @JsonTypeName("ClassModel") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class ClassModel implements Serializable { - private @Valid String propertyClass; + private String propertyClass; protected ClassModel(ClassModelBuilder b) { this.propertyClass = b.propertyClass; diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Client.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Client.java index c2f88a85b0b5..efde164d1666 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Client.java @@ -18,7 +18,7 @@ @JsonTypeName("Client") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Client implements Serializable { - private @Valid String client; + private String client; protected Client(ClientBuilder b) { this.client = b.client; diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Dog.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Dog.java index e1c39d6d518b..1759ff7f7258 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Dog.java @@ -19,7 +19,7 @@ @JsonTypeName("Dog") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Dog extends Animal implements Serializable { - private @Valid String breed; + private String breed; protected Dog(DogBuilder b) { super(b); diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/EnumArrays.java index ab87f4c939a5..3c1e9cc11daa 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/EnumArrays.java @@ -68,7 +68,7 @@ public static JustSymbolEnum fromValue(String value) { } } - private @Valid JustSymbolEnum justSymbol; + private JustSymbolEnum justSymbol; public enum ArrayEnumEnum { FISH(String.valueOf("fish")), CRAB(String.valueOf("crab")); diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/EnumTest.java index a4824ec81bdc..32e58bd88d36 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/EnumTest.java @@ -67,7 +67,7 @@ public static EnumStringEnum fromValue(String value) { } } - private @Valid EnumStringEnum enumString; + private EnumStringEnum enumString; public enum EnumStringRequiredEnum { UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower")), EMPTY(String.valueOf("")); @@ -115,7 +115,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } - private @Valid EnumStringRequiredEnum enumStringRequired; + private EnumStringRequiredEnum enumStringRequired; public enum EnumIntegerEnum { NUMBER_1(Integer.valueOf(1)), NUMBER_MINUS_1(Integer.valueOf(-1)); @@ -163,7 +163,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } - private @Valid EnumIntegerEnum enumInteger; + private EnumIntegerEnum enumInteger; public enum EnumNumberEnum { NUMBER_1_DOT_1(Double.valueOf(1.1)), NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2)); @@ -211,8 +211,8 @@ public static EnumNumberEnum fromValue(Double value) { } } - private @Valid EnumNumberEnum enumNumber; - private @Valid OuterEnum outerEnum; + private EnumNumberEnum enumNumber; + private OuterEnum outerEnum; protected EnumTest(EnumTestBuilder b) { this.enumString = b.enumString; @@ -254,8 +254,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) { @ApiModelProperty(required = true, value = "") @JsonProperty("enum_string_required") - @NotNull - public EnumStringRequiredEnum getEnumStringRequired() { + @NotNull public EnumStringRequiredEnum getEnumStringRequired() { return enumStringRequired; } @@ -312,7 +311,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) { @ApiModelProperty(value = "") @JsonProperty("outerEnum") - public OuterEnum getOuterEnum() { + @Valid public OuterEnum getOuterEnum() { return outerEnum; } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/FileSchemaTestClass.java index 5a67940ea3dc..e6d668eefaa0 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/FileSchemaTestClass.java @@ -22,7 +22,7 @@ @JsonTypeName("FileSchemaTestClass") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class FileSchemaTestClass implements Serializable { - private @Valid ModelFile _file; + private ModelFile _file; private @Valid List<@Valid ModelFile> files = new ArrayList<>(); protected FileSchemaTestClass(FileSchemaTestClassBuilder b) { @@ -43,7 +43,7 @@ public FileSchemaTestClass _file(ModelFile _file) { @ApiModelProperty(value = "") @JsonProperty("file") - public ModelFile getFile() { + @Valid public ModelFile getFile() { return _file; } @@ -62,7 +62,7 @@ public FileSchemaTestClass files(List<@Valid ModelFile> files) { @ApiModelProperty(value = "") @JsonProperty("files") - public List getFiles() { + @Valid public List<@Valid ModelFile> getFiles() { return files; } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/FormatTest.java index 7c5b76402e97..469ab15617dc 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/FormatTest.java @@ -25,20 +25,20 @@ @JsonTypeName("format_test") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class FormatTest implements Serializable { - private @Valid Integer integer; - private @Valid Integer int32; - private @Valid Long int64; - private @Valid BigDecimal number; - private @Valid Float _float; - private @Valid Double _double; - private @Valid String string; - private @Valid byte[] _byte; - private @Valid File binary; - private @Valid LocalDate date; - private @Valid Date dateTime; - private @Valid UUID uuid; - private @Valid String password; - private @Valid BigDecimal bigDecimal; + private Integer integer; + private Integer int32; + private Long int64; + private BigDecimal number; + private Float _float; + private Double _double; + private String string; + private byte[] _byte; + private File binary; + private LocalDate date; + private Date dateTime; + private UUID uuid; + private String password; + private BigDecimal bigDecimal; protected FormatTest(FormatTestBuilder b) { this.integer = b.integer; @@ -72,7 +72,7 @@ public FormatTest integer(Integer integer) { @ApiModelProperty(value = "") @JsonProperty("integer") - @Min(10) @Max(100) public Integer getInteger() { + @Min(10) @Max(100)public Integer getInteger() { return integer; } @@ -93,7 +93,7 @@ public FormatTest int32(Integer int32) { @ApiModelProperty(value = "") @JsonProperty("int32") - @Min(20) @Max(200) public Integer getInt32() { + @Min(20) @Max(200)public Integer getInt32() { return int32; } @@ -133,8 +133,7 @@ public FormatTest number(BigDecimal number) { @ApiModelProperty(required = true, value = "") @JsonProperty("number") - @NotNull - @DecimalMin("32.1") @DecimalMax("543.2") public BigDecimal getNumber() { + @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2")public BigDecimal getNumber() { return number; } @@ -155,7 +154,7 @@ public FormatTest _float(Float _float) { @ApiModelProperty(value = "") @JsonProperty("float") - @DecimalMin("54.3") @DecimalMax("987.6") public Float getFloat() { + @DecimalMin("54.3") @DecimalMax("987.6")public Float getFloat() { return _float; } @@ -176,7 +175,7 @@ public FormatTest _double(Double _double) { @ApiModelProperty(value = "") @JsonProperty("double") - @DecimalMin("67.8") @DecimalMax("123.4") public Double getDouble() { + @DecimalMin("67.8") @DecimalMax("123.4")public Double getDouble() { return _double; } @@ -195,7 +194,7 @@ public FormatTest string(String string) { @ApiModelProperty(value = "") @JsonProperty("string") - @Pattern(regexp="/[a-z]/i") public String getString() { + @Pattern(regexp="/[a-z]/i")public String getString() { return string; } @@ -214,8 +213,7 @@ public FormatTest _byte(byte[] _byte) { @ApiModelProperty(required = true, value = "") @JsonProperty("byte") - @NotNull - @Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$") public byte[] getByte() { + @NotNull @Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$")public byte[] getByte() { return _byte; } @@ -234,7 +232,7 @@ public FormatTest binary(File binary) { @ApiModelProperty(value = "") @JsonProperty("binary") - public File getBinary() { + @Valid public File getBinary() { return binary; } @@ -253,8 +251,7 @@ public FormatTest date(LocalDate date) { @ApiModelProperty(required = true, value = "") @JsonProperty("date") - @NotNull - public LocalDate getDate() { + @NotNull @Valid public LocalDate getDate() { return date; } @@ -273,7 +270,7 @@ public FormatTest dateTime(Date dateTime) { @ApiModelProperty(value = "") @JsonProperty("dateTime") - public Date getDateTime() { + @Valid public Date getDateTime() { return dateTime; } @@ -292,7 +289,7 @@ public FormatTest uuid(UUID uuid) { @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") @JsonProperty("uuid") - public UUID getUuid() { + @Valid public UUID getUuid() { return uuid; } @@ -311,8 +308,7 @@ public FormatTest password(String password) { @ApiModelProperty(required = true, value = "") @JsonProperty("password") - @NotNull - @Size(min=10,max=64) public String getPassword() { + @NotNull @Size(min=10,max=64)public String getPassword() { return password; } @@ -331,7 +327,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) { @ApiModelProperty(value = "") @JsonProperty("BigDecimal") - public BigDecimal getBigDecimal() { + @Valid public BigDecimal getBigDecimal() { return bigDecimal; } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java index 2ff932f49d8f..7a9dfc7fe080 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java @@ -19,8 +19,8 @@ @JsonTypeName("hasOnlyReadOnly") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class HasOnlyReadOnly implements Serializable { - private @Valid String bar; - private @Valid String foo; + private String bar; + private String foo; protected HasOnlyReadOnly(HasOnlyReadOnlyBuilder b) { this.bar = b.bar; diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/MapTest.java index 2a635e9c44c5..eb138380b67b 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/MapTest.java @@ -92,7 +92,7 @@ public MapTest mapMapOfString(Map> mapMapOfString) { @ApiModelProperty(value = "") @JsonProperty("map_map_of_string") - public Map> getMapMapOfString() { + @Valid public Map> getMapMapOfString() { return mapMapOfString; } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 553453518fba..253c0ca50a1e 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -23,8 +23,8 @@ @JsonTypeName("MixedPropertiesAndAdditionalPropertiesClass") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class MixedPropertiesAndAdditionalPropertiesClass implements Serializable { - private @Valid UUID uuid; - private @Valid Date dateTime; + private UUID uuid; + private Date dateTime; private @Valid Map map = new HashMap<>(); protected MixedPropertiesAndAdditionalPropertiesClass(MixedPropertiesAndAdditionalPropertiesClassBuilder b) { @@ -46,7 +46,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { @ApiModelProperty(value = "") @JsonProperty("uuid") - public UUID getUuid() { + @Valid public UUID getUuid() { return uuid; } @@ -65,7 +65,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(Date dateTime) { @ApiModelProperty(value = "") @JsonProperty("dateTime") - public Date getDateTime() { + @Valid public Date getDateTime() { return dateTime; } @@ -84,7 +84,7 @@ public MixedPropertiesAndAdditionalPropertiesClass map(Map map) @ApiModelProperty(value = "") @JsonProperty("map") - public Map getMap() { + @Valid public Map getMap() { return map; } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Model200Response.java index c883b391c7db..063ffdb0bccf 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Model200Response.java @@ -21,8 +21,8 @@ @JsonTypeName("200_response") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Model200Response implements Serializable { - private @Valid Integer name; - private @Valid String propertyClass; + private Integer name; + private String propertyClass; protected Model200Response(Model200ResponseBuilder b) { this.name = b.name; diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ModelApiResponse.java index a399e135dd76..586b31a0e669 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ModelApiResponse.java @@ -19,9 +19,9 @@ @JsonTypeName("ApiResponse") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class ModelApiResponse implements Serializable { - private @Valid Integer code; - private @Valid String type; - private @Valid String message; + private Integer code; + private String type; + private String message; protected ModelApiResponse(ModelApiResponseBuilder b) { this.code = b.code; diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ModelFile.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ModelFile.java index 68fcaf697bc9..b7ee093dae6c 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ModelFile.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ModelFile.java @@ -21,7 +21,7 @@ @JsonTypeName("File") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class ModelFile implements Serializable { - private @Valid String sourceURI; + private String sourceURI; protected ModelFile(ModelFileBuilder b) { this.sourceURI = b.sourceURI; diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ModelList.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ModelList.java index 387dc896d282..3d87f70d86ce 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ModelList.java @@ -19,7 +19,7 @@ @JsonTypeName("List") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class ModelList implements Serializable { - private @Valid String _123list; + private String _123list; protected ModelList(ModelListBuilder b) { this._123list = b._123list; diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ModelReturn.java index a641404b7807..b3de46717d69 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ModelReturn.java @@ -21,7 +21,7 @@ @JsonTypeName("Return") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class ModelReturn implements Serializable { - private @Valid Integer _return; + private Integer _return; protected ModelReturn(ModelReturnBuilder b) { this._return = b._return; diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Name.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Name.java index 962fd27457fd..5c55deff0c9a 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Name.java @@ -20,10 +20,10 @@ @JsonTypeName("Name") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Name implements Serializable { - private @Valid Integer name; - private @Valid Integer snakeCase; - private @Valid String property; - private @Valid Integer _123number; + private Integer name; + private Integer snakeCase; + private String property; + private Integer _123number; protected Name(NameBuilder b) { this.name = b.name; @@ -45,8 +45,7 @@ public Name name(Integer name) { @ApiModelProperty(required = true, value = "") @JsonProperty("name") - @NotNull - public Integer getName() { + @NotNull public Integer getName() { return name; } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/NumberOnly.java index ad452c2e8527..fefaf9a0d886 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/NumberOnly.java @@ -19,7 +19,7 @@ @JsonTypeName("NumberOnly") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class NumberOnly implements Serializable { - private @Valid BigDecimal justNumber; + private BigDecimal justNumber; protected NumberOnly(NumberOnlyBuilder b) { this.justNumber = b.justNumber; @@ -38,7 +38,7 @@ public NumberOnly justNumber(BigDecimal justNumber) { @ApiModelProperty(value = "") @JsonProperty("JustNumber") - public BigDecimal getJustNumber() { + @Valid public BigDecimal getJustNumber() { return justNumber; } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Order.java index dd74168a86ff..acc42c62aa81 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Order.java @@ -19,10 +19,10 @@ @JsonTypeName("Order") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Order implements Serializable { - private @Valid Long id; - private @Valid Long petId; - private @Valid Integer quantity; - private @Valid Date shipDate; + private Long id; + private Long petId; + private Integer quantity; + private Date shipDate; public enum StatusEnum { PLACED(String.valueOf("placed")), APPROVED(String.valueOf("approved")), DELIVERED(String.valueOf("delivered")); @@ -70,8 +70,8 @@ public static StatusEnum fromValue(String value) { } } - private @Valid StatusEnum status; - private @Valid Boolean complete = false; + private StatusEnum status; + private Boolean complete = false; protected Order(OrderBuilder b) { this.id = b.id; @@ -152,7 +152,7 @@ public Order shipDate(Date shipDate) { @ApiModelProperty(value = "") @JsonProperty("shipDate") - public Date getShipDate() { + @Valid public Date getShipDate() { return shipDate; } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/OuterComposite.java index bdd0dbfa566b..f9d54b61b5a0 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/OuterComposite.java @@ -19,9 +19,9 @@ @JsonTypeName("OuterComposite") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class OuterComposite implements Serializable { - private @Valid BigDecimal myNumber; - private @Valid String myString; - private @Valid Boolean myBoolean; + private BigDecimal myNumber; + private String myString; + private Boolean myBoolean; protected OuterComposite(OuterCompositeBuilder b) { this.myNumber = b.myNumber; @@ -42,7 +42,7 @@ public OuterComposite myNumber(BigDecimal myNumber) { @ApiModelProperty(value = "") @JsonProperty("my_number") - public BigDecimal getMyNumber() { + @Valid public BigDecimal getMyNumber() { return myNumber; } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Pet.java index 2fd4a45f6e73..86a9b317a2cc 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Pet.java @@ -26,9 +26,9 @@ @JsonTypeName("Pet") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Pet implements Serializable { - private @Valid Long id; - private @Valid Category category; - private @Valid String name; + private Long id; + private Category category; + private String name; private @Valid Set photoUrls = new LinkedHashSet<>(); private @Valid List<@Valid Tag> tags = new ArrayList<>(); public enum StatusEnum { @@ -78,7 +78,7 @@ public static StatusEnum fromValue(String value) { } } - private @Valid StatusEnum status; + private StatusEnum status; protected Pet(PetBuilder b) { this.id = b.id; @@ -121,7 +121,7 @@ public Pet category(Category category) { @ApiModelProperty(value = "") @JsonProperty("category") - public Category getCategory() { + @Valid public Category getCategory() { return category; } @@ -140,8 +140,7 @@ public Pet name(String name) { @ApiModelProperty(example = "doggie", required = true, value = "") @JsonProperty("name") - @NotNull - public String getName() { + @NotNull public String getName() { return name; } @@ -160,8 +159,7 @@ public Pet photoUrls(Set photoUrls) { @ApiModelProperty(required = true, value = "") @JsonProperty("photoUrls") - @NotNull - public Set getPhotoUrls() { + @NotNull public Set getPhotoUrls() { return photoUrls; } @@ -197,7 +195,7 @@ public Pet tags(List<@Valid Tag> tags) { @ApiModelProperty(value = "") @JsonProperty("tags") - public List getTags() { + @Valid public List<@Valid Tag> getTags() { return tags; } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ReadOnlyFirst.java index a98ae46edae4..121bccfb9ecd 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ReadOnlyFirst.java @@ -18,8 +18,8 @@ @JsonTypeName("ReadOnlyFirst") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class ReadOnlyFirst implements Serializable { - private @Valid String bar; - private @Valid String baz; + private String bar; + private String baz; protected ReadOnlyFirst(ReadOnlyFirstBuilder b) { this.bar = b.bar; diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/SpecialModelName.java index 172f9e4e4d1d..212c82b9d539 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/SpecialModelName.java @@ -19,7 +19,7 @@ @JsonTypeName("$special[model.name]") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class SpecialModelName implements Serializable { - private @Valid Long $specialPropertyName; + private Long $specialPropertyName; protected SpecialModelName(SpecialModelNameBuilder b) { this.$specialPropertyName = b.$specialPropertyName; diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Tag.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Tag.java index 811ed0f12448..4ed87492e2b7 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Tag.java @@ -18,8 +18,8 @@ @JsonTypeName("Tag") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Tag implements Serializable { - private @Valid Long id; - private @Valid String name; + private Long id; + private String name; protected Tag(TagBuilder b) { this.id = b.id; diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/TypeHolderDefault.java index 12e9a434c019..f078fce112ee 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/TypeHolderDefault.java @@ -22,10 +22,10 @@ @JsonTypeName("TypeHolderDefault") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class TypeHolderDefault implements Serializable { - private @Valid String stringItem = "what"; - private @Valid BigDecimal numberItem; - private @Valid Integer integerItem; - private @Valid Boolean boolItem = true; + private String stringItem = "what"; + private BigDecimal numberItem; + private Integer integerItem; + private Boolean boolItem = true; private @Valid List arrayItem = new ArrayList<>(); protected TypeHolderDefault(TypeHolderDefaultBuilder b) { @@ -49,8 +49,7 @@ public TypeHolderDefault stringItem(String stringItem) { @ApiModelProperty(required = true, value = "") @JsonProperty("string_item") - @NotNull - public String getStringItem() { + @NotNull public String getStringItem() { return stringItem; } @@ -69,8 +68,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) { @ApiModelProperty(required = true, value = "") @JsonProperty("number_item") - @NotNull - public BigDecimal getNumberItem() { + @NotNull @Valid public BigDecimal getNumberItem() { return numberItem; } @@ -89,8 +87,7 @@ public TypeHolderDefault integerItem(Integer integerItem) { @ApiModelProperty(required = true, value = "") @JsonProperty("integer_item") - @NotNull - public Integer getIntegerItem() { + @NotNull public Integer getIntegerItem() { return integerItem; } @@ -109,8 +106,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) { @ApiModelProperty(required = true, value = "") @JsonProperty("bool_item") - @NotNull - public Boolean getBoolItem() { + @NotNull public Boolean getBoolItem() { return boolItem; } @@ -129,8 +125,7 @@ public TypeHolderDefault arrayItem(List arrayItem) { @ApiModelProperty(required = true, value = "") @JsonProperty("array_item") - @NotNull - public List getArrayItem() { + @NotNull public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/TypeHolderExample.java index 0f03eecac745..38032ad247e0 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/TypeHolderExample.java @@ -22,11 +22,11 @@ @JsonTypeName("TypeHolderExample") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class TypeHolderExample implements Serializable { - private @Valid String stringItem; - private @Valid BigDecimal numberItem; - private @Valid Float floatItem; - private @Valid Integer integerItem; - private @Valid Boolean boolItem; + private String stringItem; + private BigDecimal numberItem; + private Float floatItem; + private Integer integerItem; + private Boolean boolItem; private @Valid List arrayItem = new ArrayList<>(); protected TypeHolderExample(TypeHolderExampleBuilder b) { @@ -51,8 +51,7 @@ public TypeHolderExample stringItem(String stringItem) { @ApiModelProperty(example = "what", required = true, value = "") @JsonProperty("string_item") - @NotNull - public String getStringItem() { + @NotNull public String getStringItem() { return stringItem; } @@ -71,8 +70,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { @ApiModelProperty(example = "1.234", required = true, value = "") @JsonProperty("number_item") - @NotNull - public BigDecimal getNumberItem() { + @NotNull @Valid public BigDecimal getNumberItem() { return numberItem; } @@ -91,8 +89,7 @@ public TypeHolderExample floatItem(Float floatItem) { @ApiModelProperty(example = "1.234", required = true, value = "") @JsonProperty("float_item") - @NotNull - public Float getFloatItem() { + @NotNull public Float getFloatItem() { return floatItem; } @@ -111,8 +108,7 @@ public TypeHolderExample integerItem(Integer integerItem) { @ApiModelProperty(example = "-2", required = true, value = "") @JsonProperty("integer_item") - @NotNull - public Integer getIntegerItem() { + @NotNull public Integer getIntegerItem() { return integerItem; } @@ -131,8 +127,7 @@ public TypeHolderExample boolItem(Boolean boolItem) { @ApiModelProperty(example = "true", required = true, value = "") @JsonProperty("bool_item") - @NotNull - public Boolean getBoolItem() { + @NotNull public Boolean getBoolItem() { return boolItem; } @@ -151,8 +146,7 @@ public TypeHolderExample arrayItem(List arrayItem) { @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "") @JsonProperty("array_item") - @NotNull - public List getArrayItem() { + @NotNull public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/User.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/User.java index 65533b3bda37..f63010612d1d 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/User.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/User.java @@ -18,14 +18,14 @@ @JsonTypeName("User") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class User implements Serializable { - private @Valid Long id; - private @Valid String username; - private @Valid String firstName; - private @Valid String lastName; - private @Valid String email; - private @Valid String password; - private @Valid String phone; - private @Valid Integer userStatus; + private Long id; + private String username; + private String firstName; + private String lastName; + private String email; + private String password; + private String phone; + private Integer userStatus; protected User(UserBuilder b) { this.id = b.id; diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/XmlItem.java index 0558488f93b5..a057c3ebdb9d 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/XmlItem.java @@ -22,33 +22,33 @@ @JsonTypeName("XmlItem") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class XmlItem implements Serializable { - private @Valid String attributeString; - private @Valid BigDecimal attributeNumber; - private @Valid Integer attributeInteger; - private @Valid Boolean attributeBoolean; + private String attributeString; + private BigDecimal attributeNumber; + private Integer attributeInteger; + private Boolean attributeBoolean; private @Valid List wrappedArray = new ArrayList<>(); - private @Valid String nameString; - private @Valid BigDecimal nameNumber; - private @Valid Integer nameInteger; - private @Valid Boolean nameBoolean; + private String nameString; + private BigDecimal nameNumber; + private Integer nameInteger; + private Boolean nameBoolean; private @Valid List nameArray = new ArrayList<>(); private @Valid List nameWrappedArray = new ArrayList<>(); - private @Valid String prefixString; - private @Valid BigDecimal prefixNumber; - private @Valid Integer prefixInteger; - private @Valid Boolean prefixBoolean; + private String prefixString; + private BigDecimal prefixNumber; + private Integer prefixInteger; + private Boolean prefixBoolean; private @Valid List prefixArray = new ArrayList<>(); private @Valid List prefixWrappedArray = new ArrayList<>(); - private @Valid String namespaceString; - private @Valid BigDecimal namespaceNumber; - private @Valid Integer namespaceInteger; - private @Valid Boolean namespaceBoolean; + private String namespaceString; + private BigDecimal namespaceNumber; + private Integer namespaceInteger; + private Boolean namespaceBoolean; private @Valid List namespaceArray = new ArrayList<>(); private @Valid List namespaceWrappedArray = new ArrayList<>(); - private @Valid String prefixNsString; - private @Valid BigDecimal prefixNsNumber; - private @Valid Integer prefixNsInteger; - private @Valid Boolean prefixNsBoolean; + private String prefixNsString; + private BigDecimal prefixNsNumber; + private Integer prefixNsInteger; + private Boolean prefixNsBoolean; private @Valid List prefixNsArray = new ArrayList<>(); private @Valid List prefixNsWrappedArray = new ArrayList<>(); @@ -116,7 +116,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) { @ApiModelProperty(example = "1.234", value = "") @JsonProperty("attribute_number") - public BigDecimal getAttributeNumber() { + @Valid public BigDecimal getAttributeNumber() { return attributeNumber; } @@ -227,7 +227,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) { @ApiModelProperty(example = "1.234", value = "") @JsonProperty("name_number") - public BigDecimal getNameNumber() { + @Valid public BigDecimal getNameNumber() { return nameNumber; } @@ -373,7 +373,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) { @ApiModelProperty(example = "1.234", value = "") @JsonProperty("prefix_number") - public BigDecimal getPrefixNumber() { + @Valid public BigDecimal getPrefixNumber() { return prefixNumber; } @@ -519,7 +519,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) { @ApiModelProperty(example = "1.234", value = "") @JsonProperty("namespace_number") - public BigDecimal getNamespaceNumber() { + @Valid public BigDecimal getNamespaceNumber() { return namespaceNumber; } @@ -665,7 +665,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) { @ApiModelProperty(example = "1.234", value = "") @JsonProperty("prefix_ns_number") - public BigDecimal getPrefixNsNumber() { + @Valid public BigDecimal getPrefixNsNumber() { return prefixNsNumber; }