Fix #1629

Author: cowtowncoder

release-notes/CREDITS

@@ -609,6 +609,11 @@ Marco Catania (catanm@github.com)
   * Contributed #1597: Escape JSONP breaking characters
    (2.8.9)
 
+Andrew Joseph (apjoseph@github)
+  * Reported #1629 `FromStringDeserializer` ignores registered `DeserializationProblemHandler`
+    for `java.util.UUID`
+   (2.8.9)
+
 Connor Kuhn (ckuhn@github)
   * Contributed #1341: FAIL_ON_MISSING_EXTERNAL_TYPE_ID_PROPERTY
    (2.9.0)

release-notes/VERSION

@@ -9,6 +9,9 @@ Project: jackson-databind
  (reported by Javy L)
 #1597: Escape JSONP breaking characters
  (contributed by Marco C)
+#1629: `FromStringDeserializer` ignores registered `DeserializationProblemHandler`
+  for `java.util.UUID`
+ (reported by Andrew J)
 
 2.8.8.1 (19-Apr-2017)
 

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

@@ -13,6 +13,7 @@
 import java.util.regex.Pattern;
 
 import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.util.VersionUtil;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.JsonMappingException;
@@ -112,10 +113,10 @@ public T deserialize(JsonParser p, DeserializationContext ctxt) throws IOExcepti
             }
             Exception cause = null;
             try {
-                T result = _deserialize(text, ctxt);
-                if (result != null) {
-                    return result;
-                }
+                // 19-May-2017, tatu: Used to require non-null result (assuming `null`
+                //    indicated error; but that seems wrong. Should be able to return
+                //    `null` as value.
+                return _deserialize(text, ctxt);
             } catch (IllegalArgumentException iae) {
                 cause = iae;
             } catch (MalformedURLException me) {
@@ -277,7 +278,8 @@ protected Object _deserialize(String value, DeserializationContext ctxt) throws
             case STD_STRING_BUILDER:
                 return new StringBuilder(value);
             }
-            throw new IllegalArgumentException();
+            VersionUtil.throwInternal();
+            return null;
         }
 
         @Override

src/test/java/com/fasterxml/jackson/databind/filter/ProblemHandlerTest.java

@@ -242,11 +242,10 @@ public void testWeirdStringHandling() throws Exception
         assertEquals(SingleValuedEnum.A, result);
 
         // also, write [databind#1629] try this
-        UUID defaultUUID = UUID.nameUUIDFromBytes("abc".getBytes());
         mapper = new ObjectMapper()
-                .addHandler(new WeirdStringHandler(defaultUUID));
+                .addHandler(new WeirdStringHandler(null));
         UUID result2 = mapper.readValue(quote("not a uuid!"), UUID.class);
-        assertEquals(defaultUUID, result2);
+        assertNull(result2);
     }
 
     public void testInvalidTypeId() throws Exception