Merge branch '2.6'

Author: cowtowncoder

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

@@ -37,6 +37,9 @@ public CustomList deserialize(JsonParser jp, DeserializationContext ctxt)
 
     static class XBean {
         public int x;
+
+        public XBean() { }
+        public XBean(int x) { this.x = x; }
     }
 
     // [Issue#199]
@@ -281,4 +284,22 @@ public void testWrapExceptions() throws Exception
             assertEquals("I want to catch this exception", exc.getMessage());
         }
     }
+
+    // And then a round-trip test for singleton collections
+    public void testSingletonCollections() throws Exception
+    {
+        final TypeReference<?> xbeanListType = new TypeReference<List<XBean>>() { };
+
+        String json = MAPPER.writeValueAsString(Collections.singleton(new XBean(3)));
+        Collection<XBean> result = MAPPER.readValue(json, xbeanListType);
+        assertNotNull(result);
+        assertEquals(1, result.size());
+        assertEquals(3, result.iterator().next().x);
+
+        json = MAPPER.writeValueAsString(Collections.singletonList(new XBean(28)));
+        result = MAPPER.readValue(json, xbeanListType);
+        assertNotNull(result);
+        assertEquals(1, result.size());
+        assertEquals(28, result.iterator().next().x);
+    }
 }

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

@@ -11,6 +11,7 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.deser.TestCollectionDeserialization.XBean;
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
 
 @SuppressWarnings("serial")
@@ -576,7 +577,21 @@ public void testReadProperties() throws Exception
         assertEquals("123", props.getProperty("b"));
         assertEquals("true", props.getProperty("c"));
     }
-    
+
+    // JDK singletonMap
+    public void testSingletonMapRoundtrip() throws Exception
+    {
+        final TypeReference<?> type = new TypeReference<Map<String,IntWrapper>>() { };
+
+        String json = MAPPER.writeValueAsString(Collections.singletonMap("value", new IntWrapper(5)));
+        Map<String,IntWrapper> result = MAPPER.readValue(json, type);
+        assertNotNull(result);
+        assertEquals(1, result.size());
+        IntWrapper w = result.get("value");
+        assertNotNull(w);
+        assertEquals(5, w.i);
+    }
+
     /*
     /**********************************************************
     /* Error tests

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

@@ -6,8 +6,6 @@
 
 public class EnumCreatorTest929 extends BaseMapTest
 {
-    private final ObjectMapper MAPPER = new ObjectMapper();
-
     static enum MyEnum
     {
         A, B, C;
@@ -20,6 +18,8 @@ static MyEnum forValues(@JsonProperty("id") int intProp,
         }
     }
 
+    private final ObjectMapper MAPPER = new ObjectMapper();
+
     // for [databind#929]
     public void testMultiArgEnumCreator() throws Exception
     {

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

@@ -0,0 +1,108 @@
+package com.fasterxml.jackson.failing;
+
+import java.util.*;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.databind.*;
+
+// For [databind#936], losing parametric type information it seems
+public class PolymorphicListTest936 extends BaseMapTest
+{
+    // note: would prefer using CharSequence, but while abstract, that's deserialized
+    // just fine as ... String
+    static class StringyList<T extends java.io.Serializable> implements Collection<T> {
+        private Collection<T> _stuff;
+
+        @JsonCreator
+        public StringyList(Collection<T> src) {
+            _stuff = new ArrayList<T>(src);
+        }
+
+        public StringyList() {
+            _stuff = new ArrayList<T>();
+        }
+        
+        @Override
+        public boolean add(T arg) {
+            return _stuff.add(arg);
+        }
+
+        @Override
+        public boolean addAll(Collection<? extends T> args) {
+            return _stuff.addAll(args);
+        }
+
+        @Override
+        public void clear() {
+            _stuff.clear();
+        }
+
+        @Override
+        public boolean contains(Object arg) {
+            return _stuff.contains(arg);
+        }
+
+        @Override
+        public boolean containsAll(Collection<?> args) {
+            return _stuff.containsAll(args);
+        }
+
+        @Override
+        public boolean isEmpty() {
+            return _stuff.isEmpty();
+        }
+
+        @Override
+        public Iterator<T> iterator() {
+            return _stuff.iterator();
+        }
+
+        @Override
+        public boolean remove(Object arg) {
+            return _stuff.remove(arg);
+        }
+
+        @Override
+        public boolean removeAll(Collection<?> args) {
+            return _stuff.removeAll(args);
+        }
+
+        @Override
+        public boolean retainAll(Collection<?> args) {
+            return _stuff.retainAll(args);
+        }
+
+        @Override
+        public int size() {
+            return _stuff.size();
+        }
+
+        @Override
+        public Object[] toArray() {
+            return _stuff.toArray();
+        }
+
+        @Override
+        public <X> X[] toArray(X[] arg) {
+            return _stuff.toArray(arg);
+        }
+    }
+
+    private final ObjectMapper MAPPER = new ObjectMapper();
+    
+    public void testPolymorphicWithOverride() throws Exception
+    {
+        JavaType type = MAPPER.getTypeFactory().constructCollectionType(StringyList.class, String.class);
+        
+        StringyList<String> list = new StringyList<String>();
+        list.add("value 1");
+        list.add("value 2");
+        
+        String serialized = MAPPER.writeValueAsString(list);
+        System.out.println(serialized);
+        
+        StringyList<String> deserialized = MAPPER.readValue(serialized, type);
+        System.out.println(deserialized);
+        
+    }
+}