Merge branch '2.19' into sugmanue/improve-ascii-performace

cowtowncoder · web-flow · commit 7732bbb1cbf4 · 2025-04-04T17:04:27.000-07:00
diff --git a/avro/src/main/java/com/fasterxml/jackson/dataformat/avro/AvroTypeIdResolver.java b/avro/src/main/java/com/fasterxml/jackson/dataformat/avro/AvroTypeIdResolver.java
@@ -29,25 +29,24 @@ public class AvroTypeIdResolver extends ClassNameIdResolver
 
     public AvroTypeIdResolver(JavaType baseType, TypeFactory typeFactory,
             PolymorphicTypeValidator ptv,
-            Collection<NamedType> subTypes) {
-        this(baseType, typeFactory, ptv);
+            Collection<NamedType> subTypes)
+    {
+        super(baseType, typeFactory, subTypes, ptv);
         if (subTypes != null) {
             for (NamedType namedType : subTypes) {
-                registerSubtype(namedType.getType(), namedType.getName());
+                //registerSubtype(namedType.getType(), namedType.getName());
+                _idTypes.put(namedType.getName(), namedType.getType());
             }
         }
     }
 
-    public AvroTypeIdResolver(JavaType baseType, TypeFactory typeFactory,
-            PolymorphicTypeValidator ptv) {
-        super(baseType, typeFactory, ptv);
-    }
-
+    /*// Not used as of Jackson 2.19
     @Override
     public void registerSubtype(Class<?> type, String name) {
         _idTypes.put(name, type);
 //        _typeIds.put(type, name);
     }
+    */
 
     @Override
     protected JavaType _typeFromId(String id, DatabindContext ctxt) throws IOException {
diff --git a/cbor/src/test/java/com/fasterxml/jackson/dataformat/cbor/mapper/NumberBeanTest.java b/cbor/src/test/java/com/fasterxml/jackson/dataformat/cbor/mapper/NumberBeanTest.java
@@ -6,7 +6,9 @@
 
 import org.junit.jupiter.api.Test;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonUnwrapped;
+import com.fasterxml.jackson.annotation.JsonValue;
 import com.fasterxml.jackson.core.JsonParser.NumberType;
 import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -47,6 +49,26 @@ static class NestedBigDecimalHolder2784 {
         public BigDecimalHolder2784 holder;
     }
 
+    // for [databind#4917]
+    static class DeserializationIssue4917 {
+        public DecimalHolder4917 decimalHolder;
+        public double number;
+    }
+
+    static class DecimalHolder4917 {
+        @JsonValue
+        BigDecimal value;
+
+        private DecimalHolder4917(BigDecimal value) {
+            this.value = value;
+        }
+
+        @JsonCreator(mode = JsonCreator.Mode.DELEGATING)
+        static DecimalHolder4917 of(BigDecimal value) {
+            return new DecimalHolder4917(value);
+        }
+    }
+
     /*
     /**********************************************************
     /* Test methods
@@ -256,4 +278,20 @@ public void testBigDecimalWithBuffering() throws Exception
                 NestedBigDecimalHolder2784.class);
         assertEquals(VALUE, result.holder.value);
     }
+
+    // [databind#4917]
+    @Test
+    public void testIssue4917() throws Exception {
+        final String bd = "100.00";
+        final double d = 50.0;
+        final DeserializationIssue4917 value = new DeserializationIssue4917();
+        value.decimalHolder = DecimalHolder4917.of(new BigDecimal(bd));
+        value.number = d;
+        final byte[] data = MAPPER.writeValueAsBytes(value);
+
+        final DeserializationIssue4917 result = MAPPER.readValue(
+                data, DeserializationIssue4917.class);
+        assertEquals(value.decimalHolder.value, result.decimalHolder.value);
+        assertEquals(value.number, result.number);
+    }
 }
diff --git a/ion/pom.xml b/ion/pom.xml
@@ -39,7 +39,7 @@ tree model)
     <dependency>
       <groupId>com.amazon.ion</groupId>
       <artifactId>ion-java</artifactId>
-      <version>1.11.9</version>
+      <version>1.11.10</version>
     </dependency>
 
     <!-- Extends Jackson core, databind -->
diff --git a/ion/src/main/java/com/fasterxml/jackson/dataformat/ion/IonParser.java b/ion/src/main/java/com/fasterxml/jackson/dataformat/ion/IonParser.java
@@ -414,8 +414,8 @@ private long _getLongValue() throws IOException {
         try {
             if (this.getNumberType() == NumberType.BIG_INTEGER) {
                 BigInteger bigInteger = _reader.bigIntegerValue();
-                if (BI_MIN_INT.compareTo(bigInteger) > 0 || BI_MAX_INT.compareTo(bigInteger) < 0) {
-                    this.reportOverflowLong();
+                if (BI_MIN_LONG.compareTo(bigInteger) > 0 || BI_MAX_LONG.compareTo(bigInteger) < 0) {
+                    reportOverflowLong();
                 }
                 return bigInteger.longValue();
             } else {
diff --git a/ion/src/test/java/com/fasterxml/jackson/dataformat/ion/IonNumberOverflowTest.java b/ion/src/test/java/com/fasterxml/jackson/dataformat/ion/IonNumberOverflowTest.java
@@ -5,6 +5,8 @@
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Test;
 
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.core.exc.InputCoercionException;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -72,4 +74,15 @@ private void _testLongCoercionFail(BigInteger input) throws Exception
         }
     }
 
+    // [dataformats-binary#569]: incorrect overflow fail for long values (from BigInteger)
+    @Test
+    public void testLongAsBigIntegerSize() throws Exception {
+        // Note: Values: Long.MAX_VALUE through Long.MAX_VALUE -7 are considered LONG by Ion.  
+        BigInteger bigIntLongValue = new BigInteger(Long.MAX_VALUE + "").subtract(BigInteger.TEN);
+        IonParser bigIntLongParser = (IonParser) new IonFactory().createParser(bigIntLongValue.toString());
+        assertEquals(JsonToken.VALUE_NUMBER_INT, bigIntLongParser.nextToken());
+        assertEquals(JsonParser.NumberType.BIG_INTEGER, bigIntLongParser.getNumberType());
+        assertEquals(JsonParser.NumberTypeFP.UNKNOWN, bigIntLongParser.getNumberTypeFP());
+        assertEquals(bigIntLongValue.longValue(), bigIntLongParser.getLongValue());
+    }    
 }
diff --git a/ion/src/test/java/com/fasterxml/jackson/dataformat/ion/PolymorphicRoundtripTest.java b/ion/src/test/java/com/fasterxml/jackson/dataformat/ion/PolymorphicRoundtripTest.java
@@ -292,7 +292,7 @@ protected TypeIdResolver defaultIdResolver(MapperConfig<?> config, JavaType base
                         config.getPolymorphicTypeValidator());
             } else {
                 return new ClassNameIdResolver(baseType, config.getTypeFactory(),
-                        config.getPolymorphicTypeValidator());
+                        null, config.getPolymorphicTypeValidator());
             }
         }
     }
@@ -303,7 +303,7 @@ class MultipleClassNameIdResolver extends ClassNameIdResolver implements Multipl
 
         MultipleClassNameIdResolver(JavaType baseType, TypeFactory typeFactory,
                 PolymorphicTypeValidator ptv) {
-            super(baseType, typeFactory, ptv);
+            super(baseType, typeFactory, null, ptv);
         }
 
         @Override
diff --git a/ion/src/test/java/com/fasterxml/jackson/dataformat/ion/polymorphism/IonAnnotationTypeDeserializerWithClassNameAnnotationTest.java b/ion/src/test/java/com/fasterxml/jackson/dataformat/ion/polymorphism/IonAnnotationTypeDeserializerWithClassNameAnnotationTest.java
@@ -102,7 +102,8 @@ static class ClassNameIonAnnotationIntrospector extends IonAnnotationIntrospecto
 
         @Override
         protected TypeIdResolver defaultIdResolver(MapperConfig<?> config, JavaType baseType) {
-            return new ClassNameIdResolver(baseType, config.getTypeFactory(), config.getPolymorphicTypeValidator());
+            return new ClassNameIdResolver(baseType, config.getTypeFactory(),
+                    null, config.getPolymorphicTypeValidator());
         }
     }
 
diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -35,6 +35,13 @@ Active maintainers:
 #547: (all) JSTEP-10: Unify testing structure/tools
  (contributed by Joo-Hyuk K)
 
+2.18.4 (not yet released)
+
+#569: (ion) `IonParser` fails to parse some `long` values saying
+  they are out of range when they are not
+ (reported, fix suggested by @seadbrane)
+- (ion) Upgrade `ion-java` to 1.11.10 (from 1.11.9)
+
 2.18.3 (28-Feb-2025)
 
 #541: (cbor, protobuf, smile) `SmileParser.getValueAsString()` FIELD_NAME bug
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/mapper/NumberBeanTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/mapper/NumberBeanTest.java
@@ -6,9 +6,13 @@
 
 import org.junit.jupiter.api.Test;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonUnwrapped;
+import com.fasterxml.jackson.annotation.JsonValue;
+
 import com.fasterxml.jackson.core.JsonParser.NumberType;
 import com.fasterxml.jackson.core.JsonToken;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.smile.*;
 
@@ -41,6 +45,26 @@ static class NestedBigDecimalHolder2784 {
         public BigDecimalHolder2784 holder;
     }
 
+    // for [databind#4917]
+    static class DeserializationIssue4917 {
+        public DecimalHolder4917 decimalHolder;
+        public double number;
+    }
+
+    static class DecimalHolder4917 {
+        @JsonValue
+        BigDecimal value;
+
+        private DecimalHolder4917(BigDecimal value) {
+            this.value = value;
+        }
+
+        @JsonCreator(mode = JsonCreator.Mode.DELEGATING)
+        static DecimalHolder4917 of(BigDecimal value) {
+            return new DecimalHolder4917(value);
+        }
+    }
+
     /*
     /**********************************************************
     /* Test methods
@@ -204,4 +228,20 @@ public void testBigDecimalWithBuffering() throws Exception
                 NestedBigDecimalHolder2784.class);
         assertEquals(VALUE, result.holder.value);
     }
+
+    // [databind#4917]
+    @Test
+    public void testIssue4917() throws Exception {
+        final String bd = "100.00";
+        final double d = 50.0;
+        final DeserializationIssue4917 value = new DeserializationIssue4917();
+        value.decimalHolder = DecimalHolder4917.of(new BigDecimal(bd));
+        value.number = d;
+        final byte[] data = MAPPER.writeValueAsBytes(value);
+
+        final DeserializationIssue4917 result = MAPPER.readValue(
+                data, DeserializationIssue4917.class);
+        assertEquals(value.decimalHolder.value, result.decimalHolder.value);
+        assertEquals(value.number, result.number);
+    }
 }
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/testutil/PrefixInputDecorator.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/testutil/PrefixInputDecorator.java
@@ -5,8 +5,6 @@
 
 import com.fasterxml.jackson.core.io.IOContext;
 import com.fasterxml.jackson.core.io.InputDecorator;
-import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.*;
 
 @SuppressWarnings("serial")
 public class PrefixInputDecorator extends InputDecorator
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/testutil/PrefixOutputDecorator.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/testutil/PrefixOutputDecorator.java
@@ -4,8 +4,6 @@
 
 import com.fasterxml.jackson.core.io.IOContext;
 import com.fasterxml.jackson.core.io.OutputDecorator;
-import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.*;
 
 @SuppressWarnings("serial")
 public class PrefixOutputDecorator extends OutputDecorator

Original file line number	Diff line number	Diff line change
`@@ -292,7 +292,7 @@ protected TypeIdResolver defaultIdResolver(MapperConfig<?> config, JavaType base`
`292`	`292`	`config.getPolymorphicTypeValidator());`
`293`	`293`	`} else {`
`294`	`294`	`return new ClassNameIdResolver(baseType, config.getTypeFactory(),`
`295`		`- config.getPolymorphicTypeValidator());`
	`295`	`+ null, config.getPolymorphicTypeValidator());`
`296`	`296`	`}`
`297`	`297`	`}`
`298`	`298`	`}`
`@@ -303,7 +303,7 @@ class MultipleClassNameIdResolver extends ClassNameIdResolver implements Multipl`
`303`	`303`
`304`	`304`	`MultipleClassNameIdResolver(JavaType baseType, TypeFactory typeFactory,`
`305`	`305`	`PolymorphicTypeValidator ptv) {`
`306`		`- super(baseType, typeFactory, ptv);`
	`306`	`+ super(baseType, typeFactory, null, ptv);`
`307`	`307`	`}`
`308`	`308`
`309`	`309`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,8 @@ static class ClassNameIonAnnotationIntrospector extends IonAnnotationIntrospecto`
`102`	`102`
`103`	`103`	`@Override`
`104`	`104`	`protected TypeIdResolver defaultIdResolver(MapperConfig<?> config, JavaType baseType) {`
`105`		`- return new ClassNameIdResolver(baseType, config.getTypeFactory(), config.getPolymorphicTypeValidator());`
	`105`	`+ return new ClassNameIdResolver(baseType, config.getTypeFactory(),`
	`106`	`+ null, config.getPolymorphicTypeValidator());`
`106`	`107`	`}`
`107`	`108`	`}`
`108`	`109`