Skip to content

Commit 157c71c

Browse files
cowtowncodercowtowncoder
committed
Fix regression wrt jackson-databind chamge to exception messages for coercion
1 parent 9bf61aa commit 157c71c

File tree

2 files changed

+17
-16
lines changed

2 files changed

+17
-16
lines changed

‎afterburner/src/test/java/com/fasterxml/jackson/module/afterburner/deser/convert/CoerceFloatToIntTest.java

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import java.util.concurrent.atomic.AtomicLong;
66

77
import com.fasterxml.jackson.core.type.TypeReference;
8+
89
import com.fasterxml.jackson.databind.*;
910
import com.fasterxml.jackson.databind.cfg.CoercionAction;
1011
import com.fasterxml.jackson.databind.cfg.CoercionInputShape;
@@ -83,26 +84,26 @@ public void testLegacyFailDoubleToInt() throws Exception
8384
_verifyCoerceFail(READER_LEGACY_FAIL, Integer.class, "1.5", "java.lang.Integer");
8485
_verifyCoerceFail(READER_LEGACY_FAIL, Integer.TYPE, "1.5", "int");
8586
_verifyCoerceFail(READER_LEGACY_FAIL, IntWrapper.class, "{\"i\":-2.25 }", "int");
86-
_verifyCoerceFail(READER_LEGACY_FAIL, int[].class, "[ 2.5 ]", "element of `int[]`");
87+
_verifyCoerceFail(READER_LEGACY_FAIL, int[].class, "[ 2.5 ]", "to `int` value");
8788
}
8889

8990
public void testLegacyFailDoubleToLong() throws Exception
9091
{
9192
_verifyCoerceFail(READER_LEGACY_FAIL, Long.class, "0.5");
9293
_verifyCoerceFail(READER_LEGACY_FAIL, Long.TYPE, "-2.5");
9394
_verifyCoerceFail(READER_LEGACY_FAIL, LongWrapper.class, "{\"l\": 7.7 }");
94-
_verifyCoerceFail(READER_LEGACY_FAIL, long[].class, "[ -1.35 ]", "element of `long[]`");
95+
_verifyCoerceFail(READER_LEGACY_FAIL, long[].class, "[ -1.35 ]", "to `long` value");
9596
}
9697

9798
public void testLegacyFailDoubleToOther() throws Exception
9899
{
99100
_verifyCoerceFail(READER_LEGACY_FAIL, Short.class, "0.5");
100101
_verifyCoerceFail(READER_LEGACY_FAIL, Short.TYPE, "-2.5");
101-
_verifyCoerceFail(READER_LEGACY_FAIL, short[].class, "[ -1.35 ]", "element of `short[]`");
102+
_verifyCoerceFail(READER_LEGACY_FAIL, short[].class, "[ -1.35 ]", "to `short` value");
102103

103104
_verifyCoerceFail(READER_LEGACY_FAIL, Byte.class, "0.5");
104105
_verifyCoerceFail(READER_LEGACY_FAIL, Byte.TYPE, "-2.5");
105-
_verifyCoerceFail(READER_LEGACY_FAIL, byte[].class, "[ -1.35 ]", "element of `byte[]`");
106+
_verifyCoerceFail(READER_LEGACY_FAIL, byte[].class, "[ -1.35 ]", "to `byte` value");
106107

107108
_verifyCoerceFail(READER_LEGACY_FAIL, BigInteger.class, "25236.256");
108109

@@ -286,20 +287,20 @@ public void testCoerceConfigFailFromFloat() throws Exception
286287
_verifyCoerceFail(MAPPER_TO_FAIL, Integer.class, "1.5");
287288
_verifyCoerceFail(MAPPER_TO_FAIL, Integer.TYPE, "1.5");
288289
_verifyCoerceFail(MAPPER_TO_FAIL, IntWrapper.class, "{\"i\":-2.25 }", "int");
289-
_verifyCoerceFail(MAPPER_TO_FAIL, int[].class, "[ 2.5 ]", "element of `int[]`");
290+
_verifyCoerceFail(MAPPER_TO_FAIL, int[].class, "[ 2.5 ]", "to `int` value");
290291

291292
_verifyCoerceFail(MAPPER_TO_FAIL, Long.class, "0.5");
292293
_verifyCoerceFail(MAPPER_TO_FAIL, Long.TYPE, "-2.5");
293294
_verifyCoerceFail(MAPPER_TO_FAIL, LongWrapper.class, "{\"l\": 7.7 }");
294-
_verifyCoerceFail(MAPPER_TO_FAIL, long[].class, "[ -1.35 ]", "element of `long[]`");
295+
_verifyCoerceFail(MAPPER_TO_FAIL, long[].class, "[ -1.35 ]", "to `long` value");
295296

296297
_verifyCoerceFail(MAPPER_TO_FAIL, Short.class, "0.5");
297298
_verifyCoerceFail(MAPPER_TO_FAIL, Short.TYPE, "-2.5");
298-
_verifyCoerceFail(MAPPER_TO_FAIL, short[].class, "[ -1.35 ]", "element of `short[]`");
299+
_verifyCoerceFail(MAPPER_TO_FAIL, short[].class, "[ -1.35 ]", "to `short` value");
299300

300301
_verifyCoerceFail(MAPPER_TO_FAIL, Byte.class, "0.5");
301302
_verifyCoerceFail(MAPPER_TO_FAIL, Byte.TYPE, "-2.5");
302-
_verifyCoerceFail(MAPPER_TO_FAIL, byte[].class, "[ -1.35 ]", "element of `byte[]`");
303+
_verifyCoerceFail(MAPPER_TO_FAIL, byte[].class, "[ -1.35 ]", "to `byte` value");
303304

304305
_verifyCoerceFail(MAPPER_TO_FAIL, BigInteger.class, "25236.256");
305306
}

