Fix #2522

Author: cowtowncoder

release-notes/VERSION-2.x

@@ -11,6 +11,8 @@ Project: jackson-databind
 #2503: Support `@JsonSerialize(keyUsing)` and `@JsonDeserialize(keyUsing)` on Key class
 #2511: Add `SerializationFeature.WRITE_SELF_REFERENCES_AS_NULL`
  (contributed by Joongsoo P)
+#2522: `DeserializationContext.handleMissingInstantiator()` throws `MismatchedInputException`
+  for non-static inner classes
 - Add `SerializerProvider.findContentValueSerializer()` methods
 
 2.10.1 (not yet released)

src/main/java/com/fasterxml/jackson/databind/DeserializationContext.java

@@ -1049,10 +1049,17 @@ public Object handleMissingInstantiator(Class<?> instClass, ValueInstantiator va
         // 16-Oct-2016, tatu: This is either a definition problem (if no applicable creator
         //   exists), or input mismatch problem (otherwise) since none of existing creators
         //   match with token.
-        if ((valueInst != null) && !valueInst.canInstantiate()) {
-            msg = String.format("Cannot construct instance of %s (no Creators, like default construct, exist): %s",
+        // 24-Oct-2019, tatu: Further, as per [databind#2522], passing `null` ValueInstantiator
+        //   should simply trigger definition problem
+        if (valueInst == null ) {
+            msg = String.format("Cannot construct instance of %s: %s",
                     ClassUtil.nameOf(instClass), msg);
-            return reportBadDefinition(constructType(instClass), msg);
+            return reportBadDefinition(instClass, msg);
+        }
+        if (!valueInst.canInstantiate()) {
+            msg = String.format("Cannot construct instance of %s (no Creators, like default constructor, exist): %s",
+                    ClassUtil.nameOf(instClass), msg);
+            return reportBadDefinition(instClass, msg);
         }
         msg = String.format("Cannot construct instance of %s (although at least one Creator exists): %s",
                 ClassUtil.nameOf(instClass), msg);

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

@@ -2,8 +2,9 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+
 import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.exc.MismatchedInputException;
+import com.fasterxml.jackson.databind.exc.InvalidDefinitionException;
 
 // For [databind#1501], [databind#1502], [databind#1503]; mostly to
 // test that for non-static inner classes constructors are ignored
@@ -64,7 +65,7 @@ public void testIssue1501() throws Exception
         try {
             MAPPER.readValue(ser, Something1501.class);
             fail("Should not pass");
-        } catch (MismatchedInputException e) {
+        } catch (InvalidDefinitionException e) {
             verifyException(e, "Cannot construct instance");
             verifyException(e, "InnerSomething1501");
             verifyException(e, "non-static inner classes like this can only by instantiated using default");
@@ -77,7 +78,7 @@ public void testIssue1502() throws Exception
         try {
             MAPPER.readValue(ser, Something1502.class);
             fail("Should not pass");
-        } catch (MismatchedInputException e) {
+        } catch (InvalidDefinitionException e) {
             verifyException(e, "Cannot construct instance");
             verifyException(e, "InnerSomething1502");
             verifyException(e, "non-static inner classes like this can only by instantiated using default");