Merge branch '2.11' into 2.12

Author: cowtowncoder

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

@@ -189,7 +189,7 @@ public CollectionDeserializer createContextual(DeserializationContext ctxt,
             valueTypeDeser = valueTypeDeser.forProperty(property);
         }
         NullValueProvider nuller = findContentNullProvider(ctxt, property, valueDeser);
-        if ( (unwrapSingle != _unwrapSingle)
+        if ((unwrapSingle != _unwrapSingle)
                 || (nuller != _nullProvider)
                 || (delegateDeser != _delegateDeserializer)
                 || (valueDeser != _valueDeserializer)
@@ -236,9 +236,15 @@ public Collection<Object> deserialize(JsonParser p, DeserializationContext ctxt)
         // there is also possibility of "auto-wrapping" of single-element arrays.
         // Hence we only accept empty String here.
         if (p.hasToken(JsonToken.VALUE_STRING)) {
-            String str = p.getText();
-            if (str.length() == 0) {
-                return (Collection<Object>) _valueInstantiator.createFromString(ctxt, str);
+            // 16-May-2020, tatu: As [dataformats-text#199] need to avoid blocking
+            //    check to `isExpectedStartArrayToken()` (needed for CSV in-field array/list logic)
+            // ... alas, trying to do this here leads to 2 unit test regressions so will
+            //   need to figure out safer mechanism.
+//            if (_valueInstantiator.canCreateFromString()) {
+                String str = p.getText();
+                if (str.length() == 0) {
+                    return (Collection<Object>) _valueInstantiator.createFromString(ctxt, str);
+//                }
             }
         }
         return deserialize(p, ctxt, createDefaultInstance(ctxt));

src/test/java/com/fasterxml/jackson/databind/deser/TestArrayDeserialization.java

@@ -11,6 +11,7 @@
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
 import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.databind.util.ClassUtil;
 
 /**
  * This unit test suite tries to verify that the "Native" java type
@@ -188,24 +189,24 @@ public void testIntegerArray() throws Exception
     // [JACKSON-620]: allow "" to mean 'null' for Arrays, List and Maps
     public void testFromEmptyString() throws Exception
     {
-        ObjectMapper m = new ObjectMapper();
-        m.configure(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT, true);
-        assertNull(m.readValue(quote(""), Object[].class));
-        assertNull( m.readValue(quote(""), String[].class));
-        assertNull( m.readValue(quote(""), int[].class));
+        ObjectReader r = MAPPER.reader()
+                .with(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT);
+        assertNull(r.forType(Object[].class).readValue(quote("")));
+        assertNull(r.forType(String[].class).readValue(quote("")));
+        assertNull(r.forType(int[].class).readValue(quote("")));
     }
 
     // [JACKSON-620]: allow "" to mean 'null' for Arrays, List and Maps
     public void testFromEmptyString2() throws Exception
     {
-        ObjectMapper m = new ObjectMapper();
-        m.configure(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT, true);
-        m.configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, true);
-        Product p = m.readValue("{\"thelist\":\"\"}", Product.class);
+        ObjectReader r = MAPPER.readerFor(Product.class)
+                .with(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT,
+                        DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        Product p = r.readValue("{\"thelist\":\"\"}");
         assertNotNull(p);
         assertNull(p.thelist);
     }
-    
+
     /*
     /**********************************************************
     /* Arrays of arrays...

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

@@ -564,7 +564,7 @@ private void _testEmptyToNullCoercion(Class<?> primType, Object emptyValue) thro
     public void testBase64Variants() throws Exception
     {
         final byte[] INPUT = "abcdefghijklmnopqrstuvwxyz1234567890abcdefghijklmnopqrstuvwxyz1234567890X".getBytes("UTF-8");
-        
+
         // default encoding is "MIME, no linefeeds", so:
         Assert.assertArrayEquals(INPUT, MAPPER.readValue(
                 quote("YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXoxMjM0NTY3ODkwYWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXoxMjM0NTY3ODkwWA=="),
@@ -585,7 +585,7 @@ public void testBase64Variants() throws Exception
         Assert.assertArrayEquals(INPUT, (byte[]) reader.with(Base64Variants.PEM).readValue(
                 quote("YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXoxMjM0NTY3ODkwYWJjZGVmZ2hpamts\\nbW5vcHFyc3R1dnd4eXoxMjM0NTY3ODkwWA=="
         )));
-    }    
+    }
 
     /*
     /**********************************************************