diff --git a/modules/swagger-codegen/src/main/resources/JavaSpring/beanValidation.mustache b/modules/swagger-codegen/src/main/resources/JavaSpring/beanValidation.mustache
index f6b013abc9..3e4ef612a4 100644
--- a/modules/swagger-codegen/src/main/resources/JavaSpring/beanValidation.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaSpring/beanValidation.mustache
@@ -1,5 +1,6 @@
 {{#required}}
   @NotNull
-{{/required}}
+{{/required}}{{#isContainer}}{{^isPrimitiveType}}{{^isEnum}}
+  @Valid{{/isEnum}}{{/isPrimitiveType}}{{/isContainer}}{{#isNotContainer}}{{^isPrimitiveType}}
+  @Valid{{/isPrimitiveType}}{{/isNotContainer}}
 {{>beanValidationCore}}
-  @Valid