Fix #506

FasterXML · Jan 11, 2019 · 257ec52 · 257ec52
1 parent 90cb874
commit 257ec52
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -26,6 +26,7 @@ JSON library.
 #495: Create `StreamReadFeature` to move non-json specific `JsonParser.Feature`s to
 #496: Create `StreamWriteFeature` to take over non-json-specific `JsonGenerator.Feature`s
 #502: Make `DefaultPrettyPrinter.createInstance()` to fail for sub-classes
+#506: Add missing type parameter for `TypeReference` in `ObjectCodec`
 
 2.9.8 (15-Dec-2018)
 

diff --git a/src/main/java/com/fasterxml/jackson/core/JsonParser.java b/src/main/java/com/fasterxml/jackson/core/JsonParser.java
@@ -1793,7 +1793,7 @@ public <T> Iterator<T> readValuesAs(Class<T> valueType) throws IOException {
      * Method for reading sequence of Objects from parser stream,
      * all with same specified value type.
      */
-    public <T> Iterator<T> readValuesAs(TypeReference<?> valueTypeRef) throws IOException {
+    public <T> Iterator<T> readValuesAs(TypeReference<T> valueTypeRef) throws IOException {
         return _codec().readValues(this, valueTypeRef);
     }
 

diff --git a/src/main/java/com/fasterxml/jackson/core/ObjectCodec.java b/src/main/java/com/fasterxml/jackson/core/ObjectCodec.java
@@ -56,7 +56,7 @@ public abstract <T> T readValue(JsonParser p, Class<T> valueType)
      * and specifically needs to be used if the root type is a 
      * parameterized (generic) container type.
      */
-    public abstract <T> T readValue(JsonParser p, TypeReference<?> valueTypeRef)
+    public abstract <T> T readValue(JsonParser p, TypeReference<T> valueTypeRef)
         throws IOException;
 
     /**
@@ -79,7 +79,7 @@ public abstract <T> Iterator<T> readValues(JsonParser p, Class<T> valueType)
      * Method for reading sequence of Objects from parser stream,
      * all with same specified value type.
      */
-    public abstract <T> Iterator<T> readValues(JsonParser p, TypeReference<?> valueTypeRef)
+    public abstract <T> Iterator<T> readValues(JsonParser p, TypeReference<T> valueTypeRef)
         throws IOException;
 
     /**

diff --git a/src/test/java/com/fasterxml/jackson/core/json/JsonFactoryTest.java b/src/test/java/com/fasterxml/jackson/core/json/JsonFactoryTest.java
@@ -20,7 +20,7 @@ public <T> T readValue(JsonParser p, Class<T> valueType) throws IOException {
         }
 
         @Override
-        public <T> T readValue(JsonParser p, TypeReference<?> valueTypeRef) throws IOException {
+        public <T> T readValue(JsonParser p, TypeReference<T> valueTypeRef) throws IOException {
             return null;
         }
 
@@ -35,7 +35,7 @@ public <T> Iterator<T> readValues(JsonParser p, Class<T> valueType) throws IOExc
         }
 
         @Override
-        public <T> Iterator<T> readValues(JsonParser p, TypeReference<?> valueTypeRef) throws IOException {
+        public <T> Iterator<T> readValues(JsonParser p, TypeReference<T> valueTypeRef) throws IOException {
             return null;
         }
 

diff --git a/src/test/java/com/fasterxml/jackson/core/util/TestDelegates.java b/src/test/java/com/fasterxml/jackson/core/util/TestDelegates.java
@@ -29,7 +29,7 @@ public <T> T readValue(JsonParser p, Class<T> valueType) {
             return null;
         }
         @Override
-        public <T> T readValue(JsonParser p, TypeReference<?> valueTypeRef) {
+        public <T> T readValue(JsonParser p, TypeReference<T> valueTypeRef) {
             return null;
         }
         @Override
@@ -42,7 +42,7 @@ public <T> Iterator<T> readValues(JsonParser p, Class<T> valueType) {
         }
         @Override
         public <T> Iterator<T> readValues(JsonParser p,
-                TypeReference<?> valueTypeRef) throws IOException {
+                TypeReference<T> valueTypeRef) throws IOException {
             return null;
         }
         @Override