Merge branch '2.9' into 2.10

Author: cowtowncoder

release-notes/CREDITS-2.x

@@ -842,6 +842,11 @@ René Kschamer (flawi@github)
    as value type
    (2.9.8)
 
+Joffrey Bion (joffrey-bion@github)
+  * Reported #2265: Inconsistent handling of Collections$UnmodifiableList vs 
+    Collections$UnmodifiableRandomAccessList
+   (2.9.9)
+
 Christoph Breitkopf (bokesan@github)
   * Reported #2217: Suboptimal memory allocation in `TextNode.getBinaryValue()`
    (2.10.0)

release-notes/VERSION-2.x

@@ -46,6 +46,8 @@ Project: jackson-databind
   enableDefaultTyping causing NPE
  (reported by MeyerNils@github)
 #2251: Getter that returns an abstract collection breaks a delegating `@JsonCreator`
+#2265: Inconsistent handling of Collections$UnmodifiableList vs Collections$UnmodifiableRandomAccessList
+ (reported by Joffrey B)
 - Prevent String coercion of `null` in `WritableObjectId` when calling `JsonGenerator.writeObjectId()`,
   mostly relevant for formats like YAML that have native Object Ids
 

src/main/java/com/fasterxml/jackson/databind/deser/impl/JavaUtilCollectionsDeserializers.java

@@ -40,6 +40,11 @@ public abstract class JavaUtilCollectionsDeserializers
 
     private final static Class<?> CLASS_UNMODIFIABLE_SET;
     private final static Class<?> CLASS_UNMODIFIABLE_LIST;
+
+    /* 02-Mar-2019, tatu: for [databind#2265], need to consider possible alternate type...
+     *    which we essentially coerce into the other one
+     */
+    private final static Class<?> CLASS_UNMODIFIABLE_LIST_ALIAS;
     private final static Class<?> CLASS_UNMODIFIABLE_MAP;
 
     static {
@@ -50,7 +55,9 @@ public abstract class JavaUtilCollectionsDeserializers
         List<?> list = Collections.singletonList(Boolean.TRUE);
         CLASS_SINGLETON_LIST = list.getClass();
         CLASS_UNMODIFIABLE_LIST = Collections.unmodifiableList(list).getClass();
-
+        // for [databind#2265]
+        CLASS_UNMODIFIABLE_LIST_ALIAS = Collections.unmodifiableList(new LinkedList<Object>()).getClass();
+        
         Map<?,?> map = Collections.singletonMap("a", "b");
         CLASS_SINGLETON_MAP = map.getClass();
         CLASS_UNMODIFIABLE_MAP = Collections.unmodifiableMap(map).getClass();
@@ -69,7 +76,8 @@ public static JsonDeserializer<?> findForCollection(DeserializationContext ctxt,
             conv = converter(TYPE_SINGLETON_LIST, type, List.class);
         } else if (type.hasRawClass(CLASS_SINGLETON_SET)) {
             conv = converter(TYPE_SINGLETON_SET, type, Set.class);
-        } else if (type.hasRawClass(CLASS_UNMODIFIABLE_LIST)) {
+        // [databind#2265]: we may have another impl type for unmodifiable Lists, check both
+        } else if (type.hasRawClass(CLASS_UNMODIFIABLE_LIST) || type.hasRawClass(CLASS_UNMODIFIABLE_LIST_ALIAS)) {
             conv = converter(TYPE_UNMODIFIABLE_LIST, type, List.class);
         } else if (type.hasRawClass(CLASS_UNMODIFIABLE_SET)) {
             conv = converter(TYPE_UNMODIFIABLE_SET, type, Set.class);

src/test/java/com/fasterxml/jackson/databind/deser/jdk/TestDefaultForUtilCollections1868.java renamed to src/test/java/com/fasterxml/jackson/databind/deser/jdk/UtilCollectionsTypesTest.java

@@ -6,8 +6,8 @@
 import com.fasterxml.jackson.databind.BaseMapTest;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-// Unit tests for [databind#1868], related
-public class TestDefaultForUtilCollections1868 extends BaseMapTest
+// Unit tests for [databind#1868], [databind#1880], [databind#2265]
+public class UtilCollectionsTypesTest extends BaseMapTest
 {
    private final ObjectMapper DEFAULT_MAPPER = new ObjectMapper();
    {
@@ -60,6 +60,21 @@ public void testUnmodifiableList() throws Exception {
        _verifyCollection(Collections.unmodifiableList(Arrays.asList("first", "second")));
    }
 
+   // [databind#2265]
+   public void testUnmodifiableListFromLinkedList() throws Exception {
+       final List<String> input = new LinkedList<>();
+       input.add("first");
+       input.add("second");
+
+       // Can't use simple "_verifyCollection" as type may change; instead use
+       // bit more flexible check:
+       Collection<?> act = _writeReadCollection(Collections.unmodifiableList(input));
+       assertEquals(input, act);
+
+       // and this check may be bit fragile (may need to revisit), but is good enough for now:
+       assertEquals(Collections.unmodifiableList(new ArrayList<>(input)).getClass(), act.getClass());
+   }
+
    public void testUnmodifiableSet() throws Exception
    {
        Set<String> input = new LinkedHashSet<>(Arrays.asList("first", "second"));
@@ -96,15 +111,17 @@ public void testArraysAsList() throws Exception
    /**********************************************************
     */
 
-   protected void _verifyCollection(Collection<?> exp) throws Exception
-   {
-       String json = DEFAULT_MAPPER.writeValueAsString(exp);
-       Collection<?> act = DEFAULT_MAPPER.readValue(json, Collection.class);
-       
+   protected void _verifyCollection(Collection<?> exp) throws Exception {
+       Collection<?> act = _writeReadCollection(exp);
        assertEquals(exp, act);
        assertEquals(exp.getClass(), act.getClass());
    }
 
+   protected Collection<?> _writeReadCollection(Collection<?> input) throws Exception {
+       final String json = DEFAULT_MAPPER.writeValueAsString(input);
+       return DEFAULT_MAPPER.readValue(json, Collection.class);
+   }
+   
    protected void _verifyMap(Map<?,?> exp) throws Exception
    {
        String json = DEFAULT_MAPPER.writeValueAsString(exp);