Adapt R2dbcTypes to R2dbcType renaming

[pgjdbc#378]

Author: mp911de

pom.xml

@@ -47,7 +47,7 @@
         <postgresql.version>42.2.18</postgresql.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <r2dbc-spi.version>0.9.0-BIND-PARAMS-SNAPSHOT</r2dbc-spi.version>
+        <r2dbc-spi.version>0.9.0.BUILD-SNAPSHOT</r2dbc-spi.version>
         <reactor.version>Dysprosium-SR12</reactor.version>
         <scram-client.version>2.1</scram-client.version>
         <spring-framework.version>5.2.9.RELEASE</spring-framework.version>

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

@@ -22,7 +22,7 @@
 import io.r2dbc.postgresql.message.Format;
 import io.r2dbc.postgresql.util.Assert;
 import io.r2dbc.spi.Parameter;
-import io.r2dbc.spi.R2dbcTypes;
+import io.r2dbc.spi.R2dbcType;
 import io.r2dbc.spi.Type;
 import reactor.util.annotation.Nullable;
 
@@ -178,9 +178,9 @@ public EncodedParameter encode(Object value) {
                 return encodeNull(parameter.getType().getJavaType());
             }
 
-            if (parameter.getType() instanceof R2dbcTypes) {
+            if (parameter.getType() instanceof R2dbcType) {
 
-                PostgresqlObjectId targetType = PostgresqlObjectId.valueOf((R2dbcTypes) parameter.getType());
+                PostgresqlObjectId targetType = PostgresqlObjectId.valueOf((R2dbcType) parameter.getType());
                 dataType = targetType;
             }
 

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

@@ -19,7 +19,7 @@
 import io.r2dbc.postgresql.api.RefCursor;
 import io.r2dbc.postgresql.util.Assert;
 import io.r2dbc.spi.Clob;
-import io.r2dbc.spi.R2dbcTypes;
+import io.r2dbc.spi.R2dbcType;
 import io.r2dbc.spi.Type;
 
 import java.math.BigDecimal;
@@ -462,15 +462,15 @@ public static PostgresqlObjectId valueOf(int objectId) {
     }
 
     /**
-     * Returns the {@link PostgresqlObjectId} matching a given {@link R2dbcTypes R2DBC type}.
+     * Returns the {@link PostgresqlObjectId} matching a given {@link R2dbcType R2DBC type}.
      *
      * @param type the R2DBC type
      * @return the {@link PostgresqlObjectId}
      * @throws IllegalArgumentException      if {@code type} is {@code null}
      * @throws UnsupportedOperationException if the given {@code type} is not supported
      * @since 0.9
      */
-    public static PostgresqlObjectId valueOf(R2dbcTypes type) {
+    public static PostgresqlObjectId valueOf(R2dbcType type) {
 
         Assert.requireNonNull(type, "type must not be null");
 

src/test/java/io/r2dbc/postgresql/AbstractCodecIntegrationTests.java

@@ -35,7 +35,7 @@
 import io.r2dbc.spi.Clob;
 import io.r2dbc.spi.Connection;
 import io.r2dbc.spi.Parameters;
-import io.r2dbc.spi.R2dbcTypes;
+import io.r2dbc.spi.R2dbcType;
 import io.r2dbc.spi.Type;
 import org.assertj.core.data.Offset;
 import org.junit.jupiter.api.Test;
@@ -109,9 +109,9 @@ void bigDecimal() {
         testCodec(BigDecimal.class, new BigDecimal("100"), "INT8");
         testCodec(BigDecimal.class, new BigDecimal("100"), "FLOAT4");
         testCodec(BigDecimal.class, new BigDecimal("100"), "FLOAT8");
-        testCodec(BigDecimal.class, new BigDecimal("100"), "NUMERIC", R2dbcTypes.NUMERIC);
-        testCodec(BigDecimal.class, new BigDecimal("100"), "FLOAT8", R2dbcTypes.DOUBLE);
-        testCodec(BigDecimal.class, new BigDecimal("100"), "INT8", R2dbcTypes.BIGINT);
+        testCodec(BigDecimal.class, new BigDecimal("100"), "NUMERIC", R2dbcType.NUMERIC);
+        testCodec(BigDecimal.class, new BigDecimal("100"), "FLOAT8", R2dbcType.DOUBLE);
+        testCodec(BigDecimal.class, new BigDecimal("100"), "INT8", R2dbcType.BIGINT);
     }
 
     @Test
@@ -230,9 +230,9 @@ void doublePrimitive() {
         testCodec(Double.class, 100.1, "FLOAT4");
         testCodec(Double.class, 100.1, "FLOAT8");
 
-        testCodec(Double.class, 100.1, "DECIMAL", R2dbcTypes.DECIMAL);
-        testCodec(Double.class, 100.1, "FLOAT4", R2dbcTypes.FLOAT);
-        testCodec(Double.class, 100.1, "FLOAT8", R2dbcTypes.DOUBLE);
+        testCodec(Double.class, 100.1, "DECIMAL", R2dbcType.DECIMAL);
+        testCodec(Double.class, 100.1, "FLOAT4", R2dbcType.FLOAT);
+        testCodec(Double.class, 100.1, "FLOAT8", R2dbcType.DOUBLE);
     }
 
     @Test
@@ -249,9 +249,9 @@ void floatPrimitive() {
         testCodec(Float.class, 100.1f, "FLOAT4");
         testCodec(Float.class, 100.1f, "FLOAT8");
 
-        testCodec(Float.class, 100.1f, "DECIMAL", R2dbcTypes.DECIMAL);
-        testCodec(Float.class, 100.1f, "FLOAT4", R2dbcTypes.FLOAT);
-        testCodec(Float.class, 100.1f, "FLOAT8", R2dbcTypes.DOUBLE);
+        testCodec(Float.class, 100.1f, "DECIMAL", R2dbcType.DECIMAL);
+        testCodec(Float.class, 100.1f, "FLOAT4", R2dbcType.FLOAT);
+        testCodec(Float.class, 100.1f, "FLOAT8", R2dbcType.DOUBLE);
     }
 
     @Test
@@ -289,13 +289,13 @@ void intPrimitive() {
         testCodec(Integer.class, 100, "FLOAT4");
         testCodec(Integer.class, 100, "FLOAT8");
 
-        testCodec(Integer.class, 100, "INT2", R2dbcTypes.SMALLINT);
-        testCodec(Integer.class, 100, "INT4", R2dbcTypes.INTEGER);
-        testCodec(Integer.class, 100, "INT8", R2dbcTypes.INTEGER);
+        testCodec(Integer.class, 100, "INT2", R2dbcType.SMALLINT);
+        testCodec(Integer.class, 100, "INT4", R2dbcType.INTEGER);
+        testCodec(Integer.class, 100, "INT8", R2dbcType.INTEGER);
         testCodec(Integer.class, 100, "OID");
-        testCodec(Integer.class, 100, "NUMERIC", R2dbcTypes.NUMERIC);
-        testCodec(Integer.class, 100, "FLOAT4", R2dbcTypes.FLOAT);
-        testCodec(Integer.class, 100, "FLOAT8", R2dbcTypes.DOUBLE);
+        testCodec(Integer.class, 100, "NUMERIC", R2dbcType.NUMERIC);
+        testCodec(Integer.class, 100, "FLOAT4", R2dbcType.FLOAT);
+        testCodec(Integer.class, 100, "FLOAT8", R2dbcType.DOUBLE);
     }
 
     @Test