Fix #1767

FasterXML · Sep 19, 2017 · dcfb0cc · dcfb0cc
1 parent a8e7cdf
commit dcfb0cc
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 5 deletions.
diff --git a/release-notes/VERSION b/release-notes/VERSION
@@ -5,6 +5,8 @@ Project: jackson-databind
 
 2.8.11 (not yet released)
 
+#1767: Allow `DeserializationProblemHandler` to respond to primitive types
+ (reported by nhtzr@github)
 #1768: Improve `TypeFactory.constructFromCanonical()` to work with
   `java.lang.reflect.Type.getTypeName()` format
 

diff --git a/src/main/java/com/fasterxml/jackson/databind/DeserializationContext.java b/src/main/java/com/fasterxml/jackson/databind/DeserializationContext.java
@@ -914,7 +914,7 @@ public Object handleWeirdStringValue(Class<?> targetClass, String value,
             Object instance = h.value().handleWeirdStringValue(this, targetClass, value, msg);
             if (instance != DeserializationProblemHandler.NOT_HANDLED) {
                 // Sanity check for broken handlers, otherwise nasty to debug:
-                if ((instance == null) || targetClass.isInstance(instance)) {
+                if (_isCompatible(targetClass, instance)) {
                     return instance;
                 }
                 throw weirdStringException(value, targetClass, String.format(
@@ -959,7 +959,7 @@ public Object handleWeirdNumberValue(Class<?> targetClass, Number value,
             Object key = h.value().handleWeirdNumberValue(this, targetClass, value, msg);
             if (key != DeserializationProblemHandler.NOT_HANDLED) {
                 // Sanity check for broken handlers, otherwise nasty to debug:
-                if ((key == null) || targetClass.isInstance(key)) {
+                if (_isCompatible(targetClass, key)) {
                     return key;
                 }
                 throw weirdNumberException(value, targetClass, String.format(
@@ -1000,7 +1000,7 @@ public Object handleMissingInstantiator(Class<?> instClass, JsonParser p,
                     instClass, p, msg);
             if (instance != DeserializationProblemHandler.NOT_HANDLED) {
                 // Sanity check for broken handlers, otherwise nasty to debug:
-                if ((instance == null) || instClass.isInstance(instance)) {
+                if (_isCompatible(instClass, instance)) {
                     return instance;
                 }
                 throw instantiationException(instClass, String.format(
@@ -1039,7 +1039,7 @@ public Object handleInstantiationProblem(Class<?> instClass, Object argument,
             Object instance = h.value().handleInstantiationProblem(this, instClass, argument, t);
             if (instance != DeserializationProblemHandler.NOT_HANDLED) {
                 // Sanity check for broken handlers, otherwise nasty to debug:
-                if ((instance == null) || instClass.isInstance(instance)) {
+                if (_isCompatible(instClass, instance)) {
                     return instance;
                 }
                 throw instantiationException(instClass, String.format(
@@ -1102,7 +1102,7 @@ public Object handleUnexpectedToken(Class<?> instClass, JsonToken t,
             Object instance = h.value().handleUnexpectedToken(this,
                     instClass, t, p, msg);
             if (instance != DeserializationProblemHandler.NOT_HANDLED) {
-                if ((instance == null) || instClass.isInstance(instance)) {
+                if (_isCompatible(instClass, instance)) {
                     return instance;
                 }
                 reportMappingException("DeserializationProblemHandler.handleUnexpectedToken() for type %s returned value of type %s",
@@ -1170,6 +1170,19 @@ public JavaType handleUnknownTypeId(JavaType baseType, String id,
         throw unknownTypeIdException(baseType, id, extraDesc);
     }
 
+    /**
+     * @since 2.9.2
+     */
+    protected boolean _isCompatible(Class<?> target, Object value)
+    {
+        if ((value == null) || target.isInstance(value)) {
+            return true;
+        }
+        // [databind#1767]: Make sure to allow wrappers for primitive fields
+        return target.isPrimitive()
+                && ClassUtil.wrapperType(target).isInstance(value);
+    }
+
     /*
     /**********************************************************
     /* Methods for problem reporting, in cases where recovery

diff --git a/src/test/java/com/fasterxml/jackson/databind/filter/ProblemHandler1767Test.java b/src/test/java/com/fasterxml/jackson/databind/filter/ProblemHandler1767Test.java
@@ -0,0 +1,45 @@
+package com.fasterxml.jackson.databind.filter;
+
+import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.databind.deser.DeserializationProblemHandler;
+
+public class ProblemHandler1767Test extends BaseMapTest
+{
+    static class IntHandler
+            extends DeserializationProblemHandler
+    {
+        @Override
+        public Object handleWeirdStringValue(DeserializationContext ctxt,
+                Class<?> targetType,
+                String valueToConvert,
+                String failureMsg)
+        {
+            if (targetType != Integer.TYPE) {
+                return NOT_HANDLED;
+            }
+            return 1;
+        }
+    }
+
+    static class TestBean {
+        int a;
+
+        public int getA() {
+            return a;
+        }
+
+        public void setA(int a) {
+            this.a = a;
+        }
+
+    }
+
+    public void testPrimitivePropertyWithHandler() throws Exception {
+        final ObjectMapper mapper = new ObjectMapper();
+        mapper.addHandler(new IntHandler());
+        TestBean result = mapper.readValue(aposToQuotes("{'a': 'not-a-number'}"), TestBean.class);
+        assertNotNull(result);
+        assertEquals(1, result.a);
+    }
+
+}