Fix #1079

FasterXML · Jan 13, 2016 · a2f4308 · a2f4308
1 parent b8b3c74
commit a2f4308
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/release-notes/VERSION b/release-notes/VERSION
@@ -4,7 +4,11 @@ Project: jackson-databind
 === Releases ===
 ------------------------------------------------------------------------
 
-2.7.0 (not yet released)
+2.7.1 (not yet released)
+
+#1079: Add back `TypeFactory.constructType(Type, Class)` as "deprecated" in 2.7.1
+
+2.7.0 (10-Jan-2016)
 
 #76: Problem handling datatypes Recursive type parameters
  (reported by Aram K)

diff --git a/src/main/java/com/fasterxml/jackson/databind/type/TypeFactory.java b/src/main/java/com/fasterxml/jackson/databind/type/TypeFactory.java
@@ -594,17 +594,21 @@ public JavaType constructType(TypeReference<?> typeRef)
         */
     }
 
-    /*
+    /**
+     * @deprecated Since 2.7 (accidentally removed in 2.7.0; added back in 2.7.1)
+     */
+    @Deprecated
     public JavaType constructType(Type type, Class<?> contextType) {
-        TypeBindings b = (contextType == null) ? null : new TypeBindings(this, null, contextType);
-        return _fromAny(null, type, b);
+        return _fromAny(null, type, EMPTY_BINDINGS);
     }
 
+    /**
+     * @deprecated Since 2.7 (accidentally removed in 2.7.0; added back in 2.7.1)
+     */
+    @Deprecated
     public JavaType constructType(Type type, JavaType contextType) {
-        TypeBindings b = (contextType == null) ? null : new TypeBindings(this, null, contextType);
-        return _fromAny(null, type, b);
+        return _fromAny(null, type, contextType.getBindings());
     }
-    */
 
     /*
     /**********************************************************