Merge pull request #648 from Fyro-Ing/master

HugoMario · web-flow · commit 4647e42c47a5 · 2020-10-20T18:22:17.000-05:00
[JavaJaxRS] enhance beanvalidation by adding @Valid
diff --git a/src/main/resources/handlebars/JavaJaxRS/beanValidation.mustache b/src/main/resources/handlebars/JavaJaxRS/beanValidation.mustache
@@ -1,4 +1,16 @@
 {{#required}}
   @NotNull
 {{/required}}
-{{>beanValidationCore}}
+{{#is this 'container'}}
+{{#isNot this 'primitive-type'}}
+{{#isNot this 'enum'}}
+  @Valid
+{{/isNot}}
+{{/isNot}}
+{{/is}}
+{{#isNot this 'container'}}
+{{#isNot this 'primitive-type'}}
+  @Valid
+{{/isNot}}
+{{/isNot}}
+{{>beanValidationCore}}
diff --git a/src/main/resources/handlebars/JavaJaxRS/cxf-cdi/beanValidation.mustache b/src/main/resources/handlebars/JavaJaxRS/cxf-cdi/beanValidation.mustache
@@ -1,4 +1,16 @@
 {{#required}}
   @NotNull
 {{/required}}
-{{>beanValidationCore}}
+{{#isContainer}}
+{{^isPrimitiveType}}
+{{^isEnum}}
+  @Valid
+{{/isEnum}}
+{{/isPrimitiveType}}
+{{/isContainer}}
+{{#isNotContainer}}
+{{^isPrimitiveType}}
+  @Valid
+{{/isPrimitiveType}}
+{{/isNotContainer}}
+{{>beanValidationCore}}
diff --git a/src/main/resources/handlebars/JavaJaxRS/model.mustache b/src/main/resources/handlebars/JavaJaxRS/model.mustache
@@ -16,6 +16,7 @@ import java.io.Serializable;
 {{/serializableModel}}
 {{#useBeanValidation}}
 import javax.validation.constraints.*;
+import javax.validation.Valid;
 {{/useBeanValidation}}
 {{/x-is-composed-model}}
 
