Merge pull request #10519 from swagger-api/issue-8641

added @Valid annotation on bean validation template for java jaxs
swagger-api · Oct 22, 2020 · 12dbb1c · 12dbb1c
2 parents 533f668 + 1ea0c79
commit 12dbb1c
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 0 deletions.
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/beanValidation.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/beanValidation.mustache
@@ -1,4 +1,16 @@
 {{#required}}
   @NotNull
 {{/required}}
+{{#isContainer}}
+{{^isPrimitiveType}}
+{{^isEnum}}
+  @Valid
+{{/isEnum}}
+{{/isPrimitiveType}}
+{{/isContainer}}
+{{#isNotContainer}}
+{{^isPrimitiveType}}
+  @Valid
+{{/isPrimitiveType}}
+{{/isNotContainer}}
 {{>beanValidationCore}}
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf-cdi/beanValidation.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf-cdi/beanValidation.mustache
@@ -1,4 +1,16 @@
 {{#required}}
   @NotNull
 {{/required}}
+{{#isContainer}}
+{{^isPrimitiveType}}
+{{^isEnum}}
+  @Valid
+{{/isEnum}}
+{{/isPrimitiveType}}
+{{/isContainer}}
+{{#isNotContainer}}
+{{^isPrimitiveType}}
+  @Valid
+{{/isPrimitiveType}}
+{{/isNotContainer}}
 {{>beanValidationCore}}
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/model.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/model.mustache
@@ -15,6 +15,7 @@ import java.io.Serializable;
 {{/serializableModel}}
 {{#useBeanValidation}}
 import javax.validation.constraints.*;
+import javax.validation.Valid;
 {{/useBeanValidation}}
 
 {{#models}}