Minor improvement wrt #2701 (error reporting)

Author: cowtowncoder

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

@@ -13,7 +13,7 @@ public class AtomicBooleanDeserializer extends StdScalarDeserializer<AtomicBoole
     public AtomicBooleanDeserializer() { super(AtomicBoolean.class); }
 
     @Override
-    public AtomicBoolean deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException {
-        return new AtomicBoolean(_parseBooleanPrimitive(jp, ctxt));
+    public AtomicBoolean deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
+        return new AtomicBoolean(_parseBooleanPrimitive(ctxt, p, AtomicBoolean.class));
     }
 }

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

@@ -389,7 +389,7 @@ public boolean[] deserialize(JsonParser p, DeserializationContext ctxt)
                         _verifyNullForPrimitive(ctxt);
                         value = false;
                     } else {
-                        value = _parseBooleanPrimitive(p, ctxt);
+                        value = _parseBooleanPrimitive(ctxt, p, Boolean.TYPE);
                     }
                     if (ix >= chunk.length) {
                         chunk = builder.appendCompletedChunk(chunk, ix);
@@ -406,7 +406,7 @@ public boolean[] deserialize(JsonParser p, DeserializationContext ctxt)
         @Override
         protected boolean[] handleSingleElementUnwrapped(JsonParser p,
                 DeserializationContext ctxt) throws IOException {
-            return new boolean[] { _parseBooleanPrimitive(p, ctxt) };
+            return new boolean[] { _parseBooleanPrimitive(ctxt, p, Boolean.TYPE) };
         }
 
         @Override

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

@@ -168,7 +168,14 @@ public Object deserializeWithType(JsonParser p, DeserializationContext ctxt,
     /**********************************************************
      */
 
-    protected final boolean _parseBooleanPrimitive(JsonParser p, DeserializationContext ctxt) throws IOException
+    @Deprecated // since 2.11, use overloaded variant
+    protected final boolean _parseBooleanPrimitive(JsonParser p, DeserializationContext ctxt) throws IOException {
+        return _parseBooleanPrimitive(ctxt, p, Boolean.TYPE);
+    }
+
+    // @since 2.11
+    protected final boolean _parseBooleanPrimitive(DeserializationContext ctxt,
+            JsonParser p, Class<?> targetType) throws IOException
     {
         JsonToken t = p.getCurrentToken();
         if (t == JsonToken.VALUE_TRUE) return true;
@@ -196,19 +203,19 @@ protected final boolean _parseBooleanPrimitive(JsonParser p, DeserializationCont
                 _verifyNullForPrimitiveCoercion(ctxt, text);
                 return false;
             }
-            Boolean b = (Boolean) ctxt.handleWeirdStringValue(_valueClass, text,
+            Boolean b = (Boolean) ctxt.handleWeirdStringValue(targetType, text,
                     "only \"true\" or \"false\" recognized");
             return Boolean.TRUE.equals(b);
         }
         // [databind#381]
         if (t == JsonToken.START_ARRAY && ctxt.isEnabled(DeserializationFeature.UNWRAP_SINGLE_VALUE_ARRAYS)) {
             p.nextToken();
-            final boolean parsed = _parseBooleanPrimitive(p, ctxt);
+            final boolean parsed = _parseBooleanPrimitive(ctxt, p, targetType);
             _verifyEndArrayForSingle(p, ctxt);
             return parsed;
         }
         // Otherwise, no can do:
-        return ((Boolean) ctxt.handleUnexpectedToken(_valueClass, p)).booleanValue();
+        return ((Boolean) ctxt.handleUnexpectedToken(targetType, p)).booleanValue();
     }
 
     protected boolean _parseBooleanFromInt(JsonParser p, DeserializationContext ctxt)

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

@@ -883,7 +883,7 @@ public void testVoidDeser() throws Exception
 
     public void testInvalidStringCoercionFail() throws IOException
     {
-        _testInvalidStringCoercionFail(boolean[].class);
+        _testInvalidStringCoercionFail(boolean[].class, "boolean");
         _testInvalidStringCoercionFail(byte[].class);
 
         // char[] is special, cannot use generalized test here
@@ -896,15 +896,20 @@ public void testInvalidStringCoercionFail() throws IOException
     }
 
     private void _testInvalidStringCoercionFail(Class<?> cls) throws IOException
+    {
+        _testInvalidStringCoercionFail(cls, cls.getSimpleName());
+    }
+
+    private void _testInvalidStringCoercionFail(Class<?> cls, String targetTypeName)
+            throws IOException
     {
         final String JSON = "[ \"foobar\" ]";
-        final String SIMPLE_NAME = cls.getSimpleName();
 
         try {
             MAPPER.readerFor(cls).readValue(JSON);
             fail("Should not pass");
         } catch (JsonMappingException e) {
-            verifyException(e, "Cannot deserialize value of type `"+SIMPLE_NAME+"` from String \"foobar\"");
+            verifyException(e, "Cannot deserialize value of type `"+targetTypeName+"` from String \"foobar\"");
         }
     }
 }