Add test, fix #5271 (#5282)

cowtowncoder · web-flow · commit d4220ed27198 · 2025-08-27T15:27:20.000-07:00
diff --git a/release-notes/CREDITS-2.x b/release-notes/CREDITS-2.x
@@ -1969,3 +1969,8 @@ Plamen Tanov (@ptanov)
  * Reported #2678: `@JacksonInject` added to property overrides value from the JSON
    even if `useInput` is `OptBoolean.TRUE`
   (2.20.0)
+
+Michael Reiche (@mikereiche)
+ * Reported #5271: `EnumDeserializer` fails to deserialize Enums with @JsonValue - uses table
+   with name() key instead of @JsonValue key
+  (2.20.0)
diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -23,6 +23,9 @@ Not yet released
 #5242: Support "binary vectors": `@JsonFormat(shape = Shape.BINARY)` for
   `float[]`, `double[]`
 #5257: Deprecate `URL`-taking `readValue()` methods in `ObjectMapper`, `ObjectReader`
+#5271: `EnumDeserializer` fails to deserialize Enums with @JsonValue - uses table
+  with name() key instead of @JsonValue key
+ (reported by Michael R)
 
 2.20.0-rc1 (04-Aug-2025)
 
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
@@ -67,6 +67,14 @@ public class EnumDeserializer
      */
     protected final boolean _isFromIntValue;
 
+    /**
+     * Marker flag that indicates whether the Enum class has {@code @JsonValue}
+     * annotated accessor (or equivalent), used to populate {@link #_lookupByName}.
+     *
+     * @since 2.20
+     */
+    protected final boolean _hasAsValueAnnotation;
+
     /**
      * Look up map with <b>key</b> as <code>Enum.name()</code> converted by
      * {@link EnumNamingStrategy#convertEnumToExternalName(String)}
@@ -96,6 +104,7 @@ public EnumDeserializer(EnumResolver byNameResolver, boolean caseInsensitive,
     {
         super(byNameResolver.getEnumClass());
         _lookupByName = byNameResolver.constructLookup();
+        _hasAsValueAnnotation = byNameResolver.hasAsValueAnnotation();
         _enumsByIndex = byNameResolver.getRawEnums();
         _enumDefaultValue = byNameResolver.getDefaultValue();
         _caseInsensitive = caseInsensitive;
@@ -112,6 +121,7 @@ public EnumDeserializer(EnumResolver byNameResolver, boolean caseInsensitive,
     {
         super(byNameResolver.getEnumClass());
         _lookupByName = byNameResolver.constructLookup();
+        _hasAsValueAnnotation = byNameResolver.hasAsValueAnnotation();
         _enumsByIndex = byNameResolver.getRawEnums();
         _enumDefaultValue = byNameResolver.getDefaultValue();
         _caseInsensitive = caseInsensitive;
@@ -128,6 +138,7 @@ protected EnumDeserializer(EnumDeserializer base, Boolean caseInsensitive,
     {
         super(base);
         _lookupByName = base._lookupByName;
+        _hasAsValueAnnotation = base._hasAsValueAnnotation;
         _enumsByIndex = base._enumsByIndex;
         _enumDefaultValue = base._enumDefaultValue;
         _caseInsensitive = Boolean.TRUE.equals(caseInsensitive);
@@ -138,15 +149,6 @@ protected EnumDeserializer(EnumDeserializer base, Boolean caseInsensitive,
         _lookupByToString = base._lookupByToString;
     }
 
-    /**
-     * @since 2.9
-     * @deprecated Since 2.15
-     */
-    @Deprecated
-    protected EnumDeserializer(EnumDeserializer base, Boolean caseInsensitive) {
-        this(base, caseInsensitive, null, null);
-    }
-
     /**
      * Factory method used when Enum instances are to be deserialized
      * using a creator (static factory method)
@@ -318,9 +320,10 @@ private CompactStringObjectMap _resolveCurrentLookup(DeserializationContext ctxt
         if (_lookupByEnumNaming != null) {
             return _lookupByEnumNaming;
         }
-        return ctxt.isEnabled(DeserializationFeature.READ_ENUMS_USING_TO_STRING)
-            ? _getToStringLookup(ctxt)
-            : _lookupByName;
+        if (_hasAsValueAnnotation || !ctxt.isEnabled(DeserializationFeature.READ_ENUMS_USING_TO_STRING)) {
+            return _lookupByName;
+        }
+        return _getToStringLookup(ctxt);
     }
 
     protected Object _fromInteger(JsonParser p, DeserializationContext ctxt,
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/std/StdKeyDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/std/StdKeyDeserializer.java
@@ -450,10 +450,11 @@ protected EnumResolver _resolveCurrentResolver(DeserializationContext ctxt) {
             if (_byEnumNamingResolver != null) {
                 return _byEnumNamingResolver;
             }
-            if (ctxt.isEnabled(DeserializationFeature.READ_ENUMS_USING_TO_STRING)) {
-                return  _getToStringResolver(ctxt);
+            if (_byNameResolver.hasAsValueAnnotation()
+                    || !ctxt.isEnabled(DeserializationFeature.READ_ENUMS_USING_TO_STRING)) {
+                return _byNameResolver;
             }
-            return _byNameResolver;
+            return  _getToStringResolver(ctxt);
         }
         
         /**
diff --git a/src/main/java/com/fasterxml/jackson/databind/util/EnumResolver.java b/src/main/java/com/fasterxml/jackson/databind/util/EnumResolver.java
@@ -44,25 +44,47 @@ public class EnumResolver implements java.io.Serializable
      */
     protected final boolean _isFromIntValue;
 
