Skip to content

Commit 451b000

Browse files
committed
Merge branch '2.17' into 2.18
2 parents 034c9d8 + 8d96e83 commit 451b000

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

release-notes/VERSION-2.x

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,8 @@ Project: jackson-databind
142142
#4564: Possible 2.16.0 Enum-as-JSON-Object serialization regression
143143
(reported by Guillaume J)
144144
(fix contributed by Joo-Hyuk K)
145+
#4581: Incompatible Constructor Parameter Type in `EnumDeserializer`
146+
(reported by @Hunter-Lam)
145147

146148
2.16.2 (09-Mar-2024)
147149

src/main/java/com/fasterxml/jackson/databind/deser/std/EnumDeserializer.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import java.io.IOException;
44
import java.util.Objects;
5+
import java.util.Optional;
56

67
import com.fasterxml.jackson.annotation.JsonFormat;
78

@@ -19,7 +20,6 @@
1920
import com.fasterxml.jackson.databind.util.ClassUtil;
2021
import com.fasterxml.jackson.databind.util.CompactStringObjectMap;
2122
import com.fasterxml.jackson.databind.util.EnumResolver;
22-
import java.util.Optional;
2323

2424
/**
2525
* Deserializer class that can deserialize instances of
@@ -83,7 +83,7 @@ public class EnumDeserializer
8383
@Deprecated
8484
public EnumDeserializer(EnumResolver byNameResolver, Boolean caseInsensitive)
8585
{
86-
this(byNameResolver, caseInsensitive, null, null);
86+
this(byNameResolver, Boolean.TRUE.equals(caseInsensitive), null);
8787
}
8888

8989
/**
@@ -92,7 +92,7 @@ public EnumDeserializer(EnumResolver byNameResolver, Boolean caseInsensitive)
9292
*/
9393
@Deprecated
9494
public EnumDeserializer(EnumResolver byNameResolver, boolean caseInsensitive,
95-
EnumResolver byEnumNamingResolver)
95+
EnumResolver byEnumNamingResolver)
9696
{
9797
super(byNameResolver.getEnumClass());
9898
_lookupByName = byNameResolver.constructLookup();
@@ -108,7 +108,7 @@ public EnumDeserializer(EnumResolver byNameResolver, boolean caseInsensitive,
108108
* @since 2.16
109109
*/
110110
public EnumDeserializer(EnumResolver byNameResolver, boolean caseInsensitive,
111-
EnumResolver byEnumNamingResolver, EnumResolver toStringResolver)
111+
EnumResolver byEnumNamingResolver, EnumResolver toStringResolver)
112112
{
113113
super(byNameResolver.getEnumClass());
114114
_lookupByName = byNameResolver.constructLookup();
@@ -130,7 +130,7 @@ protected EnumDeserializer(EnumDeserializer base, Boolean caseInsensitive,
130130
_lookupByName = base._lookupByName;
131131
_enumsByIndex = base._enumsByIndex;
132132
_enumDefaultValue = base._enumDefaultValue;
133-
_caseInsensitive = caseInsensitive;
133+
_caseInsensitive = Boolean.TRUE.equals(caseInsensitive);
134134
_isFromIntValue = base._isFromIntValue;
135135
_useDefaultValueForUnknownEnum = useDefaultValueForUnknownEnum;
136136
_useNullForUnknownEnum = useNullForUnknownEnum;

0 commit comments

Comments
 (0)