14432: Do not add @Valid to Java types in "jaxrs-spec" generator

modules/openapi-generator/src/main/resources/JavaJaxRS/spec/beanValidation.mustache

@@ -1,4 +1 @@
-{{#required}}
-  @NotNull
-{{/required}}
-{{>beanValidationCore}}
+{{#required}}{{^isReadOnly}}@NotNull {{/isReadOnly}}{{/required}}{{#isContainer}}{{^isPrimitiveType}}{{^isEnum}}@Valid {{/isEnum}}{{/isPrimitiveType}}{{/isContainer}}{{^isContainer}}{{^isPrimitiveType}}@Valid {{/isPrimitiveType}}{{/isContainer}}{{>beanValidationCore}}

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}}

samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java

@@ -20,7 +20,7 @@
 @JsonTypeName("AdditionalPropertiesAnyType")
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")
 public class AdditionalPropertiesAnyType extends HashMap<String, Object> implements Serializable {
-  private @Valid String name;
+  private String name;
 
   /**
    **/

samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java

@@ -21,7 +21,7 @@
 @JsonTypeName("AdditionalPropertiesArray")
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")
 public class AdditionalPropertiesArray extends HashMap<String, List> implements Serializable {
-  private @Valid String name;
+  private String name;
 
   /**
    **/

samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java

@@ -20,7 +20,7 @@
 @JsonTypeName("AdditionalPropertiesBoolean")
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> implements Serializable {
-  private @Valid String name;
+  private String name;
 
   /**
    **/

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 AdditionalPropertiesClass mapNumber(Map<String, BigDecimal> mapNumber) {
 
   @ApiModelProperty(value = "")
   @JsonProperty("map_number")
-  public Map<String, BigDecimal> getMapNumber() {
+@Valid   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
   }
 
@@ -184,7 +184,7 @@ public AdditionalPropertiesClass mapArrayInteger(Map<String, List<Integer>> mapA
 
   @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 AdditionalPropertiesClass mapArrayAnytype(Map<String, List<Object>> mapAr
 
   @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 AdditionalPropertiesClass mapMapString(Map<String, Map<String, String>> m
 
   @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 AdditionalPropertiesClass mapMapAnytype(Map<String, Map<String, Object>>
 
   @ApiModelProperty(value = "")
   @JsonProperty("map_map_anytype")
-  public Map<String, Map<String, Object>> getMapMapAnytype() {
+@Valid   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
   }
 

samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java

@@ -20,7 +20,7 @@
 @JsonTypeName("AdditionalPropertiesInteger")
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")
 public class AdditionalPropertiesInteger extends HashMap<String, Integer> implements Serializable {
-  private @Valid String name;
+  private String name;
 
   /**
    **/

samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java

@@ -21,7 +21,7 @@
 @JsonTypeName("AdditionalPropertiesNumber")
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> implements Serializable {
-  private @Valid String name;
+  private String name;
 
   /**
    **/

samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java

@@ -20,7 +20,7 @@
 @JsonTypeName("AdditionalPropertiesObject")
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")
 public class AdditionalPropertiesObject extends HashMap<String, Map> implements Serializable {
-  private @Valid String name;
+  private String name;
 
   /**
    **/

samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java

@@ -20,7 +20,7 @@
 @JsonTypeName("AdditionalPropertiesString")
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")
 public class AdditionalPropertiesString extends HashMap<String, String> implements Serializable {
-  private @Valid String name;
+  private String name;
 
   /**
    **/

samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Animal.java

@@ -27,8 +27,8 @@
 @JsonTypeName("Animal")
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")
 public class Animal  implements Serializable {
-  private @Valid String className;
-  private @Valid String color = "red";
+  private String className;
+  private String color = "red";
 
   /**
    **/
@@ -40,8 +40,7 @@ public Animal className(String className) {
 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("className")
-  @NotNull
-  public String getClassName() {
+@NotNull   public String getClassName() {
     return className;
   }
 

samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java

@@ -33,7 +33,7 @@ public ArrayOfArrayOfNumberOnly arrayArrayNumber(List<List<BigDecimal>> arrayArr
 
   @ApiModelProperty(value = "")
   @JsonProperty("ArrayArrayNumber")
-  public List<List<BigDecimal>> getArrayArrayNumber() {
+@Valid   public List<@Valid List<@Valid BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
   }
 

samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java

@@ -33,7 +33,7 @@ public ArrayOfNumberOnly arrayNumber(List<BigDecimal> arrayNumber) {
 
   @ApiModelProperty(value = "")
   @JsonProperty("ArrayNumber")
-  public List<BigDecimal> getArrayNumber() {
+@Valid   public List<@Valid BigDecimal> getArrayNumber() {
     return arrayNumber;
   }
 

samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayTest.java

@@ -70,7 +70,7 @@ public ArrayTest arrayArrayOfInteger(List<List<Long>> arrayArrayOfInteger) {
 
   @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 ArrayTest arrayArrayOfModel(List<List<ReadOnlyFirst>> arrayArrayOfModel)
 
   @ApiModelProperty(value = "")
   @JsonProperty("array_array_of_model")
-  public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
+@Valid   public List<@Valid List<@Valid ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
   }
 

samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/BigCat.java

@@ -66,7 +66,7 @@ public static KindEnum fromValue(String value) {
     }
 }
 
-  private @Valid KindEnum kind;
+  private KindEnum kind;
 
   /**
    **/

samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/BigCatAllOf.java

@@ -66,7 +66,7 @@ public static KindEnum fromValue(String value) {
     }
 }
 
-  private @Valid KindEnum kind;
+  private KindEnum kind;
 
   /**
    **/

samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Capitalization.java

@@ -18,12 +18,12 @@
 @JsonTypeName("Capitalization")
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")
 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;
 
   /**
    **/

samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Cat.java

@@ -19,7 +19,7 @@
 @JsonTypeName("Cat")
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")
 public class Cat extends Animal implements Serializable {
-  private @Valid Boolean declawed;
+  private Boolean declawed;
 
   /**
    **/

samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/CatAllOf.java

@@ -19,7 +19,7 @@
 @JsonTypeName("Cat_allOf")
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")
 public class CatAllOf  implements Serializable {
-  private @Valid Boolean declawed;
+  private Boolean declawed;
 
   /**
    **/

samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Category.java

@@ -18,8 +18,8 @@
 @JsonTypeName("Category")
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")
 public class Category  implements Serializable {
-  private @Valid Long id;
-  private @Valid String name = "default-name";
+  private Long id;
+  private String name = "default-name";
 
   /**
    **/
@@ -50,8 +50,7 @@ public Category name(String name) {
 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("name")
-  @NotNull
-  public String getName() {
+@NotNull   public String getName() {
     return name;
   }
 

samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ClassModel.java

@@ -20,7 +20,7 @@
 @JsonTypeName("ClassModel")
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")
 public class ClassModel  implements Serializable {
-  private @Valid String propertyClass;
+  private String propertyClass;
 
   /**
    **/

samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Client.java

@@ -18,7 +18,7 @@
 @JsonTypeName("Client")
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")
 public class Client  implements Serializable {
-  private @Valid String client;
+  private String client;
 
   /**
    **/

samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Dog.java

@@ -19,7 +19,7 @@
 @JsonTypeName("Dog")
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")
 public class Dog extends Animal implements Serializable {
-  private @Valid String breed;
+  private String breed;
 
   /**
    **/

samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/DogAllOf.java

@@ -19,7 +19,7 @@
 @JsonTypeName("Dog_allOf")
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")
 public class DogAllOf  implements Serializable {
-  private @Valid String breed;
+  private String breed;
 
   /**
    **/

samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumArrays.java

@@ -67,7 +67,7 @@ public static JustSymbolEnum fromValue(String value) {
     }
 }
 
-  private @Valid JustSymbolEnum justSymbol;
+  private JustSymbolEnum justSymbol;
   public enum ArrayEnumEnum {
 
     FISH(String.valueOf("fish")), CRAB(String.valueOf("crab"));

samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumTest.java

@@ -67,7 +67,7 @@ public static EnumStringEnum fromValue(String value) {
     }
 }
 
-  private @Valid EnumStringEnum enumString;
+  private EnumStringEnum enumString;
   public enum EnumStringRequiredEnum {
 
     UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower")), EMPTY(String.valueOf(""));
@@ -115,7 +115,7 @@ public static EnumStringRequiredEnum fromValue(String value) {
     }
 }
 
-  private @Valid EnumStringRequiredEnum enumStringRequired;
+  private EnumStringRequiredEnum enumStringRequired;
   public enum EnumIntegerEnum {
 
     NUMBER_1(Integer.valueOf(1)), NUMBER_MINUS_1(Integer.valueOf(-1));
@@ -163,7 +163,7 @@ public static EnumIntegerEnum fromValue(Integer value) {
     }
 }
 
-  private @Valid EnumIntegerEnum enumInteger;
+  private EnumIntegerEnum enumInteger;
   public enum EnumNumberEnum {
 
     NUMBER_1_DOT_1(Double.valueOf(1.1)), NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
@@ -211,8 +211,8 @@ public static EnumNumberEnum fromValue(Double value) {
     }
 }
 
-  private @Valid EnumNumberEnum enumNumber;
-  private @Valid OuterEnum outerEnum;
+  private EnumNumberEnum enumNumber;
+  private OuterEnum outerEnum;
 
   /**
    **/
@@ -243,8 +243,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("enum_string_required")
-  @NotNull
-  public EnumStringRequiredEnum getEnumStringRequired() {
+@NotNull   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
   }
 
@@ -301,7 +300,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
 
   @ApiModelProperty(value = "")
   @JsonProperty("outerEnum")
-  public OuterEnum getOuterEnum() {
+@Valid   public OuterEnum getOuterEnum() {
     return outerEnum;
   }
 

samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FileSchemaTestClass.java

@@ -21,7 +21,7 @@
 @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 FileSchemaTestClass _file(ModelFile _file) {
 
   @ApiModelProperty(value = "")
   @JsonProperty("file")
-  public ModelFile getFile() {
+@Valid   public ModelFile getFile() {
     return _file;
   }
 
@@ -53,7 +53,7 @@ public FileSchemaTestClass files(List<ModelFile> files) {
 
   @ApiModelProperty(value = "")
   @JsonProperty("files")
-  public List<ModelFile> getFiles() {
+@Valid   public List<@Valid ModelFile> getFiles() {
     return files;
   }