Manually merge #1423

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/databind/ObjectMapper.java

@@ -2290,7 +2290,7 @@ public <T> T readValue(JsonParser p, Class<T> valueType)
      *   expected for result type (or has other mismatch issues)
      */
     @SuppressWarnings("unchecked")
-    public <T> T readValue(JsonParser p, TypeReference<?> valueTypeRef)
+    public <T> T readValue(JsonParser p, TypeReference<T> valueTypeRef)
         throws IOException, JsonParseException, JsonMappingException
     {
         DeserializationContext ctxt = createDeserializationContext(p);
@@ -3660,7 +3660,7 @@ public <T> T convertValue(Object fromValue, Class<T> toValueType)
      * See {@link #convertValue(Object, Class)}
      */
     @SuppressWarnings("unchecked")
-    public <T> T convertValue(Object fromValue, TypeReference<?> toValueTypeRef)
+    public <T> T convertValue(Object fromValue, TypeReference<T> toValueTypeRef)
         throws IllegalArgumentException
     {
         return (T) _convert(fromValue, _typeFactory.constructType(toValueTypeRef));

src/main/java/com/fasterxml/jackson/databind/ObjectReader.java

@@ -977,7 +977,7 @@ public <T> T readValue(JsonParser p, Class<T> valueType) throws IOException
      * (data-format specific) parser is given.
      */
     @SuppressWarnings("unchecked")
-    public <T> T readValue(JsonParser p, TypeReference<?> valueTypeRef) throws IOException
+    public <T> T readValue(JsonParser p, TypeReference<T> valueTypeRef) throws IOException
     {
         return (T) forType(valueTypeRef).readValue(p);
     }
@@ -1050,7 +1050,7 @@ public <T> Iterator<T> readValues(JsonParser p, Class<T> valueType) throws IOExc
      * NOTE: this method never tries to auto-detect format, since actual
      * (data-format specific) parser is given.
      */
-    public <T> Iterator<T> readValues(JsonParser p, TypeReference<?> valueTypeRef) throws IOException {
+    public <T> Iterator<T> readValues(JsonParser p, TypeReference<T> valueTypeRef) throws IOException {
         return forType(valueTypeRef).readValues(p);
     }