add a failing test for #1415

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/databind/type/TypeFactory.java

@@ -716,7 +716,8 @@ public ArrayType constructArrayType(JavaType elementType) {
      * NOTE: type modifiers are NOT called on Collection type itself; but are called
      * for contained types.
      */
-    public CollectionType constructCollectionType(Class<? extends Collection> collectionClass, Class<?> elementClass) {
+    public CollectionType constructCollectionType(Class<? extends Collection> collectionClass,
+            Class<?> elementClass) {
         return constructCollectionType(collectionClass,
                 _fromClass(null, elementClass, EMPTY_BINDINGS));
     }
@@ -727,7 +728,8 @@ public CollectionType constructCollectionType(Class<? extends Collection> collec
      * NOTE: type modifiers are NOT called on Collection type itself; but are called
      * for contained types.
      */
-    public CollectionType constructCollectionType(Class<? extends Collection> collectionClass, JavaType elementType) {
+    public CollectionType constructCollectionType(Class<? extends Collection> collectionClass,
+            JavaType elementType) {
         // 19-Oct-2015, tatu: Allow case of no-type-variables, since it seems likely to be
         //    a valid use case here
         return (CollectionType) _fromClass(null, collectionClass,
@@ -766,7 +768,8 @@ public CollectionLikeType constructCollectionLikeType(Class<?> collectionClass,
      * NOTE: type modifiers are NOT called on constructed type itself; but are called
      * for contained types.
      */
-    public MapType constructMapType(Class<? extends Map> mapClass, Class<?> keyClass, Class<?> valueClass) {
+    public MapType constructMapType(Class<? extends Map> mapClass,
+            Class<?> keyClass, Class<?> valueClass) {
         JavaType kt, vt;
         if (mapClass == Properties.class) {
             kt = vt = CORE_TYPE_STRING;
@@ -785,9 +788,7 @@ public MapType constructMapType(Class<? extends Map> mapClass, Class<?> keyClass
      */
     public MapType constructMapType(Class<? extends Map> mapClass, JavaType keyType, JavaType valueType) {
         return (MapType) _fromClass(null, mapClass,
-                TypeBindings.create(mapClass, new JavaType[] {
-                        keyType, valueType
-                }));
+                TypeBindings.create(mapClass, keyType, valueType));
     }
 
     /**

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

@@ -0,0 +1,61 @@
+package com.fasterxml.jackson.failing;
+
+import java.util.*;
+
+import com.fasterxml.jackson.databind.BaseMapTest;
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.type.CollectionType;
+import com.fasterxml.jackson.databind.type.MapType;
+
+// for [databind#1415]
+public class CollectionType1415Test extends BaseMapTest
+{
+    static abstract class LongList implements List<Long> { }
+
+    static abstract class StringLongMap implements Map<String,Long> { }
+
+    /*
+    /**********************************************************
+    /* Unit tests
+    /**********************************************************
+     */
+
+    private final ObjectMapper MAPPER = new ObjectMapper();
+
+    public void testExplicitCollectionType() throws Exception
+    {
+        JavaType t = MAPPER.getTypeFactory()
+                .constructCollectionType(LongList.class, Long.class);
+        assertEquals(LongList.class, t.getRawClass());
+        assertEquals(Long.class, t.getContentType().getRawClass());
+    }
+
+    public void testImplicitCollectionType() throws Exception
+    {
+        JavaType t = MAPPER.getTypeFactory()
+                .constructParametricType(List.class, Long.class);
+        assertEquals(CollectionType.class, t.getClass());
+        assertEquals(List.class, t.getRawClass());
+        assertEquals(Long.class, t.getContentType().getRawClass());
+    }
+
+    public void testExplicitMapType() throws Exception
+    {
+        JavaType t = MAPPER.getTypeFactory()
+                .constructMapType(StringLongMap.class,
+                        String.class, Long.class);
+        assertEquals(StringLongMap.class, t.getRawClass());
+        assertEquals(String.class, t.getKeyType().getRawClass());
+        assertEquals(Long.class, t.getContentType().getRawClass());
+    }
+
+    public void testImplicitMapType() throws Exception
+    {
+        JavaType t = MAPPER.getTypeFactory()
+                .constructParametricType(Map.class, Long.class, Boolean.class);
+        assertEquals(MapType.class, t.getClass());
+        assertEquals(Long.class, t.getKeyType().getRawClass());
+        assertEquals(Boolean.class, t.getContentType().getRawClass());
+    }
+}