Merge branch '2.10'

FasterXML · Jul 24, 2019 · 52fe20e · 52fe20e
2 parents 26dc611 + b23eccb
commit 52fe20e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -4,6 +4,11 @@ Project: jackson-databind
 === Releases === 
 ------------------------------------------------------------------------
 
+2.10.0.pr2 (not yet released)
+
+#2331: `JsonMappingException` through nested getter with generic wildcard return type
+ (reported by sunchezz89@github)
+
 2.10.0.pr1 (19-Jul-2019)
 
 #18: Make `JsonNode` serializable
@@ -40,7 +45,7 @@ Project: jackson-databind
  (reported by Pavel C)
 #2236: Type id not provided on `Double.NaN`, `Infinity` with `@JsonTypeInfo`
  (reported by C-B-B@github)
-#2241: Add `JsonPropertyNamingStrategy.LOWER_DOT_CASE` for dot-delimited names
+#2241: Add `PropertyNamingStrategy.LOWER_DOT_CASE` for dot-delimited names
  (contributed by [email protected])
 #2251: Getter that returns an abstract collection breaks a delegating `@JsonCreator`
 #2265: Inconsistent handling of Collections$UnmodifiableList vs Collections$UnmodifiableRandomAccessListq
@@ -51,7 +56,7 @@ Project: jackson-databind
  (suggested by Manuel H)
 #2338: Suboptimal return type for `JsonNode.withArray()`
  (reported by Victor N)
-2339: Suboptimal return type for `ObjectNode.set()`
+#2339: Suboptimal return type for `ObjectNode.set()`
  (reported by Victor N)
 
 2.9.9.1 (03-Jul-2019)

diff --git a/src/main/java/com/fasterxml/jackson/databind/type/ResolvedRecursiveType.java b/src/main/java/com/fasterxml/jackson/databind/type/ResolvedRecursiveType.java
@@ -28,14 +28,20 @@ public void setReference(JavaType ref)
 
     @Override
     public JavaType getSuperClass() {
-    	if (_referencedType != null) {
-    		return _referencedType.getSuperClass();
-    	}
-    	return super.getSuperClass();
+        if (_referencedType != null) {
+            return _referencedType.getSuperClass();
+        }
+        return super.getSuperClass();
     }
 
     public JavaType getSelfReferencedType() { return _referencedType; }
 
+    // 23-Jul-2019, tatu: [databind#2331] Need to also delegate this...
+    @Override
+    public TypeBindings getBindings() {
+        return _referencedType.getBindings();
+    }
+
     @Override
     public StringBuilder getGenericSignature(StringBuilder sb) {
         return _referencedType.getGenericSignature(sb);

diff --git a/src/main/java/com/fasterxml/jackson/databind/type/TypeFactory.java b/src/main/java/com/fasterxml/jackson/databind/type/TypeFactory.java
@@ -359,7 +359,6 @@ public JavaType constructSpecializedType(JavaType baseType, Class<?> subclass)
         if (rawBase == subclass) {
             return baseType;
         }
-
         JavaType newType;
 
         // also: if we start from untyped, not much to save