Merge branch '2.18' into 2.19

Author: cowtowncoder

release-notes/VERSION-2.x

@@ -54,6 +54,7 @@ Project: jackson-databind
 #4790: Fix `@JsonAnySetter` issue with "setter" method (related to #4639)
  (reported by @bsa01)
  (fix by Joo-Hyuk K)
+#4807: Improve `FactoryBasedEnumDeserializer` to work better with XML module
 
 2.18.1 (28-Oct-2024)
 

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

@@ -164,7 +164,11 @@ public Object deserialize(JsonParser p, DeserializationContext ctxt) throws IOEx
             if (unwrapping) {
                 t = p.nextToken();
             }
-            if ((t == null) || !t.isScalarValue()) {
+            // 24-Nov-2024, tatu: New! "Scalar from Object" (mostly for XML) -- see
+            //   https://github.com/FasterXML/jackson-databind/issues/4807
+            if (t == JsonToken.START_OBJECT) {
+                value = ctxt.extractScalarFromObject(p, this, _valueClass);
+            } else if ((t == null) || !t.isScalarValue()) {
                 // Could argue we should throw an exception but...
                 // 01-Jun-2023, tatu: And now we will finally do it!
                 final JavaType targetType = getValueType(ctxt);