Allow returning PostgresTypeIdentifier subtypes from CodecMetadata.

[resolves #600]

Signed-off-by: Mark Paluch <[email protected]>

Author: mp911de

src/main/java/io/r2dbc/postgresql/codec/AbstractJsonCodec.java

@@ -22,7 +22,6 @@
 
 import java.util.EnumSet;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 import static io.r2dbc.postgresql.codec.PostgresqlObjectId.JSON;
 import static io.r2dbc.postgresql.codec.PostgresqlObjectId.JSONB;
@@ -55,8 +54,8 @@ boolean doCanDecode(PostgresqlObjectId type, Format format) {
     }
 
     @Override
-    public Iterable<PostgresTypeIdentifier> getDataTypes() {
-        return SUPPORTED_TYPES.stream().map(PostgresTypeIdentifier.class::cast).collect(Collectors.toList());
+    public Iterable<? extends PostgresTypeIdentifier> getDataTypes() {
+        return SUPPORTED_TYPES;
     }
 
 }

src/main/java/io/r2dbc/postgresql/codec/AbstractNumericCodec.java

@@ -27,7 +27,6 @@
 import java.util.EnumSet;
 import java.util.Set;
 import java.util.function.Function;
-import java.util.stream.Collectors;
 
 import static io.r2dbc.postgresql.codec.PostgresqlObjectId.FLOAT4;
 import static io.r2dbc.postgresql.codec.PostgresqlObjectId.FLOAT8;
@@ -146,8 +145,8 @@ public EncodedParameter encodeNull() {
     }
 
     @Override
-    public Iterable<PostgresTypeIdentifier> getDataTypes() {
-        return SUPPORTED_TYPES.stream().map(PostgresTypeIdentifier.class::cast).collect(Collectors.toList());
+    public Iterable<? extends PostgresTypeIdentifier> getDataTypes() {
+        return SUPPORTED_TYPES;
     }
 
     /**

src/main/java/io/r2dbc/postgresql/codec/ByteCodec.java

@@ -84,7 +84,7 @@ public Iterable<Format> getFormats() {
     }
 
     @Override
-    public Iterable<PostgresTypeIdentifier> getDataTypes() {
+    public Iterable<? extends PostgresTypeIdentifier> getDataTypes() {
         return this.delegate.getDataTypes();
     }
 

src/main/java/io/r2dbc/postgresql/codec/CharacterCodec.java

@@ -86,7 +86,7 @@ public Iterable<Format> getFormats() {
     }
 
     @Override
-    public Iterable<PostgresTypeIdentifier> getDataTypes() {
+    public Iterable<? extends PostgresTypeIdentifier> getDataTypes() {
         return this.delegate.getDataTypes();
     }
 

src/main/java/io/r2dbc/postgresql/codec/CodecMetadata.java

@@ -50,6 +50,6 @@ default Iterable<Format> getFormats() {
      *
      * @return the datatypes
      */
-    Iterable<PostgresTypeIdentifier> getDataTypes();
+    Iterable<? extends PostgresTypeIdentifier> getDataTypes();
 
 }

src/main/java/io/r2dbc/postgresql/codec/StringCodec.java

@@ -109,8 +109,8 @@ public PostgresTypeIdentifier getArrayDataType() {
     }
 
     @Override
-    public Iterable<PostgresTypeIdentifier> getDataTypes() {
-        return Stream.concat(Stream.of(this.defaultType), SUPPORTED_TYPES.stream()).map(PostgresTypeIdentifier.class::cast).collect(Collectors.toSet());
+    public Iterable<? extends PostgresTypeIdentifier> getDataTypes() {
+        return Stream.concat(Stream.of(this.defaultType), SUPPORTED_TYPES.stream()).collect(Collectors.toSet());
     }
 
     private static class StringDecoder implements Codec<String>, Decoder<String> {

src/main/java/io/r2dbc/postgresql/codec/StringCodecDelegate.java

@@ -99,7 +99,7 @@ public Iterable<Format> getFormats() {
     }
 
     @Override
-    public Iterable<PostgresTypeIdentifier> getDataTypes() {
+    public Iterable<? extends PostgresTypeIdentifier> getDataTypes() {
         return this.delegate.getDataTypes();
     }