Fixed #2770

Author: cowtowncoder

release-notes/CREDITS-2.x

@@ -991,6 +991,11 @@ João Guerra (joca-bt@github)
   (2.10.1)
   * Reported #2567: Incorrect target type for arrays when providing nulls and nulls are disabled
   (2.10.2)
+  * Reported #2635: JsonParser cannot getText() for input stream on MismatchedInputException
+  (2.11.0)
+  * Reported #2770: JsonParser from MismatchedInputException cannot getText() for
+    floating-point value
+  (2.11.1)
 
 Ryan Bohn (bohnman@github)
   * Reported #2475: `StringCollectionSerializer` calls `JsonGenerator.setCurrentValue(value)`,

release-notes/VERSION-2.x

@@ -20,6 +20,9 @@ Project: jackson-databind
 #2760: Jackson doesn't respect `CAN_OVERRIDE_ACCESS_MODIFIERS=false` for
   deserializer properties
  (reported by Johannes K)
+#2770: JsonParser from MismatchedInputException cannot getText() for
+  floating-point value
+ (reported by João G)
 
 2.11.0 (26-Apr-2020)
 
@@ -68,6 +71,8 @@ Project: jackson-databind
  (reported by robotmrv@github)
 #2632: Failure to resolve generic type parameters on serialization
  (reported by Simone D)
+#2635: JsonParser cannot getText() for input stream on MismatchedInputException
+ (reported by João G)
 #2636: ObjectReader readValue lacks Class<T> argument
  (contributed by Robin R)
 #2643: Change default textual serialization of `java.util.Date`/`Calendar`

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

@@ -1235,6 +1235,10 @@ public Object handleUnexpectedToken(JavaType targetType, JsonToken t,
                         ClassUtil.getTypeDescription(targetType), t);
             }
         }
+        // 18-Jun-2020, tatu: to resolve [databind#2770], force access to `getText()` for scalars
+        if ((t != null) && t.isScalarValue()) {
+            p.getText();
+        }
         reportInputMismatch(targetType, msg);
         return null; // never gets here
     }

src/test/java/com/fasterxml/jackson/databind/struct/ScalarCoercionTest.java

@@ -164,22 +164,27 @@ public void testStringCoercionFail() throws Exception
         _verifyRootStringCoerceFail("123.0", BigDecimal.class);
     }
 
+    // [databind#2635], [databind#2770]
     public void testToBooleanCoercionFailBytes() throws Exception
     {
         final String beanDoc = aposToQuotes("{'value':1}");
         _verifyBooleanCoerceFail("1", true, JsonToken.VALUE_NUMBER_INT, "1", Boolean.TYPE);
         _verifyBooleanCoerceFail("1", true, JsonToken.VALUE_NUMBER_INT, "1", Boolean.class);
         _verifyBooleanCoerceFail(beanDoc, true, JsonToken.VALUE_NUMBER_INT, "1", BooleanPOJO.class);
+
+        _verifyBooleanCoerceFail("1.25", true, JsonToken.VALUE_NUMBER_FLOAT, "1.25", Boolean.TYPE);
+        _verifyBooleanCoerceFail("1.25", true, JsonToken.VALUE_NUMBER_FLOAT, "1.25", Boolean.class);
     }
 
+    // [databind#2635], [databind#2770]
     public void testToBooleanCoercionFailChars() throws Exception
     {
         final String beanDoc = aposToQuotes("{'value':1}");
         _verifyBooleanCoerceFail("1", false, JsonToken.VALUE_NUMBER_INT, "1", Boolean.TYPE);
         _verifyBooleanCoerceFail("1", false, JsonToken.VALUE_NUMBER_INT, "1", Boolean.class);
         _verifyBooleanCoerceFail(beanDoc, false, JsonToken.VALUE_NUMBER_INT, "1", BooleanPOJO.class);
     }
-
+    
     public void testMiscCoercionFail() throws Exception
     {
         // And then we have coercions from more esoteric types too
@@ -273,9 +278,8 @@ private void _verifyBooleanCoerceFail(String doc, boolean useBytes,
     private void _verifyBooleanCoerceFailReason(MismatchedInputException e,
             JsonToken tokenType, String tokenValue) throws IOException
     {
-        verifyException(e, "Cannot coerce ");
-        verifyException(e, " for type `");
-        verifyException(e, "enable `MapperFeature.ALLOW_COERCION_OF_SCALARS` to allow");
+        // 2 different possibilities here
+        verifyException(e, "Cannot coerce Number", "Cannot deserialize instance of `");
 
         JsonParser p = (JsonParser) e.getProcessor();
 
@@ -286,7 +290,7 @@ private void _verifyBooleanCoerceFailReason(MismatchedInputException e,
         if (!tokenValue.equals(text)) {
             String textDesc = (text == null) ? "NULL" : quote(text);
             fail("Token text ("+textDesc+") via parser of type "+p.getClass().getName()
-                    +" not as expected ("+quote(tokenValue)+")");
+                    +" not as expected ("+quote(tokenValue)+"); exception message: '"+e.getMessage()+"'");
         }
     }
 }

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

@@ -0,0 +1,53 @@
+package com.fasterxml.jackson.failing;
+
+import java.util.AbstractMap;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicReference;
+
+import com.fasterxml.jackson.databind.*;
+
+public class ObjectMapper2757Test extends BaseMapTest
+{
+    interface MultiValueMap<K, V> extends Map<K, List<V>> { }
+    abstract static class MyMultiMap<K, V> extends AbstractMap<K, List<V>>
+        implements MultiValueMap<K, V> { }
+
+    static class MyMap extends MyMultiMap<String, String> {
+        public MyMap() { }
+
+        public void setValue(StringWrapper w) { }
+        public void setValue(IntWrapper w) { }
+
+        public long getValue() { return 0L; }
+
+        @Override
+        public Set<Entry<String, List<String>>> entrySet() {
+            return Collections.emptySet();
+        }
+    }
+
+    private final ObjectMapper MAPPER = newJsonMapper();
+
+    // [databind#2757]: should allow deserialization as Map despite conflicting setters
+    public void testCanDeserializeMap() throws Exception
+    {
+//        final String json = MAPPER.writeValueAsString(new MyMap());
+//        System.out.println("json: "+json);
+ //       MyMap x = MAPPER.readValue(json, MyMap.class);
+        final AtomicReference<Throwable> ref = new AtomicReference<>();
+        final JavaType type = MAPPER.constructType(MyMap.class);
+
+        System.err.println("Type: "+type);
+        
+        boolean can = MAPPER.canDeserialize(MAPPER.constructType(type),
+                ref);
+System.err.println(" Cause -> "+ref.get());
+        if (!can) {
+            ref.get().printStackTrace();
+            fail("canDeserialize() returned false; underlying failure: "+ref.get());
+        }
+    }
+}