From d08d55d4190c916e2ce8c55be27a9da4eaa4b0e8 Mon Sep 17 00:00:00 2001
From: fisherliu <liuwzh_1980@163.com>
Date: Thu, 4 May 2017 23:03:12 +0800
Subject: [PATCH] add @Valid annotion for bean-validation (#5517)

---
 .../src/main/resources/Java/beanValidation.mustache  | 12 ++++++++++++
 .../src/main/resources/Java/model.mustache           |  1 +
 2 files changed, 13 insertions(+)

diff --git a/modules/swagger-codegen/src/main/resources/Java/beanValidation.mustache b/modules/swagger-codegen/src/main/resources/Java/beanValidation.mustache
index c8c6946fef6..7c347758d8d 100644
--- a/modules/swagger-codegen/src/main/resources/Java/beanValidation.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/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/Java/model.mustache b/modules/swagger-codegen/src/main/resources/Java/model.mustache
index 385b3c14ec9..abb62a7af0f 100644
--- a/modules/swagger-codegen/src/main/resources/Java/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/model.mustache
@@ -20,6 +20,7 @@ import android.os.Parcel;
 {{/parcelableModel}}
 {{#useBeanValidation}}
 import javax.validation.constraints.*;
+import javax.validation.Valid;
 {{/useBeanValidation}}
 
 {{#models}}