Merge branch '2.12' into 2.13

Author: cowtowncoder

release-notes/VERSION-2.x

@@ -83,6 +83,9 @@ Project: jackson-databind
  (contributed by Abishek R)
 #3271: String property deserializes null as "null" for JsonTypeInfo.As.EXISTING_PROPERTY
  (reported by jonc2@github)
+#3280: Can not deserialize json to enum value with Object-/Array-valued input,
+  `@JsonCreator`
+ (reported by peteryuanpan@github)
 - Fix to avoid problem with `BigDecimalNode`, scale of `Integer.MIN_VALUE` (see
   [dataformats-binary#264] for details)
 - Extend handling of `FAIL_ON_NULL_FOR_PRIMITIVES` to cover coercion from (Empty) String

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

@@ -197,6 +197,7 @@ protected Object deserializeEnumUsingPropertyBased(final JsonParser p, final Des
                 continue;
             }
             // 26-Nov-2020, tatu: ... what should we do here tho?
+            p.skipChildren();
         }
         return creator.build(ctxt, buffer);
     }

src/test/java/com/fasterxml/jackson/databind/deser/creators/EnumCreatorTest.java

@@ -1,7 +1,11 @@
 package com.fasterxml.jackson.databind.deser.creators;
 
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.Collection;
+import java.util.EnumMap;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonGetter;
@@ -187,13 +191,33 @@ public String toString() {
         }
     }
 
+    // [databind#3280]
+    static enum Enum3280 {
+        x("x"),
+        y("y"),
+        z("z");
+        private final String value;
+        Enum3280(String value) {
+            this.value = value;
+        }
+        @JsonCreator
+        public static Enum3280 getByValue(@JsonProperty("b") String value) {
+            for (Enum3280 e : Enum3280.values()) {
+                if (e.value.equals(value)) {
+                    return e;
+                }
+            }
+            return null;
+        }
+    }
+
     /*
     /**********************************************************
     /* Test methods
     /**********************************************************
      */
 
-    protected final ObjectMapper MAPPER = new ObjectMapper();
+    protected final ObjectMapper MAPPER = newJsonMapper();
 
     public void testCreatorEnums() throws Exception {
         EnumWithCreator value = MAPPER.readValue("\"enumA\"", EnumWithCreator.class);
@@ -309,4 +333,15 @@ public void testMultiArgEnumInCollections() throws Exception
         assertEquals(Enum929.B, valueList.get(2));
     }
 
+    // for [databind#3280]
+    public void testPropertyCreatorEnum3280() throws Exception
+    {
+        final ObjectReader r = MAPPER.readerFor(Enum3280.class);
+        assertEquals(Enum3280.x, r.readValue("{\"b\":\"x\"}"));
+        assertEquals(Enum3280.x, r.readValue("{\"a\":\"1\", \"b\":\"x\"}"));
+        assertEquals(Enum3280.y, r.readValue("{\"b\":\"y\", \"a\":{}}"));
+        assertEquals(Enum3280.y, r.readValue("{\"b\":\"y\", \"a\":{}}"));
+        assertEquals(Enum3280.x, r.readValue("{\"a\":[], \"b\":\"x\"}"));
+        assertEquals(Enum3280.x, r.readValue("{\"a\":{}, \"b\":\"x\"}"));
+    }
 }