Refactor validation of model properties, rel #331

kokuwaio · Dec 28, 2023 · 4c08a38 · 4c08a38
1 parent 3615fe7
commit 4c08a38
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/gen/main/java/issue/_331/ModelComplex.java b/gen/main/java/issue/_331/ModelComplex.java
@@ -61,32 +61,32 @@ public class ModelComplex {
 	@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_ABSENT)
 	private org.openapitools.jackson.nullable.JsonNullable<java.lang.Double> numberWithoutValidation = org.openapitools.jackson.nullable.JsonNullable.undefined();
 
-	@jakarta.validation.constraints.DecimalMin("3.11111")
+	@jakarta.validation.constraints.DecimalMin(value = "3.11111", inclusive = true)
 	@com.fasterxml.jackson.annotation.JsonProperty("numberWithMinimum")
 	@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
 	private java.lang.Double numberWithMinimum;
 
-	@jakarta.validation.constraints.DecimalMin("3.11112")
+	@jakarta.validation.constraints.DecimalMin(value = "3.11112", inclusive = true)
 	@com.fasterxml.jackson.annotation.JsonProperty("numberWithMinimumExclusiveFalse")
 	@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
 	private java.lang.Double numberWithMinimumExclusiveFalse;
 
-	@jakarta.validation.constraints.DecimalMin("3.11113")
+	@jakarta.validation.constraints.DecimalMin(value = "3.11113", inclusive = false)
 	@com.fasterxml.jackson.annotation.JsonProperty("numberWithMinimumExclusiveTrue")
 	@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
 	private java.lang.Double numberWithMinimumExclusiveTrue;
 
-	@jakarta.validation.constraints.DecimalMax("4.22221")
+	@jakarta.validation.constraints.DecimalMax(value = "4.22221", inclusive = true)
 	@com.fasterxml.jackson.annotation.JsonProperty("numberWithMaximum")
 	@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
 	private java.lang.Double numberWithMaximum;
 
-	@jakarta.validation.constraints.DecimalMax("4.22222")
+	@jakarta.validation.constraints.DecimalMax(value = "4.22222", inclusive = true)
 	@com.fasterxml.jackson.annotation.JsonProperty("numberWithMaximumExclusiveFalse")
 	@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
 	private java.lang.Double numberWithMaximumExclusiveFalse;
 
-	@jakarta.validation.constraints.DecimalMax("4.22223")
+	@jakarta.validation.constraints.DecimalMax(value = "4.22223", inclusive = false)
 	@com.fasterxml.jackson.annotation.JsonProperty("numberWithMaximumExclusiveTrue")
 	@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
 	private java.lang.Double numberWithMaximumExclusiveTrue;

diff --git a/src/main/resources/Micronaut/modelPropertyValidation.mustache b/src/main/resources/Micronaut/modelPropertyValidation.mustache
@@ -1,9 +1,13 @@
 {{#isModel}}{{^isContainer}}	@jakarta.validation.Valid
 {{/isContainer}}{{/isModel}}{{#required}}{{^isNullable}}	@jakarta.validation.constraints.NotNull
 {{/isNullable}}{{/required}}{{#pattern}}	@jakarta.validation.constraints.Pattern(regexp = "{{{pattern}}}")
-{{/pattern}}{{#minimum}}	@jakarta.validation.constraints.{{#isDouble}}DecimalMin("{{minimum}}"){{/isDouble}}{{#isFloat}}DecimalMin("{{minimum}}"){{/isFloat}}{{^isFloat}}{{^isDouble}}Min({{minimum}}){{/isDouble}}{{/isFloat}}
-{{/minimum}}{{#maximum}}	@jakarta.validation.constraints.{{#isDouble}}DecimalMax("{{maximum}}"){{/isDouble}}{{#isFloat}}DecimalMax("{{maximum}}"){{/isFloat}}{{^isFloat}}{{^isDouble}}Max({{maximum}}){{/isDouble}}{{/isFloat}}
-{{/maximum}}{{#minLength}}{{^maxLength}}	@jakarta.validation.constraints.Size(min = {{minLength}})
+{{/pattern}}{{#minimum}}{{#isInteger}}	@jakarta.validation.constraints.Min({{minimum}})
+{{/isInteger}}{{#isLong}}	@jakarta.validation.constraints.Min({{minimum}})
+{{/isLong}}{{^isInteger}}{{^isLong}}	@jakarta.validation.constraints.DecimalMin(value = "{{minimum}}", inclusive = {{#exclusiveMinimum}}false{{/exclusiveMinimum}}{{^exclusiveMinimum}}true{{/exclusiveMinimum}})
+{{/isLong}}{{/isInteger}}{{/minimum}}{{#maximum}}{{#isInteger}}	@jakarta.validation.constraints.Max({{maximum}})
+{{/isInteger}}{{#isLong}}	@jakarta.validation.constraints.Max({{maximum}})
+{{/isLong}}{{^isInteger}}{{^isLong}}	@jakarta.validation.constraints.DecimalMax(value = "{{maximum}}", inclusive = {{#exclusiveMaximum}}false{{/exclusiveMaximum}}{{^exclusiveMaximum}}true{{/exclusiveMaximum}})
+{{/isLong}}{{/isInteger}}{{/maximum}}{{#minLength}}{{^maxLength}}	@jakarta.validation.constraints.Size(min = {{minLength}})
 {{/maxLength}}{{/minLength}}{{^minLength}}{{#maxLength}}	@jakarta.validation.constraints.Size(max = {{maxLength}})
 {{/maxLength}}{{/minLength}}{{#minLength}}{{#maxLength}}	@jakarta.validation.constraints.Size(min = {{minLength}}, max = {{maxLength}})
 {{/maxLength}}{{/minLength}}{{#minItems}}{{^maxItems}}	@jakarta.validation.constraints.Size(min = {{minItems}})