Merge branch '2.10' into 2.11

Author: cowtowncoder

release-notes/CREDITS-2.x

@@ -995,6 +995,10 @@ Richard Wise (Woodz@github)
   * Reported #2519: Serializing `BigDecimal` values inside containers ignores shape override	
   (2.10.1)
 
+Mark Schäfer (mark--@github)
+  * Reported #2520: Sub-optimal exception message when failing to deserialize non-static inner classes
+  (2.10.1)
+
 Ville Koskela (vjkoskela@github)
   * Contributed #2487: BeanDeserializerBuilder Protected Factory Method for Extension
   (2.11.0)

release-notes/VERSION-2.x

@@ -29,6 +29,8 @@ Project: jackson-databind
  (reported by Johan H)
 #2519: Serializing `BigDecimal` values inside containers ignores shape override
  (reported by Richard W)
+#2520: Sub-optimal exception message when failing to deserialize non-static inner classes
+ (reported by Mark S)
 
 2.10.0 (26-Sep-2019)
 

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

@@ -1292,7 +1292,7 @@ protected Object deserializeFromObjectUsingNonDefault(JsonParser p,
         Class<?> raw = _beanType.getRawClass();
         if (ClassUtil.isNonStaticInnerClass(raw)) {
             return ctxt.handleMissingInstantiator(raw, null, p,
-"can only instantiate non-static inner class by using default, no-argument constructor");
+"non-static inner classes like this can only by instantiated using default, no-argument constructor");
         }
         return ctxt.handleMissingInstantiator(raw, getValueInstantiator(), p,
                 "cannot deserialize from Object value (no delegate- or property-based Creator)");

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

@@ -63,10 +63,10 @@ public void testIssue1501() throws Exception
         try {
             MAPPER.readValue(ser, Something1501.class);
             fail("Should not pass");
-        } catch (JsonMappingException e) {
+        } catch (MismatchedInputException e) {
             verifyException(e, "Cannot construct instance");
             verifyException(e, "InnerSomething1501");
-            verifyException(e, "can only instantiate non-static inner class by using default");
+            verifyException(e, "non-static inner classes like this can only by instantiated using default");
         }
     }    
 
@@ -76,10 +76,10 @@ public void testIssue1502() throws Exception
         try {
             MAPPER.readValue(ser, Something1502.class);
             fail("Should not pass");
-        } catch (JsonMappingException e) {
+        } catch (MismatchedInputException e) {
             verifyException(e, "Cannot construct instance");
             verifyException(e, "InnerSomething1502");
-            verifyException(e, "can only instantiate non-static inner class by using default");
+            verifyException(e, "non-static inner classes like this can only by instantiated using default");
         }
     }