‎blackbird/src/test/java/com/fasterxml/jackson/module/blackbird/deser/convert/CoerceFloatToIntTest.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -85,26 +85,26 @@ public void testLegacyFailDoubleToInt() throws Exception
8585
_verifyCoerceFail(READER_LEGACY_FAIL, Integer.class, "1.5", "java.lang.Integer");
8686
_verifyCoerceFail(READER_LEGACY_FAIL, Integer.TYPE, "1.5", "int");
8787
_verifyCoerceFail(READER_LEGACY_FAIL, IntWrapper.class, "{\"i\":-2.25 }", "int");
88-
_verifyCoerceFail(READER_LEGACY_FAIL, int[].class, "[ 2.5 ]", "element of `int[]`");
88+
_verifyCoerceFail(READER_LEGACY_FAIL, int[].class, "[ 2.5 ]", "to `int` value");
8989
}
9090

9191
public void testLegacyFailDoubleToLong() throws Exception
9292
{
9393
_verifyCoerceFail(READER_LEGACY_FAIL, Long.class, "0.5");
9494
_verifyCoerceFail(READER_LEGACY_FAIL, Long.TYPE, "-2.5");
9595
_verifyCoerceFail(READER_LEGACY_FAIL, LongWrapper.class, "{\"l\": 7.7 }");
96-
_verifyCoerceFail(READER_LEGACY_FAIL, long[].class, "[ -1.35 ]", "element of `long[]`");
96+
_verifyCoerceFail(READER_LEGACY_FAIL, long[].class, "[ -1.35 ]", "to `long` value");
9797
}
9898

9999
public void testLegacyFailDoubleToOther() throws Exception
100100
{
101101
_verifyCoerceFail(READER_LEGACY_FAIL, Short.class, "0.5");
102102
_verifyCoerceFail(READER_LEGACY_FAIL, Short.TYPE, "-2.5");
103-
_verifyCoerceFail(READER_LEGACY_FAIL, short[].class, "[ -1.35 ]", "element of `short[]`");
103+
_verifyCoerceFail(READER_LEGACY_FAIL, short[].class, "[ -1.35 ]", "to `short` value");
104104

105105
_verifyCoerceFail(READER_LEGACY_FAIL, Byte.class, "0.5");
106106
_verifyCoerceFail(READER_LEGACY_FAIL, Byte.TYPE, "-2.5");
107-
_verifyCoerceFail(READER_LEGACY_FAIL, byte[].class, "[ -1.35 ]", "element of `byte[]`");
107+
_verifyCoerceFail(READER_LEGACY_FAIL, byte[].class, "[ -1.35 ]", "to `byte` value");
108108

109109
_verifyCoerceFail(READER_LEGACY_FAIL, BigInteger.class, "25236.256");
110110

@@ -288,20 +288,20 @@ public void testCoerceConfigFailFromFloat() throws Exception
288288
_verifyCoerceFail(MAPPER_TO_FAIL, Integer.class, "1.5");
289289
_verifyCoerceFail(MAPPER_TO_FAIL, Integer.TYPE, "1.5");
290290
_verifyCoerceFail(MAPPER_TO_FAIL, IntWrapper.class, "{\"i\":-2.25 }", "int");
291-
_verifyCoerceFail(MAPPER_TO_FAIL, int[].class, "[ 2.5 ]", "element of `int[]`");
291+
_verifyCoerceFail(MAPPER_TO_FAIL, int[].class, "[ 2.5 ]", "to `int` value");
292292

293293
_verifyCoerceFail(MAPPER_TO_FAIL, Long.class, "0.5");
294294
_verifyCoerceFail(MAPPER_TO_FAIL, Long.TYPE, "-2.5");
295295
_verifyCoerceFail(MAPPER_TO_FAIL, LongWrapper.class, "{\"l\": 7.7 }");
296-
_verifyCoerceFail(MAPPER_TO_FAIL, long[].class, "[ -1.35 ]", "element of `long[]`");
296+
_verifyCoerceFail(MAPPER_TO_FAIL, long[].class, "[ -1.35 ]", "to `long` value");
297297

298298
_verifyCoerceFail(MAPPER_TO_FAIL, Short.class, "0.5");
299299
_verifyCoerceFail(MAPPER_TO_FAIL, Short.TYPE, "-2.5");
300-
_verifyCoerceFail(MAPPER_TO_FAIL, short[].class, "[ -1.35 ]", "element of `short[]`");
300+
_verifyCoerceFail(MAPPER_TO_FAIL, short[].class, "[ -1.35 ]", "to `short` value");
301301

302302
_verifyCoerceFail(MAPPER_TO_FAIL, Byte.class, "0.5");
303303
_verifyCoerceFail(MAPPER_TO_FAIL, Byte.TYPE, "-2.5");
304-
_verifyCoerceFail(MAPPER_TO_FAIL, byte[].class, "[ -1.35 ]", "element of `byte[]`");
304+
_verifyCoerceFail(MAPPER_TO_FAIL, byte[].class, "[ -1.35 ]", "to `byte` value");
305305

306306
_verifyCoerceFail(MAPPER_TO_FAIL, BigInteger.class, "25236.256");
307307
}

0 commit comments

Comments
 (0)