Merge branch 'fix/integertype' into backmerge

sebastian-toepfer · Feb 13, 2024 · 3511540 · 3511540
2 parents df2be3f + 401a3bc
commit 3511540
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/api/src/main/java/io/github/sebastiantoepfer/jsonschema/InstanceType.java b/api/src/main/java/io/github/sebastiantoepfer/jsonschema/InstanceType.java
@@ -52,7 +52,7 @@ private boolean isIntegral(final BigDecimal decimal) {
                 BigDecimal.ZERO.equals(decimal) ||
                 BigDecimal.ONE.equals(decimal) ||
                 BigDecimal.TEN.equals(decimal) ||
-                decimal.stripTrailingZeros().scale() == 0
+                decimal.stripTrailingZeros().scale() <= 0
             );
         }
     },

diff --git a/api/src/test/java/io/github/sebastiantoepfer/jsonschema/InstanceTypeTest.java b/api/src/test/java/io/github/sebastiantoepfer/jsonschema/InstanceTypeTest.java
@@ -55,6 +55,9 @@ static Stream<? extends Arguments> provideWithValidCombinations() {
             arguments(InstanceType.NUMBER, Json.createValue(23L)),
             arguments(InstanceType.INTEGER, Json.createValue(23L)),
             arguments(InstanceType.INTEGER, Json.createValue(10L)),
+            arguments(InstanceType.INTEGER, Json.createValue(20L)),
+            arguments(InstanceType.INTEGER, Json.createValue(100L)),
+            arguments(InstanceType.INTEGER, Json.createValue(1000L)),
             arguments(InstanceType.INTEGER, Json.createValue(0.0))
         );
     }

diff --git a/pom.xml b/pom.xml
@@ -45,7 +45,7 @@
     </scm>
 
     <properties>
-        <project.build.outputTimestamp>2024-01-18T19:42:58Z</project.build.outputTimestamp>
+        <project.build.outputTimestamp>2024-02-13T20:35:47Z</project.build.outputTimestamp>
 
         <maven.compiler.source>17</maven.compiler.source>