Skip to content

Commit 622ebea

Browse files
committed
Merge branch '2.19'
2 parents ff3a9d6 + a847848 commit 622ebea

File tree

4 files changed

+32
-3
lines changed

4 files changed

+32
-3
lines changed

.github/workflows/dep_build_v2.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
steps:
2222
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2323
- name: Set up JDK
24-
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
24+
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
2525
with:
2626
distribution: 'temurin'
2727
java-version: ${{ matrix.java_version }}

.github/workflows/dep_build_v3.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
with:
2424
ref: master
2525
- name: Set up JDK
26-
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
26+
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
2727
with:
2828
distribution: 'temurin'
2929
java-version: ${{ matrix.java_version }}

.github/workflows/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
steps:
3333
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3434
- name: Set up JDK
35-
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
35+
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
3636
with:
3737
distribution: 'temurin'
3838
java-version: ${{ matrix.java_version }}

src/test/java/tools/jackson/dataformat/xml/deser/NumberDeserWithXMLTest.java

+29
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,24 @@ static class NestedFloatHolder2784 {
7575
public FloatHolder2784 holder;
7676
}
7777

78+
static class DeserializationIssue4917 {
79+
public DecimalHolder4917 decimalHolder;
80+
public double number;
81+
}
82+
83+
static class DecimalHolder4917 {
84+
public BigDecimal value;
85+
86+
private DecimalHolder4917(BigDecimal value) {
87+
this.value = value;
88+
}
89+
90+
@JsonCreator(mode = JsonCreator.Mode.DELEGATING)
91+
static DecimalHolder4917 of(BigDecimal value) {
92+
return new DecimalHolder4917(value);
93+
}
94+
}
95+
7896
/*
7997
/**********************************************************************
8098
/* Test methods
@@ -162,4 +180,15 @@ public void testVeryBigDecimalUnwrappedWithUnlimitedNumLength() throws Exception
162180
NestedBigDecimalHolder2784 result = new XmlMapper(f).readValue(DOC, NestedBigDecimalHolder2784.class);
163181
assertEquals(new BigDecimal(value), result.holder.value);
164182
}
183+
184+
// [databind#4917]
185+
@Test
186+
public void bigDecimal4917() throws Exception
187+
{
188+
DeserializationIssue4917 issue = MAPPER.readValue(
189+
"<root><decimalHolder>100.00</decimalHolder><number>50</number></root>",
190+
DeserializationIssue4917.class);
191+
assertEquals(new BigDecimal("100.00"), issue.decimalHolder.value);
192+
assertEquals(50.0, issue.number);
193+
}
165194
}

0 commit comments

Comments
 (0)