Merge branch '2.7' into 2.8

Author: cowtowncoder

release-notes/VERSION

@@ -147,6 +147,8 @@ Project: jackson-databind
 #1456: `TypeFactory` type resolution broken in 2.7 for generic types
    when using `constructType` with context
  (reported by Dmitry S)
+#1476: Wrong constructor picked up when deserializing object
+ (reported by laurentgo@github)
 
 2.7.8 (26-Sep-2016)
 

src/main/java/com/fasterxml/jackson/databind/deser/impl/CreatorCollector.java

@@ -157,37 +157,40 @@ public void addBooleanCreator(AnnotatedWithParams creator,
     public void addDelegatingCreator(AnnotatedWithParams creator,
             boolean explicit, SettableBeanProperty[] injectables) {
         if (creator.getParameterType(0).isCollectionLikeType()) {
-            verifyNonDup(creator, C_ARRAY_DELEGATE, explicit);
-            _arrayDelegateArgs = injectables;
+            if (verifyNonDup(creator, C_ARRAY_DELEGATE, explicit)) {
+                _arrayDelegateArgs = injectables;
+            }
         } else {
-            verifyNonDup(creator, C_DELEGATE, explicit);
-            _delegateArgs = injectables;
+            if (verifyNonDup(creator, C_DELEGATE, explicit)) {
+                _delegateArgs = injectables;
+            }
         }
     }
 
     public void addPropertyCreator(AnnotatedWithParams creator,
             boolean explicit, SettableBeanProperty[] properties) {
-        verifyNonDup(creator, C_PROPS, explicit);
-        // Better ensure we have no duplicate names either...
-        if (properties.length > 1) {
-            HashMap<String, Integer> names = new HashMap<String, Integer>();
-            for (int i = 0, len = properties.length; i < len; ++i) {
-                String name = properties[i].getName();
-                // Need to consider Injectables, which may not have
-                // a name at all, and need to be skipped
-                if (name.length() == 0
-                        && properties[i].getInjectableValueId() != null) {
-                    continue;
-                }
-                Integer old = names.put(name, Integer.valueOf(i));
-                if (old != null) {
-                    throw new IllegalArgumentException(String.format(
-                            "Duplicate creator property \"%s\" (index %s vs %d)",
-                            name, old, i));
+        if (verifyNonDup(creator, C_PROPS, explicit)) {
+            // Better ensure we have no duplicate names either...
+            if (properties.length > 1) {
+                HashMap<String, Integer> names = new HashMap<String, Integer>();
+                for (int i = 0, len = properties.length; i < len; ++i) {
+                    String name = properties[i].getName();
+                    // Need to consider Injectables, which may not have
+                    // a name at all, and need to be skipped
+                    if (name.length() == 0
+                            && properties[i].getInjectableValueId() != null) {
+                        continue;
+                    }
+                    Integer old = names.put(name, Integer.valueOf(i));
+                    if (old != null) {
+                        throw new IllegalArgumentException(String.format(
+                                "Duplicate creator property \"%s\" (index %s vs %d)",
+                                name, old, i));
+                    }
                 }
             }
+            _propertyBasedArgs = properties;
         }
-        _propertyBasedArgs = properties;
     }
 
     public void addIncompeteParameter(AnnotatedParameter parameter) {
@@ -292,20 +295,21 @@ private <T extends AnnotatedMember> T _fixAccess(T member) {
         return member;
     }
 
-    protected void verifyNonDup(AnnotatedWithParams newOne, int typeIndex,
-            boolean explicit) {
+    /**
+     * @return True if specified Creator is to be used
+     */
+    protected boolean verifyNonDup(AnnotatedWithParams newOne, int typeIndex, boolean explicit)
+    {
         final int mask = (1 << typeIndex);
         _hasNonDefaultCreator = true;
         AnnotatedWithParams oldOne = _creators[typeIndex];
         // already had an explicitly marked one?
         if (oldOne != null) {
             boolean verify;
-
-            if ((_explicitCreators & mask) != 0) { // already had explicitly
-                                                   // annotated, leave as-is
+            if ((_explicitCreators & mask) != 0) { // already had explicitly annotated, leave as-is
                 // but skip, if new one not annotated
                 if (!explicit) {
-                    return;
+                    return false;
                 }
                 // both explicit: verify
                 verify = true;
@@ -327,7 +331,7 @@ protected void verifyNonDup(AnnotatedWithParams newOne, int typeIndex,
                     // other implicit
                     // creator (`fromString()`)
                     if (_isEnumValueOf(newOne)) {
-                        return; // ignore
+                        return false; // ignore
                     }
                     if (_isEnumValueOf(oldOne)) {
                         ;
@@ -343,7 +347,7 @@ protected void verifyNonDup(AnnotatedWithParams newOne, int typeIndex,
                 // otherwise, which one to choose?
                 else if (newType.isAssignableFrom(oldType)) {
                     // new type more generic, use old
-                    return;
+                    return false;
                 }
                 // new type more specific, use it
             }
@@ -352,6 +356,7 @@ else if (newType.isAssignableFrom(oldType)) {
             _explicitCreators |= mask;
         }
         _creators[typeIndex] = _fixAccess(newOne);
+        return true;
     }
 
     /**
@@ -365,8 +370,9 @@ protected boolean _isEnumValueOf(AnnotatedWithParams creator) {
     }
 
     /*
-     * /********************************************************** /* Helper
-     * class(es) /**********************************************************
+    /**********************************************************
+    /* Helper class(es)
+    /**********************************************************
      */
 
     /**

src/test/java/com/fasterxml/jackson/databind/creators/Creator1476Test.java

@@ -0,0 +1,43 @@
+package com.fasterxml.jackson.databind.creators;
+
+import com.fasterxml.jackson.annotation.*;
+
+import com.fasterxml.jackson.databind.*;
+
+public class Creator1476Test extends BaseMapTest
+{
+    static final class SimplePojo {
+        private final int intField;
+        private final String stringField;
+
+        public SimplePojo(@JsonProperty("intField") int intField) {
+          this(intField, "empty");
+        }
+
+        public SimplePojo(@JsonProperty("stringField") String stringField) {
+          this(-1, stringField);
+        }
+
+        @JsonCreator
+        public SimplePojo(@JsonProperty("intField") int intField, @JsonProperty("stringField") String stringField) {
+          this.intField = intField;
+          this.stringField = stringField;
+        }
+
+        public int getIntField() {
+          return intField;
+        }
+
+        public String getStringField() {
+          return stringField;
+        }
+    }
+
+    public void testConstructorChoice() throws Exception {
+        ObjectMapper mapper = new ObjectMapper();
+        SimplePojo pojo = mapper.readValue("{ \"intField\": 1, \"stringField\": \"foo\" }", SimplePojo.class);
+
+        assertEquals(1, pojo.getIntField());
+        assertEquals("foo", pojo.getStringField());
+    }
+}