more tweaking for handling of static inner class deserialization (or failure thereof)

Author: cowtowncoder

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

@@ -396,8 +396,6 @@ 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.
@@ -408,23 +406,24 @@ public ValueInstantiator _valueInstantiatorInstance(DeserializationConfig config
             }
         }
 
+        // 25-Jan-2017, tatu: As per [databind#1501], [databind#1502], [databind#1503], best
+        //     for now to skip attempts at using anything but no-args constructor (see
+        //     `InnerClassProperty` construction for that)
+        final boolean isNonStaticInnerClass = ClassUtil.isNonStaticInnerClass(beanDesc.getBeanClass());
+        if (isNonStaticInnerClass) {
+            // TODO: look for `@JsonCreator` annotated ones, throw explicit exception?
+            return;
+        }
+
         // may need to keep track for [#725]
         List<AnnotatedConstructor> implicitCtors = null;
         for (AnnotatedConstructor ctor : beanDesc.getConstructors()) {
             final boolean isCreator = intr.hasCreatorAnnotation(ctor);
             BeanPropertyDefinition[] propDefs = creatorParams.get(ctor);
-            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;
-            }
-            */
+            final int argCount = ctor.getParameterCount();
 
             // some single-arg factory methods (String, number) are auto-detected
-            if ((argCount == 1) && !isNonStatic) {
+            if ((argCount == 1) && !isNonStaticInnerClass) {
                 BeanPropertyDefinition argDef = (propDefs == null) ? null : propDefs[0];
                 boolean useProps = _checkIfCreatorPropertyBased(intr, ctor, argDef);
 
@@ -853,10 +852,6 @@ protected SettableBeanProperty constructCreatorProperty(DeserializationContext c
         //    existing unit tests fail. Still seems like the right thing to do.
         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/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializerBase.java

@@ -769,7 +769,7 @@ protected SettableBeanProperty _resolveUnwrappedProperty(DeserializationContext
      */
     protected SettableBeanProperty _resolveInnerClassValuedProperty(DeserializationContext ctxt,
             SettableBeanProperty prop)
-    {            
+    {
         /* Should we encounter a property that has non-static inner-class
          * as value, we need to add some more magic to find the "hidden" constructor...
          */
@@ -780,16 +780,19 @@ protected SettableBeanProperty _resolveInnerClassValuedProperty(DeserializationC
             ValueInstantiator vi = bd.getValueInstantiator();
             if (!vi.canCreateUsingDefault()) { // no default constructor
                 Class<?> valueClass = prop.getType().getRawClass();
+                // NOTE: almost same as `isNonStaticInnerClass()` but need to know enclosing...
                 Class<?> enclosing = ClassUtil.getOuterClass(valueClass);
                 // and is inner class of the bean class...
-                if (enclosing != null && enclosing == _beanType.getRawClass()) {
+                if ((enclosing != null) && (enclosing == _beanType.getRawClass())) {
                     for (Constructor<?> ctor : valueClass.getConstructors()) {
                         Class<?>[] paramTypes = ctor.getParameterTypes();
-                        if (paramTypes.length == 1 && paramTypes[0] == enclosing) {
-                            if (ctxt.canOverrideAccessModifiers()) {
-                                ClassUtil.checkAndFixAccess(ctor, ctxt.isEnabled(MapperFeature.OVERRIDE_PUBLIC_ACCESS_MODIFIERS));
+                        if (paramTypes.length == 1) {
+                            if (enclosing.equals(paramTypes[0])) {
+                                if (ctxt.canOverrideAccessModifiers()) {
+                                    ClassUtil.checkAndFixAccess(ctor, ctxt.isEnabled(MapperFeature.OVERRIDE_PUBLIC_ACCESS_MODIFIERS));
+                                }
+                                return new InnerClassProperty(prop, ctor);
                             }
-                            return new InnerClassProperty(prop, ctor);
                         }
                     }
                 }

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

@@ -149,10 +149,10 @@ public JsonDeserializer<Object> createBuilderBasedDeserializer(
     		Class<?> builderClass)
         throws JsonMappingException
     {
-    	// First: need a BeanDescription for builder class
-    	JavaType builderType = ctxt.constructType(builderClass);
-    	BeanDescription builderDesc = ctxt.getConfig().introspectForBuilder(builderType);
-    	return buildBuilderBasedDeserializer(ctxt, valueType, builderDesc);
+        // First: need a BeanDescription for builder class
+        JavaType builderType = ctxt.constructType(builderClass);
+        BeanDescription builderDesc = ctxt.getConfig().introspectForBuilder(builderType);
+        return buildBuilderBasedDeserializer(ctxt, valueType, builderDesc);
     }
 
     /**

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

@@ -7,6 +7,21 @@
 // for [databind#1502], [databind#1503]
 public class InnerClassCreator1502Test extends BaseMapTest
 {
+    static class Something1501 {
+        public InnerSomething a;
+
+        // important: must name the parameter (param names module, or explicit)
+        @JsonCreator
+        public Something1501(@JsonProperty("a") InnerSomething a) { this.a = a; }
+
+        public Something1501(boolean bogus) { a = new InnerSomething(); }
+
+        class InnerSomething {
+            @JsonCreator
+            public InnerSomething() { }
+        }
+    }
+
     static class Something1502 {
         @JsonProperty
         public InnerSomething1502 a;
@@ -18,7 +33,6 @@ class InnerSomething1502 {
             @JsonCreator
             public InnerSomething1502() {}
         }
-
     }    
 
     static class Broken1503 {
@@ -39,6 +53,13 @@ static class Generic<T> {
         MAPPER.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);
     }
 
+    // Used to trigger `ArrayIndexOutOfBoundsException` for missing creator property index
+    public void testIssue1501() throws Exception
+    {
+        String ser = MAPPER.writeValueAsString(new Something1501(false));
+        MAPPER.readValue(ser, Something1501.class);
+    }    
+
     public void testIssue1502() throws Exception
     {
         String ser = MAPPER.writeValueAsString(new Something1502(null));