Merge branch '2.15' into 2.16

k163377 · Jun 15, 2024 · d3969f8 · d3969f8
2 parents ee39f3e + 6660ca1
commit d3969f8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -5,14 +5,16 @@ Project: jackson-databind
 ------------------------------------------------------------------------
 
 2.17.0 (not yet released)
+Not yet released:
 
--
 
 2.16.3 (not yet released)
 
 #4564: Possible 2.16.0 Enum-as-JSON-Object serialization regression
  (reported by Guillaume J)
  (fix contributed by Joo-Hyuk K)
+#4581: Incompatible Constructor Parameter Type in `EnumDeserializer`
+ (reported by @Hunter-Lam)
 
 2.16.2 (09-Mar-2024)
 

diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/std/EnumDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/std/EnumDeserializer.java
@@ -2,6 +2,7 @@
 
 import java.io.IOException;
 import java.util.Objects;
+import java.util.Optional;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 
@@ -19,7 +20,6 @@
 import com.fasterxml.jackson.databind.util.ClassUtil;
 import com.fasterxml.jackson.databind.util.CompactStringObjectMap;
 import com.fasterxml.jackson.databind.util.EnumResolver;
-import java.util.Optional;
 
 /**
  * Deserializer class that can deserialize instances of
@@ -83,7 +83,7 @@ public class EnumDeserializer
     @Deprecated
     public EnumDeserializer(EnumResolver byNameResolver, Boolean caseInsensitive)
     {
-        this(byNameResolver, caseInsensitive, null, null);
+        this(byNameResolver, Boolean.TRUE.equals(caseInsensitive), null);
     }
 
     /**
@@ -92,7 +92,7 @@ public EnumDeserializer(EnumResolver byNameResolver, Boolean caseInsensitive)
      */
     @Deprecated
     public EnumDeserializer(EnumResolver byNameResolver, boolean caseInsensitive,
-                            EnumResolver byEnumNamingResolver)
+            EnumResolver byEnumNamingResolver)
     {
         super(byNameResolver.getEnumClass());
         _lookupByName = byNameResolver.constructLookup();
@@ -108,7 +108,7 @@ public EnumDeserializer(EnumResolver byNameResolver, boolean caseInsensitive,
      * @since 2.16
      */
     public EnumDeserializer(EnumResolver byNameResolver, boolean caseInsensitive,
-                            EnumResolver byEnumNamingResolver, EnumResolver toStringResolver)
+            EnumResolver byEnumNamingResolver, EnumResolver toStringResolver)
     {
         super(byNameResolver.getEnumClass());
         _lookupByName = byNameResolver.constructLookup();
@@ -130,7 +130,7 @@ protected EnumDeserializer(EnumDeserializer base, Boolean caseInsensitive,
         _lookupByName = base._lookupByName;
         _enumsByIndex = base._enumsByIndex;
         _enumDefaultValue = base._enumDefaultValue;
-        _caseInsensitive = caseInsensitive;
+        _caseInsensitive = Boolean.TRUE.equals(caseInsensitive);
         _isFromIntValue = base._isFromIntValue;
         _useDefaultValueForUnknownEnum = useDefaultValueForUnknownEnum;
         _useNullForUnknownEnum = useNullForUnknownEnum;