Merge branch '2.19'

Author: cowtowncoder

cbor/src/test/java/tools/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 tools.jackson.core.JsonToken;
 import tools.jackson.core.JsonGenerator;
@@ -51,6 +53,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
@@ -259,4 +281,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);
+    }
 }

smile/src/test/java/tools/jackson/dataformat/smile/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 tools.jackson.core.JsonToken;
 import tools.jackson.core.JsonParser;
@@ -45,6 +47,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
@@ -208,4 +230,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);
+    }
 }