Merge branch '2.17'

FasterXML · Dec 11, 2023 · 70f9815 · 70f9815
2 parents 81d1d20 + 755a907
commit 70f9815
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/properties/src/test/java/tools/jackson/dataformat/javaprop/MapParsingTest.java b/properties/src/test/java/tools/jackson/dataformat/javaprop/MapParsingTest.java
@@ -10,7 +10,6 @@ static class MapWrapper {
         public Map<String,Object> map;
     }
 
-
     /*
     /**********************************************************************
     /* Test methods
@@ -59,7 +58,6 @@ public void testMapWithBranchBackslashEscape() throws Exception
                 .with(new JavaPropsSchema().withPathSeparatorEscapeChar('\\'))
                 .readValue(INPUT);
         assertNotNull(w.map);
-        System.out.println(w.map.toString());
         assertEquals(12, w.map.size());
         assertEquals("first", w.map.get(""));
         assertEquals("second", w.map.get("b"));
@@ -96,7 +94,6 @@ public void testMapWithBranchHashEscape() throws Exception
         MapWrapper w = mapper.readerFor(MapWrapper.class)
                 .with(new JavaPropsSchema().withPathSeparatorEscapeChar('#')).readValue(INPUT);
         assertNotNull(w.map);
-        System.out.println(w.map.toString());
         assertEquals(12, w.map.size());
         assertEquals("first", w.map.get(""));
         assertEquals("second", w.map.get("b"));

diff --git a/toml/src/test/java/tools/jackson/dataformat/toml/ComplianceValidTest.java b/toml/src/test/java/tools/jackson/dataformat/toml/ComplianceValidTest.java
@@ -82,7 +82,7 @@ private static JsonNode mapFromComplianceNode(ObjectNode expected) {
                     // for some reason, the compliance tests escape these values. this makes some tests fail right now
                     return nodeF.textNode(value.textValue());
                 case "integer":
-                    return nodeF.numberNode(NumberInput.parseBigInteger(value.textValue()));
+                    return nodeF.numberNode(NumberInput.parseBigInteger(value.textValue(), false));
                 case "float":
                     switch (value.textValue()) {
                         case "inf":
@@ -92,7 +92,7 @@ private static JsonNode mapFromComplianceNode(ObjectNode expected) {
                         case "nan":
                             return nodeF.numberNode(Double.NaN);
                         default:
-                            return nodeF.numberNode(NumberInput.parseBigDecimal(value.textValue()));
+                            return nodeF.numberNode(NumberInput.parseBigDecimal(value.textValue(), false));
                     }
                 case "boolean":
                     return nodeF.booleanNode(Boolean.parseBoolean(value.textValue()));

diff --git a/toml/src/test/java/tools/jackson/dataformat/toml/TomlMapperTest.java b/toml/src/test/java/tools/jackson/dataformat/toml/TomlMapperTest.java
@@ -104,7 +104,6 @@ public void bigInteger() {
         );
     }
 
-    @SuppressWarnings("BigDecimalMethodWithoutRoundingCalled")
     @Test
     public void bigDecimal() {
         BigDecimal testValue = BigDecimal.valueOf(Double.MIN_VALUE).divide(BigDecimal.valueOf(2));
-Original file line number
+Diff line change
@@ Expand Up / @@ -104,7 +104,6 @@ public void bigInteger() { @@
             );
         }
-        @SuppressWarnings("BigDecimalMethodWithoutRoundingCalled")
         @Test
         public void bigDecimal() {
             BigDecimal testValue = BigDecimal.valueOf(Double.MIN_VALUE).divide(BigDecimal.valueOf(2));
@@ Expand Down @@