+    /**
+     * Marker for case where enum values to match are from {@code @JsonValue}-annotated
+     * method.
+     *
+     * @since 2.20
+     */
+    protected final boolean _hasAsValueAnnotation;
+
     /*
     /**********************************************************************
     /* Constructors
     /**********************************************************************
      */
 
     /**
-     * @since 2.12
+     * @since 2.20
      */
     protected EnumResolver(Class<Enum<?>> enumClass, Enum<?>[] enums,
             HashMap<String, Enum<?>> map, Enum<?> defaultValue,
-            boolean isIgnoreCase, boolean isFromIntValue)
+            boolean isIgnoreCase, boolean isFromIntValue,
+            boolean hasAsValueAnnotation)
     {
         _enumClass = enumClass;
         _enums = enums;
         _enumsById = map;
         _defaultValue = defaultValue;
         _isIgnoreCase = isIgnoreCase;
         _isFromIntValue = isFromIntValue;
+        _hasAsValueAnnotation = hasAsValueAnnotation;
+    }
+
+    /**
+     * @since 2.12
+     * @deprecated Since 2.20; use variant that also takes {@code hasAsValueAnnotation} argument
+     */
+    @Deprecated
+    protected EnumResolver(Class<Enum<?>> enumClass, Enum<?>[] enums,
+            HashMap<String, Enum<?>> map, Enum<?> defaultValue,
+            boolean isIgnoreCase, boolean isFromIntValue)
+    {
+        this(enumClass, enums, map, defaultValue, isIgnoreCase, isFromIntValue, false);
     }
 
     /*
@@ -98,7 +120,7 @@ public static EnumResolver constructFor(DeserializationConfig config,
         ai.findEnumAliases(config, annotatedClass, enumConstants, allAliases);
 
         // finally, build
-        HashMap<String, Enum<?>> map = new HashMap<String, Enum<?>>();
+        HashMap<String, Enum<?>> map = new HashMap<>();
         for (int i = 0, len = enumConstants.length; i < len; ++i) {
             final Enum<?> enumValue = enumConstants[i];
             String name = names[i];
@@ -116,7 +138,7 @@ public static EnumResolver constructFor(DeserializationConfig config,
         }
         return new EnumResolver(enumCls, enumConstants, map,
                 _enumDefault(ai, annotatedClass, enumConstants),
-                isIgnoreCase, false);
+                isIgnoreCase, false, false);
     }
 
     /**
@@ -163,7 +185,7 @@ public static EnumResolver constructUsingToString(DeserializationConfig config,
         }
         return new EnumResolver(enumCls, enumConstants, map,
                 _enumDefault(ai, annotatedClass, enumConstants),
-                isIgnoreCase, false);
+                isIgnoreCase, false, false);
     }
 
     /**
@@ -191,7 +213,7 @@ public static EnumResolver constructUsingIndex(DeserializationConfig config,
         }
         return new EnumResolver(enumCls, enumConstants, map,
                 _enumDefault(ai, annotatedClass, enumConstants),
-                isIgnoreCase, false);
+                isIgnoreCase, false, false);
     }
 
     /**
@@ -238,7 +260,7 @@ public static EnumResolver constructUsingEnumNamingStrategy(DeserializationConfi
 
         return new EnumResolver(enumCls, enumConstants, map,
                 _enumDefault(ai, annotatedClass, enumConstants),
-                isIgnoreCase, false);
+                isIgnoreCase, false, false);
     }
 
     /**
@@ -275,7 +297,8 @@ public static EnumResolver constructUsingMethod(DeserializationConfig config,
                 _enumDefault(ai, annotatedClass, enumConstants),
                 isIgnoreCase,
                 // 26-Sep-2021, tatu: [databind#1850] Need to consider "from int" case
-                _isIntType(accessor.getRawType())
+                _isIntType(accessor.getRawType()),
+                true
         );
     }
 
@@ -388,5 +411,15 @@ public Collection<String> getEnumIds() {
     public boolean isFromIntValue() {
         return _isFromIntValue;
     }
+
+    /**
+     * Accessor for checking whether {@code @JsonValue} annotated accessor is used
+     * to get enum values to use for deserialization.
+     *
+     * @since 2.20
+     */
+    public boolean hasAsValueAnnotation() {
+        return _hasAsValueAnnotation;
+    }
 }
 
