Adjusts storage of max/min/exclMax/Min

Author: spacether

src/main/java/org/openapijsonschematools/codegen/common/ModelUtils.java

@@ -1503,16 +1503,8 @@ public static void syncValidationProperties(Schema schema, CodegenSchema target)
             BigDecimal multipleOf = schema.getMultipleOf();
             BigDecimal minimum = schema.getMinimum();
             BigDecimal maximum = schema.getMaximum();
-            Boolean exclusiveMinimum = schema.getExclusiveMinimum();
-            if (minimum == null && schema.getExclusiveMinimumValue() != null) {
-                minimum = schema.getExclusiveMinimumValue();
-                exclusiveMinimum = Boolean.TRUE;
-            }
-            Boolean exclusiveMaximum = schema.getExclusiveMaximum();
-            if (maximum == null && schema.getExclusiveMaximumValue() != null) {
-                maximum = schema.getExclusiveMaximumValue();
-                exclusiveMaximum = Boolean.TRUE;
-            }
+            BigDecimal exclusiveMinimum = schema.getExclusiveMinimumValue();
+            BigDecimal exclusiveMaximum = schema.getExclusiveMaximumValue();
 
             if (isArraySchema(schema)) {
                 setArrayValidations(minItems, maxItems, uniqueItems, target);
@@ -1551,24 +1543,12 @@ private static void setStringValidations(Integer minLength, Integer maxLength, S
         if (maxLength != null) target.maxLength = maxLength;
     }
 
-    private static void setNumericValidations(Schema schema, BigDecimal multipleOf, BigDecimal minimum, BigDecimal maximum, Boolean exclusiveMinimum, Boolean exclusiveMaximum, CodegenSchema target) {
-        if (multipleOf != null) target.multipleOf = multipleOf;
-        if (minimum != null) {
-            if (isIntegerSchema(schema)) {
-                target.minimum = String.valueOf(minimum.longValue());
-            } else {
-                target.minimum = String.valueOf(minimum);
-            }
-            if (exclusiveMinimum != null) target.exclusiveMinimum = exclusiveMinimum;
-        }
-        if (maximum != null) {
-            if (isIntegerSchema(schema)) {
-                target.maximum = String.valueOf(maximum.longValue());
-            } else {
-                target.maximum = String.valueOf(maximum);
-            }
-            if (exclusiveMaximum != null) target.exclusiveMaximum = exclusiveMaximum;
-        }
+    private static void setNumericValidations(Schema schema, BigDecimal multipleOf, BigDecimal minimum, BigDecimal maximum, BigDecimal exclusiveMinimum, BigDecimal exclusiveMaximum, CodegenSchema target) {
+        target.multipleOf = multipleOf;
+        target.minimum = minimum;
+        target.maximum = maximum;
+        target.exclusiveMinimum = exclusiveMinimum;
+        target.exclusiveMaximum = exclusiveMaximum;
     }
 
     private static ObjectMapper getRightMapper(String data) {

src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenSchema.java

@@ -19,6 +19,7 @@
 
 import io.swagger.v3.oas.models.ExternalDocumentation;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -32,10 +33,10 @@ public class CodegenSchema {
     // 3.0.0
     public String title;
     public Number multipleOf;
-    public String maximum;
-    public Boolean exclusiveMaximum;
-    public String minimum;
-    public Boolean exclusiveMinimum;
+    public BigDecimal maximum;
+    public BigDecimal exclusiveMaximum;
+    public BigDecimal minimum;
+    public BigDecimal exclusiveMinimum;
     public Integer maxLength;
     public Integer minLength;
     public CodegenPatternInfo patternInfo;