Merge branch '2.8'

Author: cowtowncoder

release-notes/CREDITS

@@ -613,6 +613,11 @@ Marco Catania ([email protected])
   * 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

@@ -94,6 +94,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.*;
 import com.fasterxml.jackson.databind.exc.InvalidFormatException;
 import com.fasterxml.jackson.databind.util.ClassUtil;
@@ -138,10 +139,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 | MalformedURLException e) {
                 cause = e;
             }
@@ -302,7 +303,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/main/java/com/fasterxml/jackson/databind/deser/std/StdKeyDeserializer.java

@@ -189,13 +189,13 @@ protected Object _parse(String key, DeserializationContext ctxt) throws Exceptio
         case TYPE_LOCALE:
             try {
                 return _deser._deserialize(key, ctxt);
-            } catch (IOException e) {
+            } catch (IllegalArgumentException e) {
                 return _weirdKey(ctxt, key, e);
             }
         case TYPE_CURRENCY:
             try {
                 return _deser._deserialize(key, ctxt);
-            } catch (IOException e) {
+            } catch (IllegalArgumentException e) {
                 return _weirdKey(ctxt, key, e);
             }
         case TYPE_DATE:
@@ -229,7 +229,7 @@ protected Object _parse(String key, DeserializationContext ctxt) throws Exceptio
         case TYPE_BYTE_ARRAY:
             try {
                 return ctxt.getConfig().getBase64Variant().decode(key);
-            } catch (Exception e) {
+            } catch (IllegalArgumentException e) {
                 return _weirdKey(ctxt, key, e);
             }
         default:

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

@@ -2,6 +2,7 @@
 
 import java.io.IOException;
 import java.util.Map;
+import java.util.UUID;
 
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.core.JsonParser;
@@ -261,6 +262,12 @@ public void testWeirdStringHandling() throws Exception
             ;
         SingleValuedEnum result = mapper.readValue("\"B\"", SingleValuedEnum.class);
         assertEquals(SingleValuedEnum.A, result);
+
+        // also, write [databind#1629] try this
+        mapper = new ObjectMapper()
+                .addHandler(new WeirdStringHandler(null));
+        UUID result2 = mapper.readValue(quote("not a uuid!"), UUID.class);
+        assertNull(result2);
     }
 
     public void testInvalidTypeId() throws Exception