From 1ea0c79587dade6194b6d96980bc57a8513fe074 Mon Sep 17 00:00:00 2001
From: Hugo Mercado <hugo.mario.mercado@gmail.com>
Date: Wed, 21 Oct 2020 22:00:39 -0500
Subject: [PATCH] added @Valid annotation on bean validation template for java
 jaxs generators

---
 .../main/resources/JavaJaxRS/beanValidation.mustache | 12 ++++++++++++
 .../JavaJaxRS/cxf-cdi/beanValidation.mustache        | 12 ++++++++++++
 .../src/main/resources/JavaJaxRS/model.mustache      |  1 +
 3 files changed, 25 insertions(+)

diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/beanValidation.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/beanValidation.mustache
index c8c6946fef6..7c347758d8d 100644
--- 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}}
\ No newline at end of file
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
index c8c6946fef6..7c347758d8d 100644
--- 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}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/model.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/model.mustache
index 1d4785dda12..fce25592536 100644
--- 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}}