fix: swagger-2-module multipleOf rounding error (#365)

victools · Jun 15, 2023 · c645b5c · c645b5c
1 parent baea9b6
commit c645b5c
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 #### Added
 - consider `@Schema(additionalProperties = ...)` attribute (only values `TRUE` and `FALSE`), when it is annotated on a type (not on a member)
 
+#### Fixed
+- avoid rounding error when taking over the value from `@Schema(multipleOf)`
+
 ## [4.31.1] - 2023-04-28
 ### `jsonschema-generator`
 #### Fixed

diff --git a/...wagger-2/src/main/java/com/github/victools/jsonschema/module/swagger2/Swagger2Module.java b/...wagger-2/src/main/java/com/github/victools/jsonschema/module/swagger2/Swagger2Module.java
@@ -303,7 +303,7 @@ protected String resolvePattern(MemberScope<?, ?> member) {
      */
     protected BigDecimal resolveMultipleOf(MemberScope<?, ?> member) {
         return this.getSchemaAnnotationValue(member, Schema::multipleOf, multipleOf -> multipleOf != 0)
-                .map(BigDecimal::new)
+                .map(BigDecimal::valueOf)
                 .orElse(null);
     }
 

diff --git a/...agger-2/src/test/java/com/github/victools/jsonschema/module/swagger2/IntegrationTest.java b/...agger-2/src/test/java/com/github/victools/jsonschema/module/swagger2/IntegrationTest.java
@@ -18,6 +18,7 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.math.BigDecimal;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Scanner;
@@ -96,10 +97,10 @@ static class TestClass {
         @Schema(description = "field description", nullable = true, allowableValues = {"A", "B", "C", "D"}, minLength = 1, maxLength = 1)
         public String fieldWithDescriptionAndAllowableValues;
 
-        @Schema(minimum = "15", maximum = "20")
-        public int fieldWithInclusiveNumericRange;
+        @Schema(minimum = "15", maximum = "20", multipleOf = 0.0123456789)
+        public BigDecimal fieldWithInclusiveNumericRange;
 
-        @Schema(minimum = "14", maximum = "21", exclusiveMinimum = true, exclusiveMaximum = true, required = true)
+        @Schema(minimum = "14", maximum = "21", exclusiveMinimum = true, exclusiveMaximum = true, required = true, multipleOf = 0.1)
         public int fieldWithExclusiveNumericRange;
     }
 

diff --git a/...ces/com/github/victools/jsonschema/module/swagger2/integration-test-result-TestClass.json b/...ces/com/github/victools/jsonschema/module/swagger2/integration-test-result-TestClass.json
@@ -12,12 +12,14 @@
         "fieldWithExclusiveNumericRange": {
             "type": "integer",
             "exclusiveMinimum": 14,
-            "exclusiveMaximum": 21
+            "exclusiveMaximum": 21,
+            "multipleOf": 0.1
         },
         "fieldWithInclusiveNumericRange": {
-            "type": "integer",
+            "type": "number",
             "minimum": 15,
-            "maximum": 20
+            "maximum": 20,
+            "multipleOf": 0.0123456789
         },
         "fieldWithOverriddenName": {
             "minItems": 1,