Minor tweak to #1520: move case-insensitive feature as MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS

Author: cowtowncoder

release-notes/VERSION

@@ -62,7 +62,7 @@ Project: jackson-databind
 #1474: Replace use of `Class.newInstance()` (deprecated in Java 9) with call via Constructor
 #1480: Add support for serializing `boolean`/`Boolean` as number (0 or 1)
  (suggested by jwilmoth@github)
-#1520: Case insensitive enum deserialization feature.
+#1520: Case insensitive enum deserialization with `MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS`
  (contributed by Ana-Eliza B)
 #1544: EnumMapDeserializer assumes a pure EnumMap and does not support EnumMap derived classes
  (reported by Lyor G)

src/main/java/com/fasterxml/jackson/databind/DeserializationFeature.java

@@ -365,18 +365,6 @@ public enum DeserializationFeature implements ConfigFeature
      */
     READ_ENUMS_USING_TO_STRING(false),
 
-    /**
-     * Feature that determines if Enum deserialization should be case sensitive or not.
-     * If enabled, Enum deserialization will ignore case, that is, case of incoming String
-     * value and enum id (dependant on other settings, either `name()`, `toString()`, or
-     * explicit override) do not need to match.
-     * <p>
-     * Feature is disabled by default.
-     *
-     * @since 2.9
-     */
-    READ_ENUMS_IGNORING_CASE(false),
-    
     /**
      * Feature that allows unknown Enum values to be parsed as null values. 
      * If disabled, unknown Enum values will throw exceptions.

src/main/java/com/fasterxml/jackson/databind/MapperFeature.java

@@ -338,6 +338,7 @@ public enum MapperFeature implements ConfigFeature
     /* Name-related features
     /******************************************************
      */
+
     /**
      * Feature that will allow for more forgiving deserialization of incoming JSON.
      * If enabled, the bean properties will be matched using their lower-case equivalents,
@@ -353,7 +354,20 @@ public enum MapperFeature implements ConfigFeature
      * @since 2.5
      */
     ACCEPT_CASE_INSENSITIVE_PROPERTIES(false),
-    
+
+
+    /**
+     * Feature that determines if Enum deserialization should be case sensitive or not.
+     * If enabled, Enum deserialization will ignore case, that is, case of incoming String
+     * value and enum id (dependant on other settings, either `name()`, `toString()`, or
+     * explicit override) do not need to match.
+     * <p>
+     * Feature is disabled by default.
+     *
+     * @since 2.9
+     */
+    ACCEPT_CASE_INSENSITIVE_ENUMS(false),
+
     /**
      * Feature that can be enabled to make property names be
      * overridden by wrapper name (usually detected with annotations

src/main/java/com/fasterxml/jackson/databind/deser/BasicDeserializerFactory.java

@@ -1276,7 +1276,8 @@ public JsonDeserializer<?> createEnumDeserializer(DeserializationContext ctxt,
             // Need to consider @JsonValue if one found
             if (deser == null) {
                 deser = new EnumDeserializer(constructEnumResolver(enumClass,
-                        config, beanDesc.findJsonValueAccessor()));
+                        config, beanDesc.findJsonValueAccessor()),
+                        config.isEnabled(MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS));
             }
         }
 

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

@@ -49,13 +49,16 @@ public class EnumDeserializer
 
     protected final Boolean _caseInsensitive;
 
-    public EnumDeserializer(EnumResolver byNameResolver)
+    /**
+     * @since 2.9
+     */
+    public EnumDeserializer(EnumResolver byNameResolver, Boolean caseInsensitive)
     {
         super(byNameResolver.getEnumClass());
         _lookupByName = byNameResolver.constructLookup();
         _enumsByIndex = byNameResolver.getRawEnums();
         _enumDefaultValue = byNameResolver.getDefaultValue();
-        _caseInsensitive = false;
+        _caseInsensitive = caseInsensitive;
     }
 
     /**
@@ -70,6 +73,14 @@ protected EnumDeserializer(EnumDeserializer base, Boolean caseInsensitive)
         _caseInsensitive = caseInsensitive;
     }
 
+    /**
+     * @deprecated Since 2.9
+     */
+    @Deprecated
+    public EnumDeserializer(EnumResolver byNameResolver) {
+        this(byNameResolver, null);
+    }
+    
     /**
      * @deprecated Since 2.8
      */
