diff --git a/modules/swagger-codegen/src/main/resources/Java/beanValidation.mustache b/modules/swagger-codegen/src/main/resources/Java/beanValidation.mustache
index 891a94b3ba17..079eab89d1af 100644
--- a/modules/swagger-codegen/src/main/resources/Java/beanValidation.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/beanValidation.mustache
@@ -32,21 +32,22 @@
 {{^minItems}}
 {{#maxItems}}
   @Size(max={{maxItems}})
-  {{/maxItems}}
-  {{/minItems}}
+{{/maxItems}}
+{{/minItems}}
+{{! check for integer / number=decimal type}}
+{{#isInteger}}
 {{#minimum}}
-  {{#isInteger}}
   @Min({{minimum}})
-  {{/isInteger}}
-  {{#isLong}}
-  @Min({{minimum}})
-  {{/isLong}}
 {{/minimum}}
 {{#maximum}}
-  {{#isInteger}}
   @Max({{maximum}})
-  {{/isInteger}}
-  {{#isLong}}
-  @Max({{maximum}})
-  {{/isLong}}
 {{/maximum}}
+{{/isInteger}}
+{{^isInteger}}
+{{#minimum}}
+  @DecimalMin("{{minimum}}")
+{{/minimum}}
+{{#maximum}}
+  @DecimalMax("{{maximum}}")
+{{/maximum}}
+{{/isInteger}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/beanValidation.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/beanValidation.mustache
index f13ed5968595..079eab89d1af 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/beanValidation.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/beanValidation.mustache
@@ -32,11 +32,22 @@
 {{^minItems}}
 {{#maxItems}}
   @Size(max={{maxItems}})
-  {{/maxItems}}
-  {{/minItems}}
+{{/maxItems}}
+{{/minItems}}
+{{! check for integer / number=decimal type}}
+{{#isInteger}}
 {{#minimum}}
   @Min({{minimum}})
 {{/minimum}}
 {{#maximum}}
   @Max({{maximum}})
-{{/maximum}}
\ No newline at end of file
+{{/maximum}}
+{{/isInteger}}
+{{^isInteger}}
+{{#minimum}}
+  @DecimalMin("{{minimum}}")
+{{/minimum}}
+{{#maximum}}
+  @DecimalMax("{{maximum}}")
+{{/maximum}}
+{{/isInteger}}
\ No newline at end of file