Merge branch '2.8'

Author: cowtowncoder

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

@@ -714,7 +714,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));
     }
@@ -725,7 +726,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,
@@ -764,7 +766,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;
@@ -783,9 +786,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/BackReference1516Test.java

@@ -0,0 +1,74 @@
+package com.fasterxml.jackson.failing;
+
+import java.util.List;
+import java.util.UUID;
+
+import com.fasterxml.jackson.annotation.*;
+
+import com.fasterxml.jackson.databind.BaseMapTest;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+public class BackReference1516Test extends BaseMapTest
+{
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    static class ParentObject {
+        public UUID id;
+        public String productId;
+        public String productName;
+        public String companyName;
+        public UUID companyLogoImageId;
+        public String recordNumber;
+        public String revisionNumber;
+        public String jsonString;
+
+        // Test passes if @JsonManagedReference is removed.
+        @JsonManagedReference
+        public List<ChildObject> childSet;
+
+        public ParentObject() { }
+    }
+
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    static class ChildObject
+    {
+        public UUID id;
+        // Test passes if @JsonBackReference is removed.
+        @JsonBackReference
+        public ParentObject parentObject;
+        public UUID componentId;
+        public int orderNumber;
+        public String orderLabel;
+        public String title;
+
+        public ChildObject() { }
+    }
+
+    /*
+    /**********************************************************
+    /* Unit tests
+    /**********************************************************
+     */
+
+    private final ObjectMapper MAPPER = new ObjectMapper();
+
+    public void testIssue1516() throws Exception
+    {
+        ParentObject result = MAPPER.readValue(aposToQuotes(
+"{\n"+
+"  'companyName': 'My Famke Company',\n"+
+"  'companyLogoImageId': '29a8045e-3d10-4121-9f27-429aa74d00ad',\n"+
+"  'productId': 'ABC-0003',\n"+
+"  'productName': 'Engineering Test',\n"+
+"  'recordNumber': '01',\n"+
+"  'revisionNumber': '1.0',\n"+
+"  'procedureId': '6e6f607e-fb3f-4750-8a0a-2b38220e3328',\n"+
+"  'childSet': [ { 'title': 'Child 1',\n"+
+"       'componentId': '3f7debe1-cddc-4b66-b7a7-49249e0c9d3e',\n"+
+"       'orderLabel': '1',\n"+
+"       'orderNumber': 1\n"+
+"   } ]\n"+
+"}"),
+                ParentObject.class);
+        assertNotNull(result);
+    }
+}

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());
+    }
+}