Merge branch '2.8'

Author: cowtowncoder

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

@@ -4,6 +4,7 @@
 
 import com.fasterxml.jackson.databind.BaseMapTest;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.introspect.*;
 
 public class IgnoredCreatorProperty1572Test extends BaseMapTest
 {
@@ -15,15 +16,37 @@ static class InnerTest
 
     static class OuterTest
     {
-        InnerTest inner;
+        InnerTest innerTest;
 
         @JsonIgnore
-        public String otherStr;
+        String otherOtherStr;
 
         @JsonCreator
-        public OuterTest(@JsonProperty("inner") InnerTest inner,
-                @JsonProperty("otherOtherStr") String otherStr) {
-            this.inner = inner;
+        public OuterTest(/*@JsonProperty("innerTest")*/ InnerTest inner,
+                /*@JsonProperty("otherOtherStr")*/ String otherStr) {
+            this.innerTest = inner;
+        }
+    }
+
+    static class ImplicitNames extends JacksonAnnotationIntrospector
+    {
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public String findImplicitPropertyName(AnnotatedMember member) {
+            if (member instanceof AnnotatedParameter) {
+                // A placeholder for legitimate property name detection
+                // such as what the JDK8 module provides
+                AnnotatedParameter param = (AnnotatedParameter) member;
+                switch (param.getIndex()) {
+                case 0:
+                    return "innerTest";
+                case 1:
+                    return "otherOtherStr";
+                default:
+                }
+            }
+            return null;
         }
     }
 
@@ -33,16 +56,18 @@ public OuterTest(@JsonProperty("inner") InnerTest inner,
     /********************************************************
      */
 
-    private final ObjectMapper MAPPER = new ObjectMapper();
-
     // [databind#1572]
     public void testIgnoredCtorParam() throws Exception
     {
+        final ObjectMapper mapper = new ObjectMapper();
+        mapper.setAnnotationIntrospector(new ImplicitNames());
         String JSON = aposToQuotes("{'innerTest': {\n"
                 +"'str':'str',\n"
                 +"'otherStr': 'otherStr'\n"
                 +"}}\n");
-        OuterTest result = MAPPER.readValue(JSON, OuterTest.class);
+        OuterTest result = mapper.readValue(JSON, OuterTest.class);
         assertNotNull(result);
+        assertNotNull(result.innerTest);
+        assertEquals("otherStr", result.innerTest.otherStr);
     }
 }