Merge branch '2.18'

Author: cowtowncoder

src/test-jdk17/java/tools/jackson/databind/records/RecordTypeInfo3342Test.java

@@ -1,5 +1,7 @@
 package tools.jackson.databind.records;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 
@@ -9,6 +11,7 @@
 import tools.jackson.databind.testutil.DatabindTestUtil;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 // [databind#3102]
 public class RecordTypeInfo3342Test extends DatabindTestUtil
@@ -39,6 +42,36 @@ public record Example(
             })
             SpiceTolerance tolerance) { }
 
+    // Test from https://github.com/FasterXML/jackson-modules-base/pull/249
+
+    static record RootRecord249(AbstractMember249 member) {
+    }
+
+    @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "@class")
+    @JsonSubTypes({
+        @JsonSubTypes.Type(value = StringMember.class, name = "string"),
+        @JsonSubTypes.Type(value = IntMember.class, name = "int")
+    })
+    static abstract class AbstractMember249 { }
+
+    static final class StringMember extends AbstractMember249 {
+        final String val;
+
+        @JsonCreator
+        public StringMember(@JsonProperty("val") String val) {
+          this.val = val;
+        }
+    }
+
+    static final class IntMember extends AbstractMember249 {
+        final int val;
+
+        @JsonCreator
+        public IntMember(@JsonProperty("val") int val) {
+            this.val = val;
+        }
+    }
+
     private final ObjectMapper MAPPER = newJsonMapper();
 
     @Test
@@ -62,4 +95,15 @@ public void testSerializeDeserializeJsonSubType_HIGH() throws Exception {
         Example value = MAPPER.readValue(json, Example.class);
         assertEquals(record, value);
     }
+
+    // Test from https://github.com/FasterXML/jackson-modules-base/pull/249
+    @Test
+    public void testDeserializeRecordWithAbstractMember() throws Exception {
+        RootRecord249 value = MAPPER.readValue(
+                "{\"member\":{\"@class\":\"string\",\"val\":\"Hello, abstract member!\"}}",
+                RootRecord249.class);
+        assertNotNull(value.member());
+        assertEquals(StringMember.class, value.member().getClass());
+        assertEquals("Hello, abstract member!", ((StringMember)value.member()).val);
+      }
 }

src/test/java/tools/jackson/databind/deser/creators/ConstructorDetectorTest.java

@@ -29,6 +29,56 @@ public SingleArgNotAnnotated(@ImplicitName("value") int value) {
         }
     }
 
+    static class SingleArgByte {
+        protected byte v;
+
+        SingleArgByte() { v = -1; }
+
+        public SingleArgByte(@ImplicitName("value") byte value) {
+            v = value;
+        }
+    }
+
+    static class SingleArgShort {
+        protected short v;
+
+        SingleArgShort() { v = -1; }
+
+        public SingleArgShort(@ImplicitName("value") short value) {
+            v = value;
+        }
+    }
+
+    static class SingleArgLong {
+        protected long v;
+
+        SingleArgLong() { v = -1; }
+
+        public SingleArgLong(@ImplicitName("value") long value) {
+            v = value;
+        }
+    }
+
+    static class SingleArgFloat {
+        protected float v;
+
+        SingleArgFloat() { v = -1.0f; }
+
+        public SingleArgFloat(@ImplicitName("value") float value) {
+            v = value;
+        }
+    }
+
+    static class SingleArgDouble {
+        protected double v;
+
+        SingleArgDouble() { v = -1.0; }
+
+        public SingleArgDouble(@ImplicitName("value") double value) {
+            v = value;
+        }
+    }
+
     static class SingleArgNoMode {
         protected int v;
 
@@ -110,6 +160,55 @@ public void test1ArgDefaultsToPropertiesNonAnnotated() throws Exception
         assertEquals(137, value.v);
     }
 
+    @Test
+    public void test1ArgDefaultsToPropertiesNonAnnotatedDecimal() throws Exception
+    {
+        SingleArgNotAnnotated value = MAPPER_PROPS.readValue(a2q("{'value' : 137.0 }"),
+            SingleArgNotAnnotated.class);
+        assertEquals(137, value.v);
+    }
+
+    @Test
+    public void test1ArgDefaultsToPropertiesByte() throws Exception
+    {
+        SingleArgByte value = MAPPER_PROPS.readValue(a2q("{'value' : -99 }"),
+            SingleArgByte.class);
+        assertEquals(-99, value.v);
+    }
+
+    @Test
+    public void test1ArgDefaultsToPropertiesShort() throws Exception
+    {
+        SingleArgShort value = MAPPER_PROPS.readValue(a2q("{'value' : 137 }"),
+            SingleArgShort.class);
+        assertEquals(137, value.v);
+    }
+
+    @Test
+    public void test1ArgDefaultsToPropertiesLong() throws Exception
+    {
+        String val = Long.toString(Long.MAX_VALUE);
+        SingleArgLong value = MAPPER_PROPS.readValue(a2q("{'value' : " + val + " }"),
+            SingleArgLong.class);
+        assertEquals(Long.MAX_VALUE, value.v);
+    }
+
+    @Test
+    public void test1ArgDefaultsToPropertiesFloat() throws Exception
+    {
+        SingleArgFloat value = MAPPER_PROPS.readValue(a2q("{'value' : 136.99 }"),
+            SingleArgFloat.class);
+        assertEquals(136.99f, value.v);
+    }
+
+    @Test
+    public void test1ArgDefaultsToPropertiesDouble() throws Exception
+    {
+        SingleArgDouble value = MAPPER_PROPS.readValue(a2q("{'value' : 999999999999999999.99 }"),
+            SingleArgDouble.class);
+        assertEquals(999999999999999999.99, value.v);
+    }
+
     @Test
     public void test1ArgDefaultsToPropertiesNoMode() throws Exception
     {