[JAXRS-SPEC] no @Valid annotation on simple fields (#18302)

* fix and test * whitespace change, generate samples
OpenAPITools · Apr 6, 2024 · b11005b · b11005b
1 parent 3bb17ef
commit b11005b
Show file tree

Hide file tree

Showing 220 changed files with 933 additions and 985 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
@@ -1,2 +1 @@
-{{#required}}{{^isReadOnly}}  @NotNull
-{{/isReadOnly}}{{/required}}{{>beanValidationCore}}
+{{#required}}{{^isReadOnly}}@NotNull {{/isReadOnly}}{{/required}}{{#isContainer}}{{^isPrimitiveType}}{{^isEnum}}@Valid {{/isEnum}}{{/isPrimitiveType}}{{/isContainer}}{{^isContainer}}{{^isPrimitiveType}}@Valid {{/isPrimitiveType}}{{/isContainer}}{{>beanValidationCore}}
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pojo.mustache
@@ -32,7 +32,7 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#vendorExtens
   {{#vendorExtensions.x-field-extra-annotation}}
   {{{vendorExtensions.x-field-extra-annotation}}}
   {{/vendorExtensions.x-field-extra-annotation}}
-  private {{#useBeanValidation}}@Valid {{/useBeanValidation}}{{{datatypeWithEnum}}} {{name}}{{#defaultValue}} = {{{.}}}{{/defaultValue}};
+  private {{#isContainer}}{{#useBeanValidation}}@Valid {{/useBeanValidation}}{{/isContainer}}{{{datatypeWithEnum}}} {{name}}{{#defaultValue}} = {{{.}}}{{/defaultValue}};
   {{/vars}}
   {{#generateBuilders}}
   {{^additionalProperties}}
@@ -72,7 +72,7 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#vendorExtens
   @ApiModelProperty({{#example}}example = "{{{.}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}"){{/useSwaggerAnnotations}}{{#useMicroProfileOpenAPIAnnotations}}
   @org.eclipse.microprofile.openapi.annotations.media.Schema({{#example}}example = "{{{.}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}description = "{{{description}}}"){{/useMicroProfileOpenAPIAnnotations}}
   @JsonProperty("{{baseName}}")
-{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  public {{>beanValidatedType}} {{getter}}() {
+  {{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}public {{>beanValidatedType}} {{getter}}() {
     return {{name}};
   }
 

diff --git a/...tor/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSSpecServerCodegenTest.java b/...tor/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSSpecServerCodegenTest.java
@@ -714,6 +714,31 @@ public void testHandleDefaultValue_issue8535() throws Exception {
                 .containsWithNameAndAttributes("DefaultValue", ImmutableMap.of("value", "\"true\""));
     }
 
+    @Test
+    public void testValidAnnotation_issue14432() throws Exception {
+        File output = Files.createTempDirectory("test").toFile().getCanonicalFile();
+        output.deleteOnExit();
+
+        OpenAPI openAPI = new OpenAPIParser()
+                .readLocation("src/test/resources/3_0/issue_14432.yaml", null, new ParseOptions()).getOpenAPI();
+
+        codegen.setOutputDir(output.getAbsolutePath());
+
+        ClientOptInput input = new ClientOptInput()
+                .openAPI(openAPI)
+                .config(codegen);
+
+        DefaultGenerator generator = new DefaultGenerator();
+        Map<String, File> files = generator.opts(input).generate().stream()
+                .collect(Collectors.toMap(File::getName, Function.identity()));
+
+        JavaFileAssert.assertThat(files.get("ComplexObject.java"))
+                .fileContains("private @Valid List<LocalDate> dates")
+                .fileDoesNotContains("private @Valid SymbolTypeEnum symbolType")
+                .fileDoesNotContains("@Valid String")
+                .fileDoesNotContains("@Valid Double");
+    }
+
     @Test
     public void arrayNullableDefaultValueTests() throws Exception {
         final File output = Files.createTempDirectory("test").toFile().getCanonicalFile();

diff --git a/modules/openapi-generator/src/test/resources/3_0/issue_14432.yaml b/modules/openapi-generator/src/test/resources/3_0/issue_14432.yaml
@@ -0,0 +1,30 @@
+openapi: "3.0.3"
+info:
+  title: "Demo models"
+  version: "1.0"
+paths: {}
+components:
+  schemas:
+    ComplexObject:
+      type: "object"
+      properties:
+        id:
+          type: "string"
+        probability:
+          type: "number"
+          format: "double"
+        dates:
+          type: "array"
+          items:
+            type: "string"
+            format: "date"
+        symbolType:
+          type: "string"
+          enum:
+            - "SYMBOL1"
+            - "SYMBOL2"
+            - "SYMBOL3"
+    ComplexArray:
+      type: array
+      items:
+        $ref: '#/components/schemas/ComplexObject'
diff --git a/...c-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/...c-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -20,7 +20,7 @@
 @JsonTypeName("AdditionalPropertiesAnyType")
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT")
 public class AdditionalPropertiesAnyType extends HashMap<String, Object> implements Serializable {
-  private @Valid String name;
+  private String name;
 
   /**
    **/

diff --git a/...pec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java b/...pec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -21,7 +21,7 @@
 @JsonTypeName("AdditionalPropertiesArray")
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT")
 public class AdditionalPropertiesArray extends HashMap<String, List> implements Serializable {
-  private @Valid String name;
+  private String name;
 
   /**
    **/

diff --git a/...c-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/...c-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -20,7 +20,7 @@
 @JsonTypeName("AdditionalPropertiesBoolean")
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT")
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> implements Serializable {
-  private @Valid String name;
+  private String name;
 
   /**
    **/

diff --git a/...pec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/...pec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -30,9 +30,9 @@ public class AdditionalPropertiesClass  implements Serializable {
   private @Valid Map<String, List<Object>> mapArrayAnytype = new HashMap<>();
   private @Valid Map<String, Map<String, String>> mapMapString = new HashMap<>();
   private @Valid Map<String, Map<String, Object>> mapMapAnytype = new HashMap<>();
-  private @Valid Object anytype1;
-  private @Valid Object anytype2;
-  private @Valid Object anytype3;
+  private Object anytype1;
+  private Object anytype2;
+  private Object anytype3;
 
   /**
    **/
@@ -79,7 +79,7 @@ public AdditionalPropertiesClass mapNumber(Map<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;
   }
 

diff --git a/...c-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java b/...c-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -20,7 +20,7 @@
 @JsonTypeName("AdditionalPropertiesInteger")
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT")
 public class AdditionalPropertiesInteger extends HashMap<String, Integer> implements Serializable {
-  private @Valid String name;
+  private String name;
 
   /**
    **/

diff --git a/...ec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java b/...ec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -21,7 +21,7 @@
 @JsonTypeName("AdditionalPropertiesNumber")
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT")
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> implements Serializable {
-  private @Valid String name;
+  private String name;
 
   /**
    **/

diff --git a/...ec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java b/...ec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -20,7 +20,7 @@
 @JsonTypeName("AdditionalPropertiesObject")
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT")
 public class AdditionalPropertiesObject extends HashMap<String, Map> implements Serializable {
-  private @Valid String name;
+  private String name;
 
   /**
    **/

diff --git a/...ec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java b/...ec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -20,7 +20,7 @@
 @JsonTypeName("AdditionalPropertiesString")
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT")
 public class AdditionalPropertiesString extends HashMap<String, String> implements Serializable {
-  private @Valid String name;
+  private String name;
 
   /**
    **/

diff --git a/...er/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Animal.java b/...er/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Animal.java
@@ -27,8 +27,8 @@
 @JsonTypeName("Animal")
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT")
 public class Animal  implements Serializable {
-  private @Valid String className;
-  private @Valid String color = "red";
+  private String className;
+  private String color = "red";
 
   /**
    **/
@@ -40,8 +40,7 @@ public Animal className(String className) {
 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("className")
-  @NotNull
-  public String getClassName() {
+  @NotNull public String getClassName() {
     return className;
   }
 

diff --git a/...spec-interface-response/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/...spec-interface-response/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -34,7 +34,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;
   }
 

diff --git a/.../jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/.../jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -34,7 +34,7 @@ public ArrayOfNumberOnly arrayNumber(List<BigDecimal> arrayNumber) {
 
   @ApiModelProperty(value = "")
   @JsonProperty("ArrayNumber")
-  public List<BigDecimal> getArrayNumber() {
+  @Valid public List<@Valid BigDecimal> getArrayNumber() {
     return arrayNumber;
   }
 

diff --git a/...petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayTest.java b/...petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayTest.java
@@ -71,7 +71,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;
   }
 
@@ -106,7 +106,7 @@ public ArrayTest arrayArrayOfModel(List<List<@Valid ReadOnlyFirst>> arrayArrayOf
 
   @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/...er/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/BigCat.java b/...er/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/BigCat.java
@@ -66,7 +66,7 @@ public static KindEnum fromValue(String value) {
     }
 }
 
-  private @Valid KindEnum kind;
+  private KindEnum kind;
 
   /**
    **/

diff --git a/...ore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Capitalization.java b/...ore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Capitalization.java
@@ -18,12 +18,12 @@
 @JsonTypeName("Capitalization")
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT")
 public class Capitalization  implements Serializable {
-  private @Valid String smallCamel;
-  private @Valid String capitalCamel;
-  private @Valid String smallSnake;
-  private @Valid String capitalSnake;
-  private @Valid String scAETHFlowPoints;
-  private @Valid String ATT_NAME;
+  private String smallCamel;
+  private String capitalCamel;
+  private String smallSnake;
+  private String capitalSnake;
+  private String scAETHFlowPoints;
+  private String ATT_NAME;
 
   /**
    **/

diff --git a/...erver/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Cat.java b/...erver/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Cat.java
@@ -19,7 +19,7 @@
 @JsonTypeName("Cat")
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT")
 public class Cat extends Animal implements Serializable {
-  private @Valid Boolean declawed;
+  private Boolean declawed;
 
   /**
    **/

diff --git a/.../petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Category.java b/.../petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Category.java
@@ -18,8 +18,8 @@
 @JsonTypeName("Category")
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT")
 public class Category  implements Serializable {
-  private @Valid Long id;
-  private @Valid String name = "default-name";
+  private Long id;
+  private String name = "default-name";
 
   /**
    **/
@@ -50,8 +50,7 @@ public Category name(String name) {
 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("name")
-  @NotNull
-  public String getName() {
+  @NotNull public String getName() {
     return name;
   }
 

diff --git a/...etstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ClassModel.java b/...etstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ClassModel.java
@@ -20,7 +20,7 @@
 @JsonTypeName("ClassModel")
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT")
 public class ClassModel  implements Serializable {
-  private @Valid String propertyClass;
+  private String propertyClass;
 
   /**
    **/

diff --git a/...er/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Client.java b/...er/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Client.java
@@ -18,7 +18,7 @@
 @JsonTypeName("Client")
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT")
 public class Client  implements Serializable {
-  private @Valid String client;
+  private String client;
 
   /**
    **/

diff --git a/...erver/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Dog.java b/...erver/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Dog.java
@@ -19,7 +19,7 @@
 @JsonTypeName("Dog")
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.5.0-SNAPSHOT")
 public class Dog extends Animal implements Serializable {
-  private @Valid String breed;
+  private String breed;
 
   /**
    **/

diff --git a/...etstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/EnumArrays.java b/...etstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/EnumArrays.java
@@ -68,7 +68,7 @@ public static JustSymbolEnum fromValue(String value) {
     }
 }
 
-  private @Valid JustSymbolEnum justSymbol;
+  private JustSymbolEnum justSymbol;
   public enum ArrayEnumEnum {
 
     FISH(String.valueOf("fish")), CRAB(String.valueOf("crab"));