Mark eclipse-collections immutable collections as collection-like for nested list handling [Fixes #71] (#72)

Author: yawkat

eclipse-collections/src/main/java/com/fasterxml/jackson/datatype/eclipsecollections/EclipseCollectionsDeserializers.java

@@ -8,7 +8,9 @@
 import com.fasterxml.jackson.databind.KeyDeserializer;
 import com.fasterxml.jackson.databind.deser.Deserializers;
 import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
+import com.fasterxml.jackson.databind.type.CollectionLikeType;
 import com.fasterxml.jackson.databind.type.CollectionType;
+import com.fasterxml.jackson.databind.type.MapLikeType;
 import com.fasterxml.jackson.databind.type.MapType;
 import com.fasterxml.jackson.datatype.eclipsecollections.deser.bag.ImmutableBagDeserializer;
 import com.fasterxml.jackson.datatype.eclipsecollections.deser.bag.ImmutableSortedBagDeserializer;
@@ -167,7 +169,20 @@ public JsonDeserializer<?> findCollectionDeserializer(
             TypeDeserializer elementTypeDeserializer,
             JsonDeserializer<?> elementDeserializer
     ) throws JsonMappingException {
-        //noinspection SuspiciousMethodCalls
+        if (REFERENCE_TYPES.contains(type.getRawClass())) {
+            return findReferenceDeserializer(type, elementTypeDeserializer, elementDeserializer);
+        }
+        return null;
+    }
+
+    @Override
+    public JsonDeserializer<?> findCollectionLikeDeserializer(
+            CollectionLikeType type,
+            DeserializationConfig config,
+            BeanDescription beanDesc,
+            TypeDeserializer elementTypeDeserializer,
+            JsonDeserializer<?> elementDeserializer
+    ) throws JsonMappingException {
         if (REFERENCE_TYPES.contains(type.getRawClass())) {
             return findReferenceDeserializer(type, elementTypeDeserializer, elementDeserializer);
         }
@@ -183,7 +198,18 @@ public JsonDeserializer<?> findMapDeserializer(
             TypeDeserializer elementTypeDeserializer,
             JsonDeserializer<?> elementDeserializer
     ) throws JsonMappingException {
+        return findBeanDeserializer(type, config, beanDesc);
+    }
 
+    @Override
+    public JsonDeserializer<?> findMapLikeDeserializer(
+            MapLikeType type,
+            DeserializationConfig config,
+            BeanDescription beanDesc,
+            KeyDeserializer keyDeserializer,
+            TypeDeserializer elementTypeDeserializer,
+            JsonDeserializer<?> elementDeserializer
+    ) throws JsonMappingException {
         return findBeanDeserializer(type, config, beanDesc);
     }
 

eclipse-collections/src/main/java/com/fasterxml/jackson/datatype/eclipsecollections/EclipseCollectionsModule.java

@@ -30,6 +30,8 @@ public void setupModule(SetupContext context) {
         context.addSerializers(new EclipseCollectionsSerializers());
 
         context.addValueInstantiators(new PairInstantiators());
+
+        context.addTypeModifier(new EclipseCollectionsTypeModifier());
     }
 
     @Override

eclipse-collections/src/main/java/com/fasterxml/jackson/datatype/eclipsecollections/EclipseCollectionsTypeModifier.java

@@ -0,0 +1,22 @@
+package com.fasterxml.jackson.datatype.eclipsecollections;
+
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.type.CollectionLikeType;
+import com.fasterxml.jackson.databind.type.TypeBindings;
+import com.fasterxml.jackson.databind.type.TypeFactory;
+import com.fasterxml.jackson.databind.type.TypeModifier;
+import java.lang.reflect.Type;
+import org.eclipse.collections.api.collection.ImmutableCollection;
+
+class EclipseCollectionsTypeModifier extends TypeModifier {
+    @Override
+    public JavaType modifyType(JavaType type, Type jdkType, TypeBindings context, TypeFactory typeFactory) {
+        if (!type.isCollectionLikeType()) {
+            JavaType collectionType = type.findSuperType(ImmutableCollection.class);
+            if (collectionType != null) {
+                return CollectionLikeType.upgradeFrom(type, collectionType.containedType(0));
+            }
+        }
+        return type;
+    }
+}

eclipse-collections/src/test/java/com/fasterxml/jackson/datatype/eclipsecollections/DeserializerTest.java

@@ -566,6 +566,32 @@ public int hashCode() {
         }
     }
 
+    @Test
+    public void typeInfoNestedMapList() throws IOException {
+        // test case for jackson-datatypes-collections#71
+        ImmutableMap<String, ImmutableList<A>> property =
+                Maps.immutable.of("foo", Lists.immutable.of(new B()));
+        Assert.assertEquals(
+                mapperWithModule().readValue(
+                        "{\"foo\": [{\"@c\": \".DeserializerTest$B\"}]}",
+                        new TypeReference<ImmutableMap<String, ImmutableList<A>>>() {}),
+                property
+        );
+    }
+
+    @Test
+    public void typeInfoNestedMapMap() throws IOException {
+        // auxiliary test case for jackson-datatypes-collections#71 - also worked before fix
+        ImmutableMap<String, ImmutableMap<String, A>> property =
+                Maps.immutable.of("foo", Maps.immutable.of("bar", new B()));
+        Assert.assertEquals(
+                mapperWithModule().readValue(
+                        "{\"foo\": {\"bar\": {\"@c\": \".DeserializerTest$B\"}}}",
+                        new TypeReference<ImmutableMap<String, ImmutableMap<String, A>>>() {}),
+                property
+        );
+    }
+
     @Test
     public void primitivePairs() throws Exception {
         List<Class<?>> types = Arrays.asList(