Merge branch '2.10'

Author: cowtowncoder

release-notes/VERSION-2.x

@@ -10,6 +10,7 @@ Project: jackson-databind
 #1675: Remove "impossible" `IOException` in `readTree()` and `readValue()` `ObjectMapper`
   methods which accept Strings
  (requested by matthew-pwnieexpress@github)
+#1995: Limit size of `DeserializerCache`, auto-flush on exceeding
 #2059: Remove `final` modifier for `TypeFactory`
  (requested by Thibaut R)
 #2115: Support naive deserialization of `Serializable` values as "untyped", same

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

@@ -0,0 +1,40 @@
+package com.fasterxml.jackson.failing;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.fasterxml.jackson.databind.*;
+
+// [databind#2331]
+public class GenericNestedType2331Test extends BaseMapTest
+{
+    static class SuperNode<T> { }
+    static class SuperTestClass { }
+    
+    static class Node<T extends SuperTestClass & Cloneable> extends SuperNode<Node<T>> implements Serializable {
+
+        public List<Node<T>> children;
+
+        public Node() {
+            children = new ArrayList<Node<T>>();
+        }
+
+        /**
+         * The Wildcard here seems to be the Issue.
+         * If we remove this full getter, everything is working as expected.
+         * @return
+         */
+        public List<? extends SuperNode<Node<T>>> getChildren() {
+            return children;
+        }
+    }    
+    
+    public void testGeneric2331() throws Exception {
+        Node root = new Node();
+        root.children.add(new Node());
+
+        String json = newObjectMapper().writeValueAsString(root);
+        assertNotNull(json);
+    }
+}