Merge branch 'master' into ng-3.0

Author: cowtowncoder

release-notes/VERSION

@@ -3,7 +3,7 @@ Project: jackson-databind
 === Releases === 
 ------------------------------------------------------------------------
 
-2.9.1 (not yet released)
+2.9.1 (07-Sep-2017)
 
 #1705: Non-generic interface method hides type resolution info from generic base class
  (reported by Tim B)
@@ -21,6 +21,7 @@ Project: jackson-databind
  (contributed by Bertrand R)
 - Fix `DelegatingDeserializer` constructor to pass `handledType()` (and
   not type of deserializer being delegated to!)
+- Add `Automatic-Module-Name` ("com.fasterxml.jackson.databind") for JDK 9 module system
 
 2.9.0 (30-Jul-2017)
 

src/test/java/com/fasterxml/jackson/databind/jsontype/TestNoTypeInfo.java renamed to src/test/java/com/fasterxml/jackson/databind/jsontype/NoTypeInfoTest.java

@@ -5,7 +5,7 @@
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 
-public class TestNoTypeInfo extends BaseMapTest
+public class NoTypeInfoTest extends BaseMapTest
 {
     @JsonTypeInfo(use=JsonTypeInfo.Id.NONE)
     @JsonDeserialize(as=NoType.class)
@@ -15,17 +15,16 @@ static interface NoTypeInterface {
     final static class NoType implements NoTypeInterface {
         public int a = 3;
     }
-    
+
     /*
     /**********************************************************
-    /* Unit tests
+    /* Test methods
     /**********************************************************
      */
 
-    // for [JACKSON-746]
     public void testWithIdNone() throws Exception
     {
-        final ObjectMapper mapper = new ObjectMapper();
+        final ObjectMapper mapper = newObjectMapper();
         mapper.enableDefaultTyping();
         // serialize without type info
         String json = mapper.writeValueAsString(new NoType());

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

@@ -0,0 +1,75 @@
+package com.fasterxml.jackson.failing;
+
+import java.io.IOException;
+import java.util.*;
+
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+
+public class NoTypeInfo1654Test extends BaseMapTest
+{
+    // [databind#1654]
+
+    @JsonTypeInfo(use = JsonTypeInfo.Id.NAME)
+    static class Value1654 {
+        public int x;
+
+        protected Value1654() { }
+        public Value1654(int x) { this.x = x; }
+    }
+
+    static class Value1654TypedContainer {
+        public List<Value1654> values;
+
+        protected Value1654TypedContainer() { }
+        public Value1654TypedContainer(Value1654... v) {
+            values = Arrays.asList(v);
+        }
+    }
+
+    static class Value1654UntypedContainer {
+        @JsonDeserialize(contentUsing = Value1654Deserializer.class)
+        @JsonTypeInfo(use = JsonTypeInfo.Id.NONE)
+        public List<Value1654> values;
+    }
+
+    static class Value1654Deserializer extends JsonDeserializer<Value1654> {
+        @Override
+        public Value1654 deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
+            p.skipChildren();
+            return new Value1654(13);
+        }
+    }
+
+    /*
+    /**********************************************************
+    /* Test methods
+    /**********************************************************
+     */
+
+    // [databind#1654]
+    public void testNoTypeElementOverride() throws Exception
+    {
+        final ObjectMapper mapper = newObjectMapper();
+
+        // First: regular typed case
+        String json = mapper.writeValueAsString(new Value1654TypedContainer(
+                new Value1654(1),
+                new Value1654(2),
+                new Value1654(3)
+        ));
+        Value1654TypedContainer result = mapper.readValue(json, Value1654TypedContainer.class);
+        assertEquals(3, result.values.size());
+        assertEquals(2, result.values.get(1).x);
+
+        // and then actual failing case
+        final String noTypeJson = aposToQuotes(
+                "{'values':[{'x':3},{'x': 7}] }"
+                );
+        Value1654UntypedContainer unResult = mapper.readValue(noTypeJson, Value1654UntypedContainer.class);
+        assertEquals(2, unResult.values.size());
+        assertEquals(7, unResult.values.get(1).x);
+    }
+}