Add failing tests for #1502, #1503

Author: cowtowncoder

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

@@ -396,6 +396,8 @@ public ValueInstantiator _valueInstantiatorInstance(DeserializationConfig config
          Map<AnnotatedWithParams,BeanPropertyDefinition[]> creatorParams)
         throws JsonMappingException
     {
+        final boolean isNonStatic = ClassUtil.isNonStaticInnerClass(beanDesc.getBeanClass());
+
         // First things first: the "default constructor" (zero-arg
         // constructor; whether implicit or explicit) is NOT included
         // in list of constructors, so needs to be handled separately.
@@ -411,10 +413,18 @@ public ValueInstantiator _valueInstantiatorInstance(DeserializationConfig config
         for (AnnotatedConstructor ctor : beanDesc.getConstructors()) {
             final boolean isCreator = intr.hasCreatorAnnotation(ctor);
             BeanPropertyDefinition[] propDefs = creatorParams.get(ctor);
-            final int argCount = ctor.getParameterCount();
+            int argCount = ctor.getParameterCount();
+
+            // 24-Jan-2017, tatu: Handling of constructors for non-static inner classes
+            //   cause nothing but grief (see [databind#1503] for example)... ugh.
+            /*
+            if (isNonStatic) {
+                --argCount;
+            }
+            */
 
             // some single-arg factory methods (String, number) are auto-detected
-            if (argCount == 1) {
+            if ((argCount == 1) && !isNonStatic) {
                 BeanPropertyDefinition argDef = (propDefs == null) ? null : propDefs[0];
                 boolean useProps = _checkIfCreatorPropertyBased(intr, ctor, argDef);
 
@@ -841,7 +851,12 @@ protected SettableBeanProperty constructCreatorProperty(DeserializationContext c
         }
         // 15-Oct-2015, tatu: Not 100% if context needed; removing it does not make any
         //    existing unit tests fail. Still seems like the right thing to do.
-        JavaType t0 = beanDesc.resolveType(param.getParameterType());
+        java.lang.reflect.Type paramType = param.getParameterType();
+        JavaType t0 = beanDesc.resolveType(paramType);
+if (t0 == null) {
+System.err.println("type of: "+param.getClass());    
+//    throw new Error("FOOBAR: param #"+index+" type? "+paramType);
+}
         BeanProperty.Std property = new BeanProperty.Std(name, t0,
                 intr.findWrapperName(param),
                 beanDesc.getClassAnnotations(), param, metadata);

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

@@ -7,26 +7,30 @@
 // for [databind#1501]
 public class InnerClassCreatorTest extends BaseMapTest
 {
-    static class Something {
+    static class Something1501 {
         public InnerSomething a;
 
         // important: must name the parameter (param names module, or explicit)
         @JsonCreator
-        public Something(@JsonProperty("a") InnerSomething a) { this.a = a; }
+        public Something1501(@JsonProperty("a") InnerSomething a) { this.a = a; }
 
-        public Something() { a = new InnerSomething(); }
+        public Something1501(boolean bogus) { a = new InnerSomething(); }
 
         class InnerSomething {
             @JsonCreator
             public InnerSomething() { }
         }
     }
 
+    private final ObjectMapper MAPPER = new ObjectMapper();
+    {
+        MAPPER.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);
+    }
+
+    // Used to trigger `ArrayIndexOutOfBoundsException` for missing creator property index
     public void testIssue1501() throws Exception
     {
-        ObjectMapper mapper = new ObjectMapper();
-        mapper.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);
-        String ser = mapper.writeValueAsString(new Something());
-        mapper.readValue(ser, Something.class);
+        String ser = MAPPER.writeValueAsString(new Something1501(false));
+        MAPPER.readValue(ser, Something1501.class);
     }
 }

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

@@ -0,0 +1,54 @@
+package com.fasterxml.jackson.failing;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.*;
+
+// for [databind#1502], [databind#1503]
+public class InnerClassCreator1502Test extends BaseMapTest
+{
+    static class Something1502 {
+        @JsonProperty
+        public InnerSomething1502 a;
+
+        @JsonCreator
+        public Something1502(InnerSomething1502 a) {}
+
+        class InnerSomething1502 {
+            @JsonCreator
+            public InnerSomething1502() {}
+        }
+
+    }    
+
+    static class Broken1503 {
+        public InnerClass1503 innerClass;
+
+        class InnerClass1503 {
+            public Generic<?> generic;
+            public InnerClass1503(@JsonProperty("generic") Generic<?> generic) {}
+        }
+
+        static class Generic<T> {
+            public int ignored;
+        }
+    }
+
+    private final ObjectMapper MAPPER = new ObjectMapper();
+    {
+        MAPPER.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);
+    }
+
+    public void testIssue1502() throws Exception
+    {
+        String ser = MAPPER.writeValueAsString(new Something1502(null));
+//System.err.println("DEBUG: ser == "+ser);
+        MAPPER.readValue(ser, Something1502.class);
+    }
+
+    public void testIssue1503() throws Exception
+    {
+        String ser = MAPPER.writeValueAsString(new Broken1503());
+        MAPPER.readValue(ser, Broken1503.class);
+    }
+}