Last refactoring wrt DeserializationContext.extractScalarFromObject(), tests

Author: cowtowncoder

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

@@ -854,20 +854,24 @@ public Calendar constructCalendar(Date d) {
      * "simple" unstructured value type.
      * 
      * @param p Actual parser to read content from
-     * @param ctxt Deserialization context
      * @param deser Deserializer that needs extracted String value
+     * @param scalarType Immediate type of scalar to extract; usually type deserializer
+     *    handles but not always (for example, deserializer for {@code int[]} would pass
+     *    scalar type of {@code int})
      *
      * @return String value found; not {@code null} (exception should be thrown if no suitable
      *     value found)
      *
      * @throws IOException If there are problems either reading content (underlying parser
      *    problem) or finding expected scalar value
      */
-    public String extractScalarFromObject(JsonParser p, DeserializationContext ctxt,
-            JsonDeserializer<?> deser)
+    public String extractScalarFromObject(JsonParser p, JsonDeserializer<?> deser,
+            Class<?> scalarType)
         throws IOException
     {
-        return null;
+        return reportInputMismatch(scalarType, String.format(
+"Cannot deserialize value of type %s from %s (token `JsonToken.START_OBJECT`)",
+ClassUtil.getClassDescription(scalarType), _shapeForToken(JsonToken.START_OBJECT)));
     }
 
     /*
@@ -1350,7 +1354,7 @@ public Object handleUnexpectedToken(JavaType targetType, JsonToken t,
                 }
                 reportBadDefinition(targetType, String.format(
                         "DeserializationProblemHandler.handleUnexpectedToken() for type %s returned value of type %s",
-                        ClassUtil.getClassDescription(targetType),
+                        ClassUtil.getTypeDescription(targetType),
                         ClassUtil.classNameOf(instance)
                 ));
             }

src/main/java/com/fasterxml/jackson/databind/deser/std/NumberDeserializers.java

@@ -535,7 +535,7 @@ protected final Integer _parseInteger(JsonParser p, DeserializationContext ctxt)
         {
             String text;
             switch (p.currentTokenId()) {
-            case JsonTokenId.ID_STRING: // let's do implicit re-parse
+            case JsonTokenId.ID_STRING:
                 text = p.getText();
                 break;
             case JsonTokenId.ID_NUMBER_FLOAT: // coercing may work too

src/main/java/com/fasterxml/jackson/databind/deser/std/StdDeserializer.java

@@ -674,6 +674,12 @@ protected final int _parseIntPrimitive(JsonParser p, DeserializationContext ctxt
         case JsonTokenId.ID_NULL:
             _verifyNullForPrimitive(ctxt);
             return 0;
+
+        // 29-Jun-2020, tatu: New! "Scalar from Object" to support tricky case of
+        //    XML element with attributes
+        case JsonTokenId.ID_START_OBJECT:
+            text = ctxt.extractScalarFromObject(p, this, Integer.TYPE);
+            break;
         case JsonTokenId.ID_START_ARRAY:
             if (ctxt.isEnabled(DeserializationFeature.UNWRAP_SINGLE_VALUE_ARRAYS)) {
                 p.nextToken();
@@ -683,7 +689,6 @@ protected final int _parseIntPrimitive(JsonParser p, DeserializationContext ctxt
             }
             // fall through to fail
         default:
-            // Otherwise, no can do:
             return ((Number) ctxt.handleUnexpectedToken(Integer.TYPE, p)).intValue();
         }
 

src/test/java/com/fasterxml/jackson/databind/BaseMapTest.java

@@ -359,6 +359,10 @@ protected static String aposToQuotes(String json) {
         return json.replace("'", "\"");
     }
 
+    protected static String a2q(String json) {
+        return json.replace("'", "\"");
+    }
+    
     protected static String quotesToApos(String json) {
         return json.replace("\"", "'");
     }

src/test/java/com/fasterxml/jackson/databind/deser/TestArrayDeserialization.java renamed to src/test/java/com/fasterxml/jackson/databind/deser/jdk/ArrayDeserializationTest.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.deser;
+package com.fasterxml.jackson.databind.deser.jdk;
 
 import java.io.*;
 import java.util.*;
@@ -16,7 +16,7 @@
  * This unit test suite tries to verify that the "Native" java type
  * mapper can properly re-construct Java array objects from Json arrays.
  */
-public class TestArrayDeserialization
+public class ArrayDeserializationTest
     extends BaseMapTest
 {
     public final static class Bean1

src/test/java/com/fasterxml/jackson/databind/deser/jdk/JDKScalarsTest.java

@@ -2,6 +2,8 @@
 
 import java.io.*;
 import java.lang.reflect.Array;
+import java.math.BigDecimal;
+import java.math.BigInteger;
 import java.util.List;
 
 import org.junit.Assert;
@@ -12,6 +14,7 @@
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.JsonMappingException.Reference;
 import com.fasterxml.jackson.databind.exc.MismatchedInputException;
+import com.fasterxml.jackson.databind.util.ClassUtil;
 
 /**
  * Unit tests for verifying handling of simple basic non-structured
@@ -787,9 +790,38 @@ private void _testInvalidStringCoercionFail(Class<?> cls, String targetTypeName)
 
         try {
             MAPPER.readerFor(cls).readValue(JSON);
-            fail("Should not pass");
+            fail("Should MismatchedInputException pass");
         } catch (JsonMappingException e) {
             verifyException(e, "Cannot deserialize value of type `"+targetTypeName+"` from String \"foobar\"");
         }
     }
+
+    /*
+    /**********************************************************
+    /* Tests for mismatch: JSON Object for scalars (not supported
+    /* for JSON
+    /**********************************************************
+     */
+
+    public void testFailForScalarFromObject() throws Exception
+    {
+        _testFailForNumberFromObject(Byte.TYPE);
+        _testFailForNumberFromObject(Short.TYPE);
+        _testFailForNumberFromObject(Long.TYPE);
+        _testFailForNumberFromObject(Float.TYPE);
+        _testFailForNumberFromObject(Double.TYPE);
+        _testFailForNumberFromObject(BigInteger.class);
+        _testFailForNumberFromObject(BigDecimal.class);
+    }
+
+    private void _testFailForNumberFromObject(Class<?> targetType) throws Exception
+    {
+        try {
+            MAPPER.readValue(a2q("{'value':12}"), targetType);
+            fail("Should not pass");
+        } catch (MismatchedInputException e) {
+            verifyException(e, "from Object value");
+            verifyException(e, ClassUtil.getClassDescription(targetType));
+        }
+    }
 }

src/test/java/com/fasterxml/jackson/databind/deser/TestGenericMapDeser.java renamed to src/test/java/com/fasterxml/jackson/databind/deser/jdk/MapWithGenericValuesDeserTest.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.deser;
+package com.fasterxml.jackson.databind.deser.jdk;
 
 import java.util.*;
 
@@ -9,7 +9,7 @@
 import com.fasterxml.jackson.databind.type.TypeFactory;
 
 @SuppressWarnings("serial")
-public class TestGenericMapDeser
+public class MapWithGenericValuesDeserTest
     extends BaseMapTest
 {
     /*