Merge branch '2.11' into 2.12

Author: cowtowncoder

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

@@ -212,7 +212,25 @@ protected BeanDeserializerBase(BeanDeserializerBuilder builder,
         _injectables = (injectables == null || injectables.isEmpty()) ? null
                 : injectables.toArray(new ValueInjector[injectables.size()]);
         _objectIdReader = builder.getObjectIdReader();
+
+        // If you check for canCreateFromInt() below which appears to be the equivalent
+        // of the existing canCreateUsingArrayDelegate() it also causes the included
+        // test testPOJOWithPrimitiveCreatorFromObjectRepresentation() to break in the
+        // same way as the test testPOJOWithArrayCreatorFromObjectRepresentation() which
+        // I assert is failing because of the call to canCreateUsingArrayDelegate() below.
+        //
+        // Removing the call to canCreateUsingArrayDelegate() below allows the test
+        // testPOJOWithArrayCreatorFromObjectRepresentation() to pass and interestingly
+        // all existing tests continue to pass. I somehow doubt that it's that simple.
+        //
+        // Specifically, it seems to me that the vanilla-ness of the deserialization can
+        // only be determined once the structure of the incoming JSON can be compared to
+        // what creator methods exist. For example, if there is an array delegate and we
+        // are asked to deserialize from an array then it's not vanilla. However, if we
+        // are asked to deserialize from an object then it's vanilla (subject to no other
+        // non-vanilla-ness being present).
         _nonStandardCreation = (_unwrappedPropertyHandler != null)
+            //|| _valueInstantiator.canCreateFromInt()
             || _valueInstantiator.canCreateUsingDelegate()
             || _valueInstantiator.canCreateUsingArrayDelegate() // new in 2.7
             || _valueInstantiator.canCreateFromObjectWith()

src/test/java/com/fasterxml/jackson/failing/BuilderDeserializationTest2486.java

@@ -0,0 +1,116 @@
+package com.fasterxml.jackson.failing;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.databind.BaseMapTest;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+
+import java.util.List;
+
+public class BuilderDeserializationTest2486
+        extends BaseMapTest
+{
+    @JsonDeserialize(builder = MyPOJOWithArrayCreator.Builder.class)
+    public static class MyPOJOWithArrayCreator {
+        private final int index;
+
+        private MyPOJOWithArrayCreator(int i) {
+            index = i;
+        }
+
+        public int getIndex() {
+            return index;
+        }
+
+        public static class Builder {
+            private int index;
+
+            public Builder() {
+                // Default constructor
+            }
+
+            @JsonCreator(mode = JsonCreator.Mode.DELEGATING)
+            public Builder(final List<Object> jsonArray) {
+                withIndex((int) jsonArray.get(0));
+            }
+
+            public Builder withIndex(int i) {
+                index = i;
+                return this;
+            }
+
+            public MyPOJOWithArrayCreator build() {
+                return new MyPOJOWithArrayCreator(index);
+            }
+        }
+    }
+
+    @JsonDeserialize(builder = MyPOJOWithPrimitiveCreator.Builder.class)
+    public static class MyPOJOWithPrimitiveCreator {
+        private final int index;
+
+        private MyPOJOWithPrimitiveCreator(int i) {
+            index = i;
+        }
+
+        public int getIndex() {
+            return index;
+        }
+
+        public static class Builder {
+            private int index;
+
+            public Builder() {
+                // Default constructor
+            }
+
+            @JsonCreator(mode = JsonCreator.Mode.DELEGATING)
+            public Builder(final int i) {
+                withIndex(i);
+            }
+
+            public Builder withIndex(int i) {
+                index = i;
+                return this;
+            }
+
+            public MyPOJOWithPrimitiveCreator build() {
+                return new MyPOJOWithPrimitiveCreator(index);
+            }
+        }
+    }
+
+    private final ObjectMapper MAPPER = newJsonMapper();
+    
+    // This test passes when the array based @JsonCreator is removed from the
+    // MyPOJOWithArrayCreator.Builder implementation. The presence of the creator
+    // in the case of arrays breaks deserialize from an object.
+    //
+    // Compare that to the analogous tests for MyPOJOWithPrimitiveCreator which
+    // pass in both cases.
+    //
+    // I left some notes in BeanDeserializerBase as to behavior.
+    public void testPOJOWithArrayCreatorFromObjectRepresentation() throws Exception {
+        final String json = aposToQuotes("{ 'index': 123 }");
+        final MyPOJOWithArrayCreator deserialized = MAPPER.readValue(json, MyPOJOWithArrayCreator.class);
+        assertEquals(123, deserialized.getIndex());
+    }
+
+    public void testPOJOWithArrayCreatorFromArrayRepresentation() throws Exception {
+        final String json = "[123]";
+        final MyPOJOWithArrayCreator deserialized = MAPPER.readValue(json, MyPOJOWithArrayCreator.class);
+        assertEquals(123, deserialized.getIndex());
+    }
+
+    public void testPOJOWithPrimitiveCreatorFromObjectRepresentation() throws Exception {
+        final String json = aposToQuotes("{ 'index': 123 }");
+        final MyPOJOWithPrimitiveCreator deserialized = MAPPER.readValue(json, MyPOJOWithPrimitiveCreator.class);
+        assertEquals(123, deserialized.getIndex());
+    }
+
+    public void testPOJOWithPrimitiveCreatorFromPrimitiveRepresentation() throws Exception {
+        final String json ="123";
+        final MyPOJOWithPrimitiveCreator deserialized = MAPPER.readValue(json, MyPOJOWithPrimitiveCreator.class);
+        assertEquals(123, deserialized.getIndex());
+    }
+}