diff --git a/src/test/java/com/fasterxml/jackson/databind/deser/enums/EnumDeserializerJsonValue5271Test.java b/src/test/java/com/fasterxml/jackson/databind/deser/enums/EnumDeserializerJsonValue5271Test.java
@@ -0,0 +1,41 @@
+package com.fasterxml.jackson.databind.deser.enums;
+
+import org.junit.jupiter.api.Test;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class EnumDeserializerJsonValue5271Test extends DatabindTestUtil
+{
+    enum Enum5271 {
+        T10("10%"), T20("20%"), T30("30%");
+
+        private final String code;
+
+        Enum5271(String code) {
+            this.code = code;
+        }
+
+        @JsonValue
+        public String getCode() {
+            return code;
+        }
+    }
+
+    private final ObjectReader ENUM_READER = newJsonMapper().readerFor(Enum5271.class);
+
+    // [databind#5271]
+    @Test
+    void convertStringToEnum() throws Exception {
+        _testConvert(ENUM_READER.without(DeserializationFeature.READ_ENUMS_USING_TO_STRING));
+        _testConvert(ENUM_READER.with(DeserializationFeature.READ_ENUMS_USING_TO_STRING));
+    }
+
+    private void _testConvert(ObjectReader reader) throws Exception {
+        assertEquals(Enum5271.T20, reader.readValue(q("20%")));
+    }
+}
diff --git a/src/test/java/com/fasterxml/jackson/databind/ser/enums/EnumAsMapKeyTest.java b/src/test/java/com/fasterxml/jackson/databind/ser/enums/EnumAsMapKeyTest.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.ser;
+package com.fasterxml.jackson.databind.ser.enums;
 
 import java.io.IOException;
 import java.util.*;
@@ -142,8 +142,12 @@ public void testJsonValueForEnumMapKeySer() throws Exception {
 
     @Test
     public void testJsonValueForEnumMapKeyDeser() throws Exception {
-        MyStuff594 result = MAPPER.readValue(a2q("{'stuff':{'longValue':'foo'}}"),
-                MyStuff594.class);
+        final String json = a2q("{'stuff':{'longValue':'foo'}}");
+        ObjectReader r = MAPPER.readerFor(MyStuff594.class);
+        MyStuff594 result = r.with(DeserializationFeature.READ_ENUMS_USING_TO_STRING).readValue(json);
+        assertEquals("foo", result.stuff.get(MyEnum594.VALUE_WITH_A_REALLY_LONG_NAME_HERE));
+
+        result = r.without(DeserializationFeature.READ_ENUMS_USING_TO_STRING).readValue(json);
         assertEquals("foo", result.stuff.get(MyEnum594.VALUE_WITH_A_REALLY_LONG_NAME_HERE));
     }
 

Original file line number	Diff line number	Diff line change
`@@ -450,10 +450,11 @@ protected EnumResolver _resolveCurrentResolver(DeserializationContext ctxt) {`
`450`	`450`	`if (_byEnumNamingResolver != null) {`
`451`	`451`	`return _byEnumNamingResolver;`
`452`	`452`	`}`
`453`		`- if (ctxt.isEnabled(DeserializationFeature.READ_ENUMS_USING_TO_STRING)) {`
`454`		`- return _getToStringResolver(ctxt);`
	`453`	`+ if (_byNameResolver.hasAsValueAnnotation()`
	`454`	`+ \|\| !ctxt.isEnabled(DeserializationFeature.READ_ENUMS_USING_TO_STRING)) {`
	`455`	`+ return _byNameResolver;`
`455`	`456`	`}`
`456`		`- return _byNameResolver;`
	`457`	`+ return _getToStringResolver(ctxt);`
`457`	`458`	`}`
`458`	`459`
`459`	`460`	`/**`