@@ -134,6 +145,9 @@ public JsonDeserializer<?> createContextual(DeserializationContext ctxt,
     {
         Boolean caseInsensitive = findFormatFeature(ctxt, property, handledType(),
                 JsonFormat.Feature.ACCEPT_CASE_INSENSITIVE_PROPERTIES);
+        if (caseInsensitive == null) {
+            caseInsensitive = _caseInsensitive;
+        }
         return withResolved(caseInsensitive);
     }
 
@@ -208,9 +222,7 @@ private final Object _deserializeAltString(JsonParser p, DeserializationContext
             }
         } else {
             // [databind#1313]: Case insensitive enum deserialization
-            if ((_caseInsensitive == Boolean.TRUE) ||
-                    ((_caseInsensitive == null) &&
-                            ctxt.isEnabled(DeserializationFeature.READ_ENUMS_IGNORING_CASE))) {
+            if (Boolean.TRUE.equals(_caseInsensitive)) {
                 Object match = lookup.findCaseInsensitive(name);
                 if (match != null) {
                     return match;

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

@@ -1,19 +1,12 @@
 package com.fasterxml.jackson.databind.deser.std;
 
 import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
 
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.BeanProperty;
-import com.fasterxml.jackson.databind.DeserializationConfig;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.MapperFeature;
+
+import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.deser.ContextualDeserializer;
 import com.fasterxml.jackson.databind.deser.SettableBeanProperty;
 import com.fasterxml.jackson.databind.deser.ValueInstantiator;
@@ -197,14 +190,11 @@ public void wrapAndThrow(Throwable t, Object bean, String fieldName, Deserializa
 
     private Throwable throwOrReturnThrowable(Throwable t, DeserializationContext ctxt) throws IOException
     {
-        while (t instanceof InvocationTargetException && t.getCause() != null) {
-            t = t.getCause();
-        }
+        t = ClassUtil.getRootCause(t);
         // Errors to be passed as is
         ClassUtil.throwIfError(t);
         boolean wrap = (ctxt == null) || ctxt.isEnabled(DeserializationFeature.WRAP_EXCEPTIONS);
-        // Ditto for IOExceptions; except we may want to wrap JSON
-        // exceptions
+        // Ditto for IOExceptions; except we may want to wrap JSON exceptions
         if (t instanceof IOException) {
             if (!wrap || !(t instanceof JsonProcessingException)) {
                 throw (IOException) t;

src/main/java/com/fasterxml/jackson/databind/util/ClassUtil.java

@@ -18,24 +18,8 @@ public final class ClassUtil
 
     private final static Annotation[] NO_ANNOTATIONS = new Annotation[0];
     private final static Ctor[] NO_CTORS = new Ctor[0];
-    
-    /*
-    /**********************************************************
-    /* Helper classes
-    /**********************************************************
-     */
 
-    /* 21-Feb-2016, tatu: Unfortunately `Collections.emptyIterator()` only
-     *   comes with JDK7, so we'll still have to include our bogus implementation
-     *   for as long as we want JDK6 runtime compatibility
-     */
-    private final static class EmptyIterator<T> implements Iterator<T> {
-        @Override public boolean hasNext() { return false; }
-        @Override public T next() { throw new NoSuchElementException(); }
-        @Override public void remove() { throw new UnsupportedOperationException(); }
-    }
-    
-    private final static EmptyIterator<?> EMPTY_ITERATOR = new EmptyIterator<Object>();
+    private final static Iterator<?> EMPTY_ITERATOR = Collections.emptyIterator();
 
     /*
     /**********************************************************
@@ -48,8 +32,6 @@ private final static class EmptyIterator<T> implements Iterator<T> {
      */
     @SuppressWarnings("unchecked")
     public static <T> Iterator<T> emptyIterator() {
-// 21-Feb-2016, tatu: As per above, use a locally defined empty iterator
-//        return Collections.emptyIterator();
         return (Iterator<T>) EMPTY_ITERATOR;
     }
 
@@ -328,52 +310,6 @@ public static void verifyMustOverride(Class<?> expType, Object instance,
                 instance.getClass().getName(), expType.getName(), method));
         }
     }
-    
-    /*
-    /**********************************************************
-    /* Class loading
-    /**********************************************************
-     */
-
-    /**
-     * @deprecated Since 2.6, use method in {@link com.fasterxml.jackson.databind.type.TypeFactory}.
-     */
-    @Deprecated
-    public static Class<?> findClass(String className) throws ClassNotFoundException
-    {
-        // [JACKSON-597]: support primitive types (and void)
-        if (className.indexOf('.') < 0) {
-            if ("int".equals(className)) return Integer.TYPE;
-            if ("long".equals(className)) return Long.TYPE;
-            if ("float".equals(className)) return Float.TYPE;
-            if ("double".equals(className)) return Double.TYPE;
-            if ("boolean".equals(className)) return Boolean.TYPE;
-            if ("byte".equals(className)) return Byte.TYPE;
-            if ("char".equals(className)) return Character.TYPE;
-            if ("short".equals(className)) return Short.TYPE;
-            if ("void".equals(className)) return Void.TYPE;
-        }
-        // Two-phase lookup: first using context ClassLoader; then default
-        Throwable prob = null;
-        ClassLoader loader = Thread.currentThread().getContextClassLoader();
-        
-        if (loader != null) {
-            try {
-                return Class.forName(className, true, loader);
-            } catch (Exception e) {
-                prob = getRootCause(e);
-            }
-        }
-        try {
-            return Class.forName(className);
-        } catch (Exception e) {
-            if (prob == null) {
-                prob = getRootCause(e);
-            }
-        }
-        throwIfRTE(prob);
-        throw new ClassNotFoundException(prob.getMessage(), prob);
-    }
 
     /*
     /**********************************************************

src/test/java/com/fasterxml/jackson/databind/deser/jdk/EnumAltIdTest.java

@@ -7,6 +7,7 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.BaseMapTest;
 import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectReader;
 import com.fasterxml.jackson.databind.exc.InvalidFormatException;
@@ -40,11 +41,15 @@ protected static class StrictCaseBean {
      */
 
     protected final ObjectMapper MAPPER = new ObjectMapper();
+    protected final ObjectMapper MAPPER_IGNORE_CASE;
+    {
+        MAPPER_IGNORE_CASE = new ObjectMapper();
+        MAPPER_IGNORE_CASE.enable(MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS);
+    }
 
     protected final ObjectReader READER_DEFAULT = MAPPER.reader();
-    protected final ObjectReader READER_IGNORE_CASE = MAPPER
-            .reader(DeserializationFeature.READ_ENUMS_IGNORING_CASE);
-            
+    protected final ObjectReader READER_IGNORE_CASE = MAPPER_IGNORE_CASE.reader();
+
     // Tests for [databind#1313], case-insensitive
 
     public void testFailWhenCaseSensitiveAndNameIsNotUpperCase() throws IOException {
@@ -73,9 +78,8 @@ public void testEnumDesIgnoringCaseWithLowerCaseContent() throws IOException {
     }
 
     public void testEnumDesIgnoringCaseWithUpperCaseToString() throws IOException {
-        ObjectReader r = MAPPER.readerFor(LowerCaseEnum.class)
-                .with(DeserializationFeature.READ_ENUMS_USING_TO_STRING,
-                        DeserializationFeature.READ_ENUMS_IGNORING_CASE);
+        ObjectReader r = MAPPER_IGNORE_CASE.readerFor(LowerCaseEnum.class)
+                .with(DeserializationFeature.READ_ENUMS_USING_TO_STRING);
         assertEquals(LowerCaseEnum.A, r.readValue("\"A\""));
     }
 

src/test/java/com/fasterxml/jackson/databind/util/ClassUtilTest.java

@@ -200,18 +200,4 @@ public void testDescs()
         assertEquals(exp, ClassUtil.getClassDescription("foo"));
         assertEquals(exp, ClassUtil.getClassDescription(String.class));
     }
-
-    @SuppressWarnings("deprecation")
-    public void testFindClass() throws Exception
-    {
-        assertEquals(Integer.TYPE, ClassUtil.findClass("int"));
-        assertEquals(Long.TYPE, ClassUtil.findClass("long"));
-        assertEquals(Byte.TYPE, ClassUtil.findClass("byte"));
-        assertEquals(Short.TYPE, ClassUtil.findClass("short"));
-        assertEquals(Character.TYPE, ClassUtil.findClass("char"));
-        assertEquals(Float.TYPE, ClassUtil.findClass("float"));
-        assertEquals(Double.TYPE, ClassUtil.findClass("double"));
-        assertEquals(Boolean.TYPE, ClassUtil.findClass("boolean"));
-        assertEquals(Void.TYPE, ClassUtil.findClass("void"));
-    }
 }