Merge branch '2.7' into 2.8

Author: cowtowncoder

release-notes/VERSION

@@ -224,6 +224,14 @@ Project: jackson-databind
  (reported by William H)
 #1225: `JsonMappingException` should override getProcessor()
  (reported by Nick B)
+
+2.6.8 (if ever released)
+
+#1383: Problem with `@JsonCreator` with 1-arg factory-method, implicit param names
+
+2.6.7 (05-Jun-2016)
+
+#1194: Incorrect signature for generic type via `JavaType.getGenericSignature
 #1228: @JsonAnySetter does not deserialize null to Deserializer's NullValue
  (contributed by Eric S)
 #1231: `@JsonSerialize(as=superType)` behavior disallowed in 2.7.4

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

@@ -7,6 +7,9 @@
 import java.util.Map;
 
 import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonSubTypes.Type;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.deser.JDKScalarsTest.PrimitivesBean;
@@ -38,9 +41,46 @@ public Map<String,String> getAny(){
             return this.any;
         }
     }
+    
+    // [databind#1601]
+    static class RootData {
+        public String name;
+        public String type;
+        @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXTERNAL_PROPERTY,
+                property = "type")
+        @JsonSubTypes({
+                @Type(value = TypeA.class, name = "TypeA"),
+                @Type(value = TypeB.class, name = "TypeB")})
+        public Proxy proxy;
+
+        public RootData() {}
+
+        public RootData(String name, String type, Proxy proxy) {
+            this.name = name;
+            this.type = type;
+            this.proxy = proxy;
+        }
+    }
+    static interface Proxy { }
+
+    static class TypeA implements Proxy {
+        public String aValue;
+        public TypeA() {}
+        public TypeA(String a) {
+            this.aValue = a;
+        }
+    }
+
+    static class TypeB implements Proxy {
+        public String bValue;
+        public TypeB() {}
+        public TypeB(String b) {
+            this.bValue = b;
+        }
+    }
 
     private final ObjectMapper MAPPER = objectMapper();
-    
+
     /*
     /**********************************************************
     /* Test methods
@@ -221,4 +261,21 @@ public void testMapOfNulls() throws Exception
         assertEquals(1, deser.size());
         assertEquals("funny", deser.get("key"));
     }
+
+    // [databind#1601]
+    public void testPolymorphicDataNull() throws Exception
+    {
+        String typeA =
+                "{\"name\":\"TypeAData\", \"type\":\"TypeA\", \"proxy\":{\"aValue\":\"This works!\"}}";
+        RootData typeAData = MAPPER.readValue(typeA, RootData.class);
+        assertEquals("No value for aValue!?", "This works!", ((TypeA) typeAData.proxy).aValue);
+        String typeB =
+                "{\"name\":\"TypeBData\", \"type\":\"TypeB\", \"proxy\":{\"bValue\":\"This works too!\"}}";
+        RootData typeBData = MAPPER.readValue(typeB, RootData.class);
+        assertEquals("No value for bValue!?", "This works too!", ((TypeB) typeBData.proxy).bValue);
+        String typeBNull =
+                "{\"name\":\"TypeBData\", \"type\":\"TypeB\", \"proxy\": null}";
+        RootData typeBNullData = MAPPER.readValue(typeBNull, RootData.class);
+        assertNull("Proxy should be null!", typeBNullData.proxy);
+    }
 }