Merge branch '2.12'

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/databind/deser/ValueInstantiator.java

@@ -410,7 +410,6 @@ public Class<?> getValueClass() {
         }
     }
 
-
     /**
      * Delegating {@link ValueInstantiator} implementation meant as a base type
      * that by default delegates methods to specified fallback instantiator.
@@ -529,7 +528,7 @@ public Object createFromDouble(DeserializationContext ctxt, double value) throws
         @Override
         public Object createFromBoolean(DeserializationContext ctxt, boolean value) throws IOException {
             return delegate().createFromBoolean(ctxt, value);
-        }    
+        }
 
         /*
         /**********************************************************

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

@@ -305,10 +305,9 @@ public void testURLInvalid() throws Exception
 
     public void testUUID() throws Exception
     {
-        final ObjectMapper mapper = jsonMapperBuilder()
-                .disable(DeserializationFeature.UNWRAP_SINGLE_VALUE_ARRAYS)
-                .build();
         final String NULL_UUID = "00000000-0000-0000-0000-000000000000";
+        final ObjectReader r = MAPPER.readerFor(UUID.class);
+
         // first, couple of generated UUIDs:
         for (String value : new String[] {
                 "76e6d183-5f68-4afa-b94a-922c1fdb83f8",
@@ -320,7 +319,8 @@ public void testUUID() throws Exception
         }) {
             UUID uuid = UUID.fromString(value);
             assertEquals(uuid,
-                    mapper.readValue(quote(value), UUID.class));
+                    r.without(DeserializationFeature.UNWRAP_SINGLE_VALUE_ARRAYS)
+                        .readValue(quote(value)));
         }
         // then use templating; note that these are not exactly valid UUIDs
         // wrt spec (type bits etc), but JDK UUID should deal ok
@@ -330,13 +330,13 @@ public void testUUID() throws Exception
         for (int i = 0; i < chars.length(); ++i) {
             String value = TEMPL.replace('0', chars.charAt(i));
             assertEquals(UUID.fromString(value).toString(),
-                    mapper.readValue(quote(value), UUID.class).toString());
+                    r.readValue(quote(value)).toString());
         }
 
         // also: see if base64 encoding works as expected
         String base64 = Base64Variants.getDefaultVariant().encode(new byte[16]);
         assertEquals(UUID.fromString(NULL_UUID),
-                mapper.readValue(quote(base64), UUID.class));
+                r.readValue(quote(base64)));
     }
 
     public void testUUIDInvalid() throws Exception

src/test/java/com/fasterxml/jackson/failing/JDKStringLikeTypes2066Test.java

@@ -0,0 +1,99 @@
+package com.fasterxml.jackson.failing;
+
+import java.util.UUID;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.OptBoolean;
+
+import com.fasterxml.jackson.databind.BaseMapTest;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+public class JDKStringLikeTypes2066Test extends BaseMapTest
+{
+    static class UUIDWrapper {
+        public UUID value;
+    }
+
+    static class StrictUUIDWrapper {
+        @JsonFormat(lenient=OptBoolean.FALSE)
+        public UUID value;
+    }
+
+    /*
+    /**********************************************************
+    /* Test methods
+    /**********************************************************
+     */
+
+    // [databind#2066]
+    public void testUUIDLeniencyDefault() throws Exception
+    {
+        final ObjectMapper MAPPER = objectMapper();
+
+        // By default, empty String OK
+        assertNull(MAPPER.readValue(quote(""), UUID.class));
+
+        UUIDWrapper w = MAPPER.readValue("{\"value\":\"\"}", UUIDWrapper.class);
+        assertNull(w.value);
+    }
+
+    // [databind#2066]
+    public void testUUIDLeniencyGlobal() throws Exception
+    {
+        final ObjectMapper STRICT_MAPPER = jsonMapperBuilder()
+                .defaultLeniency(Boolean.FALSE)
+                .build();
+        try {
+            STRICT_MAPPER.readValue(quote(""), UUID.class);
+            fail("Should not pass");
+        } catch (Exception e) {
+            _verifyBadUUID(e);
+        }
+
+        try {
+            STRICT_MAPPER.readValue("{\"value\":\"\"}", UUIDWrapper.class);
+            fail("Should not pass");
+        } catch (Exception e) {
+            _verifyBadUUID(e);
+        }
+    }
+
+    // [databind#2066]
+    public void testUUIDLeniencyByType() throws Exception
+    {
+        final ObjectMapper STRICT_MAPPER = jsonMapperBuilder()
+                .withConfigOverride(UUID.class,
+                        cfg -> cfg.setFormat(JsonFormat.Value.forLeniency(false)))
+                .build();
+
+        try {
+            STRICT_MAPPER.readValue(quote(""), UUID.class);
+            fail("Should not pass");
+        } catch (Exception e) {
+            _verifyBadUUID(e);
+        }
+
+        try {
+            STRICT_MAPPER.readValue("{\"value\":\"\"}", UUIDWrapper.class);
+            fail("Should not pass");
+        } catch (Exception e) {
+            _verifyBadUUID(e);
+        }
+    }
+
+    // [databind#2066]
+    public void testUUIDLeniencyByProperty() throws Exception
+    {
+        final ObjectMapper MAPPER = objectMapper();
+        try {
+            MAPPER.readValue("{\"value\":\"\"}", StrictUUIDWrapper.class);
+            fail("Should not pass");
+        } catch (Exception e) {
+            _verifyBadUUID(e);
+        }
+    }
+
+    private void _verifyBadUUID(Exception e) {
+        verifyException(e, "foobar"); // TODO: real exception message we want
+    }
+}