From 0a5804aabe18298f19a7c0ba50c3f90192426542 Mon Sep 17 00:00:00 2001 From: Anatolii Balakiriev <balakiriev@swissquant.com> Date: Wed, 11 Jan 2023 21:58:07 +0100 Subject: [PATCH 1/2] 14432: Do not add @Valid to Java types in "jaxrs-spec" generator `@Valid` annotation is only needed for objects, where the cascading validation is required. For standard Java types and enums it is useless. Moreover, when those annotations are there for those types - Hibernate Validator's performance degrades significantly (see: https://hibernate.atlassian.net/browse/HV-1928 and https://hibernate.atlassian.net/browse/HV-1933). I've checked other available generators, and it looks like `spring` generates those annotations properly. So I took the content of the modified files from that generator and placed to the `jaxrs-spec` one. --- .../main/resources/JavaJaxRS/spec/beanValidation.mustache | 5 +---- .../src/main/resources/JavaJaxRS/spec/pojo.mustache | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) 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 c8c6946fef6..e427a43a0ac 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/beanValidation.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/beanValidation.mustache @@ -1,4 +1 @@ -{{#required}} - @NotNull -{{/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 071a73e0c0f..37298ccae41 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pojo.mustache @@ -35,7 +35,7 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#vendorExtens private {{#useBeanValidation}}@Valid {{/useBeanValidation}}{{{datatypeWithEnum}}} {{name}}{{#required}}{{^isNullable}}{{#defaultValue}} = {{{.}}}{{/defaultValue}}{{/isNullable}}{{#isNullable}} = null{{/isNullable}}{{/required}}{{^required}} = null{{/required}}; {{/isContainer}} {{^isContainer}} - private {{#useBeanValidation}}@Valid {{/useBeanValidation}}{{{datatypeWithEnum}}} {{name}}{{#defaultValue}} = {{{.}}}{{/defaultValue}}; + private {{{datatypeWithEnum}}} {{name}}{{#defaultValue}} = {{{.}}}{{/defaultValue}}; {{/isContainer}} {{/vars}} {{#generateBuilders}} -- GitLab From e28c3afb3167713b970f0d336236e7ffbdfb8020 Mon Sep 17 00:00:00 2001 From: Anatolii Balakiriev <balakiriev@swissquant.com> Date: Wed, 11 Jan 2023 22:52:59 +0100 Subject: [PATCH 2/2] 14432: Update samples for "jaxrs-spec" (remove excessive @Valid) Updated samples, removing the excessive @Valid annotation. It is now not added to the standard Java types and enums. The implementation is identical to the `spring` generator. --- .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 16 +++--- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../java/org/openapitools/model/Animal.java | 7 ++- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 4 +- .../java/org/openapitools/model/BigCat.java | 2 +- .../org/openapitools/model/BigCatAllOf.java | 2 +- .../openapitools/model/Capitalization.java | 12 ++--- .../gen/java/org/openapitools/model/Cat.java | 2 +- .../java/org/openapitools/model/CatAllOf.java | 2 +- .../java/org/openapitools/model/Category.java | 7 ++- .../org/openapitools/model/ClassModel.java | 2 +- .../java/org/openapitools/model/Client.java | 2 +- .../gen/java/org/openapitools/model/Dog.java | 2 +- .../java/org/openapitools/model/DogAllOf.java | 2 +- .../org/openapitools/model/EnumArrays.java | 2 +- .../java/org/openapitools/model/EnumTest.java | 15 +++--- .../model/FileSchemaTestClass.java | 6 +-- .../org/openapitools/model/FormatTest.java | 48 ++++++++---------- .../openapitools/model/HasOnlyReadOnly.java | 4 +- .../java/org/openapitools/model/MapTest.java | 2 +- ...ropertiesAndAdditionalPropertiesClass.java | 10 ++-- .../openapitools/model/Model200Response.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +-- .../org/openapitools/model/ModelFile.java | 2 +- .../org/openapitools/model/ModelList.java | 2 +- .../org/openapitools/model/ModelReturn.java | 2 +- .../gen/java/org/openapitools/model/Name.java | 11 ++-- .../org/openapitools/model/NumberOnly.java | 4 +- .../java/org/openapitools/model/Order.java | 14 +++--- .../openapitools/model/OuterComposite.java | 8 +-- .../gen/java/org/openapitools/model/Pet.java | 18 +++---- .../org/openapitools/model/ReadOnlyFirst.java | 4 +- .../openapitools/model/SpecialModelName.java | 2 +- .../gen/java/org/openapitools/model/Tag.java | 4 +- .../openapitools/model/TypeHolderDefault.java | 23 ++++----- .../openapitools/model/TypeHolderExample.java | 28 ++++------- .../gen/java/org/openapitools/model/User.java | 16 +++--- .../java/org/openapitools/model/XmlItem.java | 50 +++++++++---------- .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 16 +++--- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../java/org/openapitools/model/Animal.java | 7 ++- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 4 +- .../java/org/openapitools/model/BigCat.java | 2 +- .../org/openapitools/model/BigCatAllOf.java | 2 +- .../openapitools/model/Capitalization.java | 12 ++--- .../gen/java/org/openapitools/model/Cat.java | 2 +- .../java/org/openapitools/model/CatAllOf.java | 2 +- .../java/org/openapitools/model/Category.java | 7 ++- .../org/openapitools/model/ClassModel.java | 2 +- .../java/org/openapitools/model/Client.java | 2 +- .../gen/java/org/openapitools/model/Dog.java | 2 +- .../java/org/openapitools/model/DogAllOf.java | 2 +- .../org/openapitools/model/EnumArrays.java | 2 +- .../java/org/openapitools/model/EnumTest.java | 15 +++--- .../model/FileSchemaTestClass.java | 6 +-- .../org/openapitools/model/FormatTest.java | 48 ++++++++---------- .../openapitools/model/HasOnlyReadOnly.java | 4 +- .../java/org/openapitools/model/MapTest.java | 2 +- ...ropertiesAndAdditionalPropertiesClass.java | 10 ++-- .../openapitools/model/Model200Response.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +-- .../org/openapitools/model/ModelFile.java | 2 +- .../org/openapitools/model/ModelList.java | 2 +- .../org/openapitools/model/ModelReturn.java | 2 +- .../gen/java/org/openapitools/model/Name.java | 11 ++-- .../org/openapitools/model/NumberOnly.java | 4 +- .../java/org/openapitools/model/Order.java | 14 +++--- .../openapitools/model/OuterComposite.java | 8 +-- .../gen/java/org/openapitools/model/Pet.java | 18 +++---- .../org/openapitools/model/ReadOnlyFirst.java | 4 +- .../openapitools/model/SpecialModelName.java | 2 +- .../gen/java/org/openapitools/model/Tag.java | 4 +- .../openapitools/model/TypeHolderDefault.java | 23 ++++----- .../openapitools/model/TypeHolderExample.java | 28 ++++------- .../gen/java/org/openapitools/model/User.java | 16 +++--- .../java/org/openapitools/model/XmlItem.java | 50 +++++++++---------- 92 files changed, 344 insertions(+), 386 deletions(-) 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 749ca0e02cc..11eaac42e57 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 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("AdditionalPropertiesAnyType") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") public class AdditionalPropertiesAnyType extends HashMap<String, Object> 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 3563c9cdc65..7557fcb86a2 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 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("AdditionalPropertiesArray") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") public class AdditionalPropertiesArray extends HashMap<String, List> 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 0afb07939f5..6a8dfa6fe86 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 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("AdditionalPropertiesBoolean") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> 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 31b4b91dfb2..99758756fc5 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<String, List<Object>> mapArrayAnytype = null; private @Valid Map<String, Map<String, String>> mapMapString = null; private @Valid Map<String, Map<String, Object>> mapMapAnytype = null; - 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 class AdditionalPropertiesClass implements Serializable { @ApiModelProperty(value = "") @JsonProperty("map_number") - public Map<String, BigDecimal> getMapNumber() { +@Valid public Map<String, BigDecimal> getMapNumber() { return mapNumber; } @@ -184,7 +184,7 @@ public class AdditionalPropertiesClass implements Serializable { @ApiModelProperty(value = "") @JsonProperty("map_array_integer") - public Map<String, List<Integer>> getMapArrayInteger() { +@Valid public Map<String, List<Integer>> getMapArrayInteger() { return mapArrayInteger; } @@ -219,7 +219,7 @@ public class AdditionalPropertiesClass implements Serializable { @ApiModelProperty(value = "") @JsonProperty("map_array_anytype") - public Map<String, List<Object>> getMapArrayAnytype() { +@Valid public Map<String, List<Object>> getMapArrayAnytype() { return mapArrayAnytype; } @@ -254,7 +254,7 @@ public class AdditionalPropertiesClass implements Serializable { @ApiModelProperty(value = "") @JsonProperty("map_map_string") - public Map<String, Map<String, String>> getMapMapString() { +@Valid public Map<String, Map<String, String>> getMapMapString() { return mapMapString; } @@ -289,7 +289,7 @@ public class AdditionalPropertiesClass implements Serializable { @ApiModelProperty(value = "") @JsonProperty("map_map_anytype") - public Map<String, Map<String, Object>> getMapMapAnytype() { +@Valid public Map<String, Map<String, Object>> 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 376aa5a7c61..64e55681b1e 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 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("AdditionalPropertiesInteger") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") public class AdditionalPropertiesInteger extends HashMap<String, Integer> 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 03cf9a126d2..1f83ce76fa7 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 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("AdditionalPropertiesNumber") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> 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 b9fae3edf82..59e8a7a17b6 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 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("AdditionalPropertiesObject") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") public class AdditionalPropertiesObject extends HashMap<String, Map> 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 9790203702e..6085f6cf87d 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 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("AdditionalPropertiesString") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") public class AdditionalPropertiesString extends HashMap<String, String> 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 3548453f127..83aaed11186 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 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("Animal") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") 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 class Animal implements Serializable { @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 0385c5e8290..e61e6d5a15f 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 @@ -33,7 +33,7 @@ public class ArrayOfArrayOfNumberOnly implements Serializable { @ApiModelProperty(value = "") @JsonProperty("ArrayArrayNumber") - public List<List<BigDecimal>> 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 cbfdb520031..a63fd7f808e 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 @@ -33,7 +33,7 @@ public class ArrayOfNumberOnly implements Serializable { @ApiModelProperty(value = "") @JsonProperty("ArrayNumber") - public List<BigDecimal> 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 b2043ee09c7..ce2e91b22d4 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 @@ -70,7 +70,7 @@ public class ArrayTest implements Serializable { @ApiModelProperty(value = "") @JsonProperty("array_array_of_integer") - public List<List<Long>> getArrayArrayOfInteger() { +@Valid public List<List<Long>> getArrayArrayOfInteger() { return arrayArrayOfInteger; } @@ -105,7 +105,7 @@ public class ArrayTest implements Serializable { @ApiModelProperty(value = "") @JsonProperty("array_array_of_model") - public List<List<ReadOnlyFirst>> 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 fb8229016dd..fe86e19996d 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 class BigCat extends Cat implements Serializable { } } - private @Valid KindEnum kind; + private KindEnum kind; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/BigCatAllOf.java index 21427933a94..0d73177999b 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/BigCatAllOf.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/BigCatAllOf.java @@ -66,7 +66,7 @@ public class BigCatAllOf implements Serializable { } } - 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 862e34ac293..e8072d6baa8 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 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("Capitalization") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") 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 7fa39e3522d..ae6f69e858d 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 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("Cat") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") 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/CatAllOf.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/CatAllOf.java index 491b09cbbaf..abcb2353c24 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/CatAllOf.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/CatAllOf.java @@ -19,7 +19,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("Cat_allOf") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") public class CatAllOf 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 3ae4d3b4b42..b7ca290ad7b 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 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("Category") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") 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 class Category implements Serializable { @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 ee9e240aac6..67b40cc967d 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 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("ClassModel") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") 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 c3efb2cbd66..92b33849e10 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 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("Client") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") 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 2e8e10e6413..a7b6d39a330 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 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("Dog") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") 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/DogAllOf.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/DogAllOf.java index a2e595a8a1a..7950e56c1ed 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/DogAllOf.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/DogAllOf.java @@ -19,7 +19,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("Dog_allOf") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") public class DogAllOf 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 4b2ef0c1c60..77a4ee2b4f0 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 @@ -67,7 +67,7 @@ public class EnumArrays implements Serializable { } } - 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 b4692c31c46..34c5c5a503c 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 class EnumTest implements Serializable { } } - 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 class EnumTest implements Serializable { } } - 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 class EnumTest implements Serializable { } } - 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 class EnumTest implements Serializable { } } - private @Valid EnumNumberEnum enumNumber; - private @Valid OuterEnum outerEnum; + private EnumNumberEnum enumNumber; + private OuterEnum outerEnum; /** **/ @@ -243,8 +243,7 @@ public class EnumTest implements Serializable { @ApiModelProperty(required = true, value = "") @JsonProperty("enum_string_required") - @NotNull - public EnumStringRequiredEnum getEnumStringRequired() { +@NotNull public EnumStringRequiredEnum getEnumStringRequired() { return enumStringRequired; } @@ -301,7 +300,7 @@ public class EnumTest implements Serializable { @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 8297178d42f..02b429689bf 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 @@ -21,7 +21,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("FileSchemaTestClass") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") public class FileSchemaTestClass implements Serializable { - private @Valid ModelFile _file; + private ModelFile _file; private @Valid List<ModelFile> files = null; /** @@ -34,7 +34,7 @@ public class FileSchemaTestClass implements Serializable { @ApiModelProperty(value = "") @JsonProperty("file") - public ModelFile getFile() { +@Valid public ModelFile getFile() { return _file; } @@ -53,7 +53,7 @@ public class FileSchemaTestClass implements Serializable { @ApiModelProperty(value = "") @JsonProperty("files") - public List<ModelFile> 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 8d71c957011..02873ba321b 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 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("format_test") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") 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 @@ -113,8 +113,7 @@ public class FormatTest implements Serializable { @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; } @@ -194,8 +193,7 @@ public class FormatTest implements Serializable { @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 class FormatTest implements Serializable { @ApiModelProperty(value = "") @JsonProperty("binary") - public File getBinary() { +@Valid public File getBinary() { return binary; } @@ -233,8 +231,7 @@ public class FormatTest implements Serializable { @ApiModelProperty(required = true, value = "") @JsonProperty("date") - @NotNull - public LocalDate getDate() { +@NotNull @Valid public LocalDate getDate() { return date; } @@ -253,7 +250,7 @@ public class FormatTest implements Serializable { @ApiModelProperty(value = "") @JsonProperty("dateTime") - public Date getDateTime() { +@Valid public Date getDateTime() { return dateTime; } @@ -272,7 +269,7 @@ public class FormatTest implements Serializable { @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") @JsonProperty("uuid") - public UUID getUuid() { +@Valid public UUID getUuid() { return uuid; } @@ -291,8 +288,7 @@ public class FormatTest implements Serializable { @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 class FormatTest implements Serializable { @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 a3ff9057c6f..3a23d3cdf43 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 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("hasOnlyReadOnly") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") 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 c45ee600ca2..0382f403e93 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 class MapTest implements Serializable { @ApiModelProperty(value = "") @JsonProperty("map_map_of_string") - public Map<String, Map<String, String>> getMapMapOfString() { +@Valid public Map<String, Map<String, String>> 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 c5e37deb239..a63a8f176b1 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 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("MixedPropertiesAndAdditionalPropertiesClass") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") public class MixedPropertiesAndAdditionalPropertiesClass implements Serializable { - private @Valid UUID uuid; - private @Valid Date dateTime; + private UUID uuid; + private Date dateTime; private @Valid Map<String, Animal> map = null; /** @@ -37,7 +37,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass implements Serializabl @ApiModelProperty(value = "") @JsonProperty("uuid") - public UUID getUuid() { +@Valid public UUID getUuid() { return uuid; } @@ -56,7 +56,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass implements Serializabl @ApiModelProperty(value = "") @JsonProperty("dateTime") - public Date getDateTime() { +@Valid public Date getDateTime() { return dateTime; } @@ -75,7 +75,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass implements Serializabl @ApiModelProperty(value = "") @JsonProperty("map") - public Map<String, Animal> getMap() { +@Valid public Map<String, Animal> 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 9023f1b3641..936a37498a8 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 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("200_response") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") 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 58d4e3da8fe..0faa3d3b54e 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 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("ApiResponse") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") 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 b68b1102096..e16d5d36ab6 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 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("File") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") 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 5f5c9d766d5..75cd86f9155 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 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("List") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") 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 3af7ec36256..f45525ace7a 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 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("Return") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") 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 09f3be2cf44..a887aa47216 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 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("Name") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") 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 class Name implements Serializable { @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 d8bba4783ff..b506b4fef90 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 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("NumberOnly") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") public class NumberOnly implements Serializable { - private @Valid BigDecimal justNumber; + private BigDecimal justNumber; /** **/ @@ -31,7 +31,7 @@ public class NumberOnly implements Serializable { @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 5a6d37a5d79..998236d4ff0 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 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("Order") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") 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 class Order implements Serializable { } } - private @Valid StatusEnum status; - private @Valid Boolean complete = false; + private StatusEnum status; + private Boolean complete = false; /** **/ @@ -140,7 +140,7 @@ public class Order implements Serializable { @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 b369e965b69..b19974a7217 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 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("OuterComposite") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") 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 class OuterComposite implements Serializable { @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 509dc7f912f..797e01781eb 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 @@ -25,9 +25,9 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("Pet") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") 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<String> photoUrls = new LinkedHashSet<>(); private @Valid List<Tag> tags = null; public enum StatusEnum { @@ -77,7 +77,7 @@ public class Pet implements Serializable { } } - private @Valid StatusEnum status; + private StatusEnum status; /** **/ @@ -108,7 +108,7 @@ public class Pet implements Serializable { @ApiModelProperty(value = "") @JsonProperty("category") - public Category getCategory() { +@Valid public Category getCategory() { return category; } @@ -127,8 +127,7 @@ public class Pet implements Serializable { @ApiModelProperty(example = "doggie", required = true, value = "") @JsonProperty("name") - @NotNull - public String getName() { +@NotNull public String getName() { return name; } @@ -147,8 +146,7 @@ public class Pet implements Serializable { @ApiModelProperty(required = true, value = "") @JsonProperty("photoUrls") - @NotNull - public Set<String> getPhotoUrls() { +@NotNull public Set<String> getPhotoUrls() { return photoUrls; } @@ -184,7 +182,7 @@ public class Pet implements Serializable { @ApiModelProperty(value = "") @JsonProperty("tags") - public List<Tag> 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 164caf2e407..3904ef0f2f8 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 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("ReadOnlyFirst") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") 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 03dbaba2b8f..c01bef7c23f 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 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("$special[model.name]") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") 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 56dde364824..bc7272ea4fb 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 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("Tag") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") 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 5a58d2e4a49..c64f3912633 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 @@ -21,10 +21,10 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("TypeHolderDefault") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") 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<Integer> arrayItem = new ArrayList<>(); /** @@ -37,8 +37,7 @@ public class TypeHolderDefault implements Serializable { @ApiModelProperty(required = true, value = "") @JsonProperty("string_item") - @NotNull - public String getStringItem() { +@NotNull public String getStringItem() { return stringItem; } @@ -57,8 +56,7 @@ public class TypeHolderDefault implements Serializable { @ApiModelProperty(required = true, value = "") @JsonProperty("number_item") - @NotNull - public BigDecimal getNumberItem() { +@NotNull @Valid public BigDecimal getNumberItem() { return numberItem; } @@ -77,8 +75,7 @@ public class TypeHolderDefault implements Serializable { @ApiModelProperty(required = true, value = "") @JsonProperty("integer_item") - @NotNull - public Integer getIntegerItem() { +@NotNull public Integer getIntegerItem() { return integerItem; } @@ -97,8 +94,7 @@ public class TypeHolderDefault implements Serializable { @ApiModelProperty(required = true, value = "") @JsonProperty("bool_item") - @NotNull - public Boolean getBoolItem() { +@NotNull public Boolean getBoolItem() { return boolItem; } @@ -117,8 +113,7 @@ public class TypeHolderDefault implements Serializable { @ApiModelProperty(required = true, value = "") @JsonProperty("array_item") - @NotNull - public List<Integer> getArrayItem() { +@NotNull public List<Integer> 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 1c24650e192..5aebf60c120 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 @@ -21,11 +21,11 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("TypeHolderExample") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") 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<Integer> arrayItem = new ArrayList<>(); /** @@ -38,8 +38,7 @@ public class TypeHolderExample implements Serializable { @ApiModelProperty(example = "what", required = true, value = "") @JsonProperty("string_item") - @NotNull - public String getStringItem() { +@NotNull public String getStringItem() { return stringItem; } @@ -58,8 +57,7 @@ public class TypeHolderExample implements Serializable { @ApiModelProperty(example = "1.234", required = true, value = "") @JsonProperty("number_item") - @NotNull - public BigDecimal getNumberItem() { +@NotNull @Valid public BigDecimal getNumberItem() { return numberItem; } @@ -78,8 +76,7 @@ public class TypeHolderExample implements Serializable { @ApiModelProperty(example = "1.234", required = true, value = "") @JsonProperty("float_item") - @NotNull - public Float getFloatItem() { +@NotNull public Float getFloatItem() { return floatItem; } @@ -98,8 +95,7 @@ public class TypeHolderExample implements Serializable { @ApiModelProperty(example = "-2", required = true, value = "") @JsonProperty("integer_item") - @NotNull - public Integer getIntegerItem() { +@NotNull public Integer getIntegerItem() { return integerItem; } @@ -118,8 +114,7 @@ public class TypeHolderExample implements Serializable { @ApiModelProperty(example = "true", required = true, value = "") @JsonProperty("bool_item") - @NotNull - public Boolean getBoolItem() { +@NotNull public Boolean getBoolItem() { return boolItem; } @@ -138,8 +133,7 @@ public class TypeHolderExample implements Serializable { @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "") @JsonProperty("array_item") - @NotNull - public List<Integer> getArrayItem() { +@NotNull public List<Integer> 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 6b0eef1b19e..b5fb35eb064 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 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("User") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") 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 eff4ff035ff..90719fd8510 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 @@ -21,33 +21,33 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("XmlItem") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") 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<Integer> wrappedArray = null; - 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<Integer> nameArray = null; private @Valid List<Integer> nameWrappedArray = null; - 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<Integer> prefixArray = null; private @Valid List<Integer> prefixWrappedArray = null; - 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<Integer> namespaceArray = null; private @Valid List<Integer> namespaceWrappedArray = null; - 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<Integer> prefixNsArray = null; private @Valid List<Integer> prefixNsWrappedArray = null; @@ -80,7 +80,7 @@ public class XmlItem implements Serializable { @ApiModelProperty(example = "1.234", value = "") @JsonProperty("attribute_number") - public BigDecimal getAttributeNumber() { +@Valid public BigDecimal getAttributeNumber() { return attributeNumber; } @@ -191,7 +191,7 @@ public class XmlItem implements Serializable { @ApiModelProperty(example = "1.234", value = "") @JsonProperty("name_number") - public BigDecimal getNameNumber() { +@Valid public BigDecimal getNameNumber() { return nameNumber; } @@ -337,7 +337,7 @@ public class XmlItem implements Serializable { @ApiModelProperty(example = "1.234", value = "") @JsonProperty("prefix_number") - public BigDecimal getPrefixNumber() { +@Valid public BigDecimal getPrefixNumber() { return prefixNumber; } @@ -483,7 +483,7 @@ public class XmlItem implements Serializable { @ApiModelProperty(example = "1.234", value = "") @JsonProperty("namespace_number") - public BigDecimal getNamespaceNumber() { +@Valid public BigDecimal getNamespaceNumber() { return namespaceNumber; } @@ -629,7 +629,7 @@ public class XmlItem implements Serializable { @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/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 749ca0e02cc..11eaac42e57 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 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("AdditionalPropertiesAnyType") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") public class AdditionalPropertiesAnyType extends HashMap<String, Object> 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 3563c9cdc65..7557fcb86a2 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 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("AdditionalPropertiesArray") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") public class AdditionalPropertiesArray extends HashMap<String, List> 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 0afb07939f5..6a8dfa6fe86 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 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("AdditionalPropertiesBoolean") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> 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 753265e81ee..09ea213682a 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<String, List<Object>> mapArrayAnytype = null; private @Valid Map<String, Map<String, String>> mapMapString = null; private @Valid Map<String, Map<String, Object>> mapMapAnytype = null; - 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 class AdditionalPropertiesClass implements Serializable { @ApiModelProperty(value = "") @JsonProperty("map_number") - public Map<String, BigDecimal> getMapNumber() { +@Valid public Map<String, BigDecimal> getMapNumber() { return mapNumber; } @@ -201,7 +201,7 @@ public class AdditionalPropertiesClass implements Serializable { @ApiModelProperty(value = "") @JsonProperty("map_array_integer") - public Map<String, List<Integer>> getMapArrayInteger() { +@Valid public Map<String, List<Integer>> getMapArrayInteger() { return mapArrayInteger; } @@ -236,7 +236,7 @@ public class AdditionalPropertiesClass implements Serializable { @ApiModelProperty(value = "") @JsonProperty("map_array_anytype") - public Map<String, List<Object>> getMapArrayAnytype() { +@Valid public Map<String, List<Object>> getMapArrayAnytype() { return mapArrayAnytype; } @@ -271,7 +271,7 @@ public class AdditionalPropertiesClass implements Serializable { @ApiModelProperty(value = "") @JsonProperty("map_map_string") - public Map<String, Map<String, String>> getMapMapString() { +@Valid public Map<String, Map<String, String>> getMapMapString() { return mapMapString; } @@ -306,7 +306,7 @@ public class AdditionalPropertiesClass implements Serializable { @ApiModelProperty(value = "") @JsonProperty("map_map_anytype") - public Map<String, Map<String, Object>> getMapMapAnytype() { +@Valid public Map<String, Map<String, Object>> 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 376aa5a7c61..64e55681b1e 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 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("AdditionalPropertiesInteger") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") public class AdditionalPropertiesInteger extends HashMap<String, Integer> 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 03cf9a126d2..1f83ce76fa7 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 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("AdditionalPropertiesNumber") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> 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 b9fae3edf82..59e8a7a17b6 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 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("AdditionalPropertiesObject") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") public class AdditionalPropertiesObject extends HashMap<String, Map> 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 9790203702e..6085f6cf87d 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 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("AdditionalPropertiesString") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") public class AdditionalPropertiesString extends HashMap<String, String> 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 e046b586acd..2928198242a 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 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("Animal") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") 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 class Animal implements Serializable { @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 1f47464d3c5..ccb4ebe0da0 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 @@ -40,7 +40,7 @@ public class ArrayOfArrayOfNumberOnly implements Serializable { @ApiModelProperty(value = "") @JsonProperty("ArrayArrayNumber") - public List<List<BigDecimal>> 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 bab3b727057..0f198aa3b9a 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 @@ -40,7 +40,7 @@ public class ArrayOfNumberOnly implements Serializable { @ApiModelProperty(value = "") @JsonProperty("ArrayNumber") - public List<BigDecimal> 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 6ff8393ed09..82c4026ab9c 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 @@ -79,7 +79,7 @@ public class ArrayTest implements Serializable { @ApiModelProperty(value = "") @JsonProperty("array_array_of_integer") - public List<List<Long>> getArrayArrayOfInteger() { +@Valid public List<List<Long>> getArrayArrayOfInteger() { return arrayArrayOfInteger; } @@ -114,7 +114,7 @@ public class ArrayTest implements Serializable { @ApiModelProperty(value = "") @JsonProperty("array_array_of_model") - public List<List<ReadOnlyFirst>> 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 48dcefd8bde..d63ba5f717f 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 class BigCat extends Cat implements Serializable { } } - 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/BigCatAllOf.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/BigCatAllOf.java index 0ba47d26cf9..5a139bf2e48 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/BigCatAllOf.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/BigCatAllOf.java @@ -66,7 +66,7 @@ public class BigCatAllOf implements Serializable { } } - private @Valid KindEnum kind; + private KindEnum kind; protected BigCatAllOf(BigCatAllOfBuilder<?, ?> b) { this.kind = b.kind; 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 3ce8aed5854..a9316b48fac 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 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("Capitalization") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") 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 58cad6cc809..a150d9477eb 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 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("Cat") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") 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/CatAllOf.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/CatAllOf.java index 43aa9b39cdf..6b564aa6064 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/CatAllOf.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/CatAllOf.java @@ -19,7 +19,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("Cat_allOf") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") public class CatAllOf implements Serializable { - private @Valid Boolean declawed; + private Boolean declawed; protected CatAllOf(CatAllOfBuilder<?, ?> b) { this.declawed = b.declawed; 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 24d73db153b..6011c9ec2c7 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 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("Category") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") 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 class Category implements Serializable { @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 d5d92b4dbc8..93a6865e964 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 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("ClassModel") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") 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 899b6339229..f3403ff8d80 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 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("Client") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") 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 cad870c8e46..cbd8ce1741f 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 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("Dog") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") 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/DogAllOf.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/DogAllOf.java index 1034af7eb26..adc4680b714 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/DogAllOf.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/DogAllOf.java @@ -19,7 +19,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("Dog_allOf") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") public class DogAllOf implements Serializable { - private @Valid String breed; + private String breed; protected DogAllOf(DogAllOfBuilder<?, ?> b) { this.breed = b.breed; 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 73891aaba0c..9be82b9cfbb 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 @@ -67,7 +67,7 @@ public class EnumArrays implements Serializable { } } - 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 a5a94a0d35f..d232922e41c 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 class EnumTest implements Serializable { } } - 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 class EnumTest implements Serializable { } } - 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 class EnumTest implements Serializable { } } - 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 class EnumTest implements Serializable { } } - 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 class EnumTest implements Serializable { @ApiModelProperty(required = true, value = "") @JsonProperty("enum_string_required") - @NotNull - public EnumStringRequiredEnum getEnumStringRequired() { +@NotNull public EnumStringRequiredEnum getEnumStringRequired() { return enumStringRequired; } @@ -312,7 +311,7 @@ public class EnumTest implements Serializable { @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 0a79adf7844..f41368cd1e3 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 @@ -21,7 +21,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("FileSchemaTestClass") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") public class FileSchemaTestClass implements Serializable { - private @Valid ModelFile _file; + private ModelFile _file; private @Valid List<ModelFile> files = null; protected FileSchemaTestClass(FileSchemaTestClassBuilder<?, ?> b) { @@ -42,7 +42,7 @@ public class FileSchemaTestClass implements Serializable { @ApiModelProperty(value = "") @JsonProperty("file") - public ModelFile getFile() { +@Valid public ModelFile getFile() { return _file; } @@ -61,7 +61,7 @@ public class FileSchemaTestClass implements Serializable { @ApiModelProperty(value = "") @JsonProperty("files") - public List<ModelFile> 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 f64ed7b22ce..0876e9d52a6 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 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("format_test") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") 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; @@ -133,8 +133,7 @@ public class FormatTest implements Serializable { @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; } @@ -214,8 +213,7 @@ public class FormatTest implements Serializable { @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 class FormatTest implements Serializable { @ApiModelProperty(value = "") @JsonProperty("binary") - public File getBinary() { +@Valid public File getBinary() { return binary; } @@ -253,8 +251,7 @@ public class FormatTest implements Serializable { @ApiModelProperty(required = true, value = "") @JsonProperty("date") - @NotNull - public LocalDate getDate() { +@NotNull @Valid public LocalDate getDate() { return date; } @@ -273,7 +270,7 @@ public class FormatTest implements Serializable { @ApiModelProperty(value = "") @JsonProperty("dateTime") - public Date getDateTime() { +@Valid public Date getDateTime() { return dateTime; } @@ -292,7 +289,7 @@ public class FormatTest implements Serializable { @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") @JsonProperty("uuid") - public UUID getUuid() { +@Valid public UUID getUuid() { return uuid; } @@ -311,8 +308,7 @@ public class FormatTest implements Serializable { @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 class FormatTest implements Serializable { @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 e63688b8cec..feab425fe06 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 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("hasOnlyReadOnly") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") 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 d857d3073c0..7f8f10ec3f7 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 class MapTest implements Serializable { @ApiModelProperty(value = "") @JsonProperty("map_map_of_string") - public Map<String, Map<String, String>> getMapMapOfString() { +@Valid public Map<String, Map<String, String>> 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 3237d6059a2..3277d67c208 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 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("MixedPropertiesAndAdditionalPropertiesClass") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") public class MixedPropertiesAndAdditionalPropertiesClass implements Serializable { - private @Valid UUID uuid; - private @Valid Date dateTime; + private UUID uuid; + private Date dateTime; private @Valid Map<String, Animal> map = null; protected MixedPropertiesAndAdditionalPropertiesClass(MixedPropertiesAndAdditionalPropertiesClassBuilder<?, ?> b) { @@ -46,7 +46,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass implements Serializabl @ApiModelProperty(value = "") @JsonProperty("uuid") - public UUID getUuid() { +@Valid public UUID getUuid() { return uuid; } @@ -65,7 +65,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass implements Serializabl @ApiModelProperty(value = "") @JsonProperty("dateTime") - public Date getDateTime() { +@Valid public Date getDateTime() { return dateTime; } @@ -84,7 +84,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass implements Serializabl @ApiModelProperty(value = "") @JsonProperty("map") - public Map<String, Animal> getMap() { +@Valid public Map<String, Animal> 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 61eabc7e506..fdc4af0c933 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 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("200_response") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") 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 2d7b88df51b..83d5b111708 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 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("ApiResponse") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") 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 9ed686d7c2b..b57716e4adb 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 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("File") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") 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 697bcd03cb5..037d9f769f1 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 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("List") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") 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 54423218e1a..aff7d1d68f3 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 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("Return") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") 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 6f4930623c0..e29eda28cce 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 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("Name") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") 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 class Name implements Serializable { @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 3dae7063710..d91a17e52d3 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 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("NumberOnly") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") 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 class NumberOnly implements Serializable { @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 4df55486604..996ee1c545b 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 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("Order") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") 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 class Order implements Serializable { } } - 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 class Order implements Serializable { @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 c9a4b090f84..700217282ac 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 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("OuterComposite") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") 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 class OuterComposite implements Serializable { @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 c91f0b0ac94..0b8a7975919 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 @@ -25,9 +25,9 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("Pet") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") 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<String> photoUrls = new LinkedHashSet<>(); private @Valid List<Tag> tags = null; public enum StatusEnum { @@ -77,7 +77,7 @@ public class Pet implements Serializable { } } - private @Valid StatusEnum status; + private StatusEnum status; protected Pet(PetBuilder<?, ?> b) { this.id = b.id; @@ -120,7 +120,7 @@ public class Pet implements Serializable { @ApiModelProperty(value = "") @JsonProperty("category") - public Category getCategory() { +@Valid public Category getCategory() { return category; } @@ -139,8 +139,7 @@ public class Pet implements Serializable { @ApiModelProperty(example = "doggie", required = true, value = "") @JsonProperty("name") - @NotNull - public String getName() { +@NotNull public String getName() { return name; } @@ -159,8 +158,7 @@ public class Pet implements Serializable { @ApiModelProperty(required = true, value = "") @JsonProperty("photoUrls") - @NotNull - public Set<String> getPhotoUrls() { +@NotNull public Set<String> getPhotoUrls() { return photoUrls; } @@ -196,7 +194,7 @@ public class Pet implements Serializable { @ApiModelProperty(value = "") @JsonProperty("tags") - public List<Tag> 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 c5373629fa4..94dbb828720 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 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("ReadOnlyFirst") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") 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 0faf305fcf4..c2208b3e0a0 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 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("$special[model.name]") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") 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 c29fb28af0e..c649eb83e65 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 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("Tag") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") 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 a8a293b2e0f..7e4d154b854 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 @@ -21,10 +21,10 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("TypeHolderDefault") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") 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<Integer> arrayItem = new ArrayList<>(); protected TypeHolderDefault(TypeHolderDefaultBuilder<?, ?> b) { @@ -48,8 +48,7 @@ public class TypeHolderDefault implements Serializable { @ApiModelProperty(required = true, value = "") @JsonProperty("string_item") - @NotNull - public String getStringItem() { +@NotNull public String getStringItem() { return stringItem; } @@ -68,8 +67,7 @@ public class TypeHolderDefault implements Serializable { @ApiModelProperty(required = true, value = "") @JsonProperty("number_item") - @NotNull - public BigDecimal getNumberItem() { +@NotNull @Valid public BigDecimal getNumberItem() { return numberItem; } @@ -88,8 +86,7 @@ public class TypeHolderDefault implements Serializable { @ApiModelProperty(required = true, value = "") @JsonProperty("integer_item") - @NotNull - public Integer getIntegerItem() { +@NotNull public Integer getIntegerItem() { return integerItem; } @@ -108,8 +105,7 @@ public class TypeHolderDefault implements Serializable { @ApiModelProperty(required = true, value = "") @JsonProperty("bool_item") - @NotNull - public Boolean getBoolItem() { +@NotNull public Boolean getBoolItem() { return boolItem; } @@ -128,8 +124,7 @@ public class TypeHolderDefault implements Serializable { @ApiModelProperty(required = true, value = "") @JsonProperty("array_item") - @NotNull - public List<Integer> getArrayItem() { +@NotNull public List<Integer> 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 2b48909d9e3..b4cd2bb5bcd 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 @@ -21,11 +21,11 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("TypeHolderExample") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") 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<Integer> arrayItem = new ArrayList<>(); protected TypeHolderExample(TypeHolderExampleBuilder<?, ?> b) { @@ -50,8 +50,7 @@ public class TypeHolderExample implements Serializable { @ApiModelProperty(example = "what", required = true, value = "") @JsonProperty("string_item") - @NotNull - public String getStringItem() { +@NotNull public String getStringItem() { return stringItem; } @@ -70,8 +69,7 @@ public class TypeHolderExample implements Serializable { @ApiModelProperty(example = "1.234", required = true, value = "") @JsonProperty("number_item") - @NotNull - public BigDecimal getNumberItem() { +@NotNull @Valid public BigDecimal getNumberItem() { return numberItem; } @@ -90,8 +88,7 @@ public class TypeHolderExample implements Serializable { @ApiModelProperty(example = "1.234", required = true, value = "") @JsonProperty("float_item") - @NotNull - public Float getFloatItem() { +@NotNull public Float getFloatItem() { return floatItem; } @@ -110,8 +107,7 @@ public class TypeHolderExample implements Serializable { @ApiModelProperty(example = "-2", required = true, value = "") @JsonProperty("integer_item") - @NotNull - public Integer getIntegerItem() { +@NotNull public Integer getIntegerItem() { return integerItem; } @@ -130,8 +126,7 @@ public class TypeHolderExample implements Serializable { @ApiModelProperty(example = "true", required = true, value = "") @JsonProperty("bool_item") - @NotNull - public Boolean getBoolItem() { +@NotNull public Boolean getBoolItem() { return boolItem; } @@ -150,8 +145,7 @@ public class TypeHolderExample implements Serializable { @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "") @JsonProperty("array_item") - @NotNull - public List<Integer> getArrayItem() { +@NotNull public List<Integer> 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 27ac9ad24d0..5fe77d71254 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 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("User") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") 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 a3c4378d809..15955d93efb 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 @@ -21,33 +21,33 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("XmlItem") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") 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<Integer> wrappedArray = null; - 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<Integer> nameArray = null; private @Valid List<Integer> nameWrappedArray = null; - 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<Integer> prefixArray = null; private @Valid List<Integer> prefixWrappedArray = null; - 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<Integer> namespaceArray = null; private @Valid List<Integer> namespaceWrappedArray = null; - 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<Integer> prefixNsArray = null; private @Valid List<Integer> prefixNsWrappedArray = null; @@ -115,7 +115,7 @@ public class XmlItem implements Serializable { @ApiModelProperty(example = "1.234", value = "") @JsonProperty("attribute_number") - public BigDecimal getAttributeNumber() { +@Valid public BigDecimal getAttributeNumber() { return attributeNumber; } @@ -226,7 +226,7 @@ public class XmlItem implements Serializable { @ApiModelProperty(example = "1.234", value = "") @JsonProperty("name_number") - public BigDecimal getNameNumber() { +@Valid public BigDecimal getNameNumber() { return nameNumber; } @@ -372,7 +372,7 @@ public class XmlItem implements Serializable { @ApiModelProperty(example = "1.234", value = "") @JsonProperty("prefix_number") - public BigDecimal getPrefixNumber() { +@Valid public BigDecimal getPrefixNumber() { return prefixNumber; } @@ -518,7 +518,7 @@ public class XmlItem implements Serializable { @ApiModelProperty(example = "1.234", value = "") @JsonProperty("namespace_number") - public BigDecimal getNamespaceNumber() { +@Valid public BigDecimal getNamespaceNumber() { return namespaceNumber; } @@ -664,7 +664,7 @@ public class XmlItem implements Serializable { @ApiModelProperty(example = "1.234", value = "") @JsonProperty("prefix_ns_number") - public BigDecimal getPrefixNsNumber() { +@Valid public BigDecimal getPrefixNsNumber() { return prefixNsNumber; } -- GitLab