Properly implement InetAddressCodec for inet type

InetAddressCodec now only considers the inet type for encoding and
decoding values. Previously, the codec served also BPCHAR and VARCHAR
types which caused decoding exceptions.

[resolves #184]

Author: mp911de

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

@@ -29,8 +29,7 @@
 import java.net.UnknownHostException;
 
 import static io.r2dbc.postgresql.message.Format.FORMAT_TEXT;
-import static io.r2dbc.postgresql.type.PostgresqlObjectId.BPCHAR;
-import static io.r2dbc.postgresql.type.PostgresqlObjectId.VARCHAR;
+import static io.r2dbc.postgresql.type.PostgresqlObjectId.INET;
 
 final class InetAddressCodec extends AbstractCodec<InetAddress> {
 
@@ -43,23 +42,37 @@ final class InetAddressCodec extends AbstractCodec<InetAddress> {
 
     @Override
     public Parameter encodeNull() {
-        return createNull(VARCHAR, FORMAT_TEXT);
+        return createNull(INET, FORMAT_TEXT);
     }
 
     @Override
     boolean doCanDecode(PostgresqlObjectId type, Format format) {
         Assert.requireNonNull(format, "format must not be null");
         Assert.requireNonNull(type, "type must not be null");
 
-        return BPCHAR == type || VARCHAR == type;
+        return INET == type;
     }
 
     @Override
     InetAddress doDecode(ByteBuf buffer, PostgresqlObjectId dataType, @Nullable Format format, @Nullable Class<? extends InetAddress> type) {
         Assert.requireNonNull(buffer, "byteBuf must not be null");
 
         try {
-            return InetAddress.getByName(ByteBufUtils.decode(buffer).trim());
+            if (format == Format.FORMAT_BINARY) {
+
+                int readableBytes = buffer.readableBytes();
+                if (readableBytes == 8) {
+                    // addr + cidr
+                    buffer.skipBytes(4);
+                    byte[] addr = new byte[4];
+                    buffer.readBytes(addr);
+                    return InetAddress.getByAddress(addr);
+                }
+
+                throw new IllegalArgumentException("Cannot decode InetAddress. Available bytes: " + readableBytes);
+            }
+
+            return InetAddress.getByName(ByteBufUtils.decode(buffer));
         } catch (UnknownHostException e) {
             throw new IllegalArgumentException(e);
         }
@@ -69,7 +82,7 @@ InetAddress doDecode(ByteBuf buffer, PostgresqlObjectId dataType, @Nullable Form
     Parameter doEncode(InetAddress value) {
         Assert.requireNonNull(value, "value must not be null");
 
-        return create(VARCHAR, FORMAT_TEXT, () -> ByteBufUtils.encode(this.byteBufAllocator, value.getHostAddress()));
+        return create(INET, FORMAT_TEXT, () -> ByteBufUtils.encode(this.byteBufAllocator, value.getHostAddress()));
     }
 
 }

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

@@ -108,6 +108,16 @@ public enum PostgresqlObjectId {
      */
     FLOAT8_ARRAY(1022),
 
+    /**
+     * The inet object id.
+     */
+    INET(869),
+
+    /**
+     * The inet array object id.
+     */
+    INET_ARRAY(1041),
+
     /**
      * The int2 object id.
      */
@@ -157,7 +167,7 @@ public enum PostgresqlObjectId {
      * The JSON array object id.
      */
     JSON_ARRAY(199),
-    
+
     /**
      * The JSONB array object id.
      */

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

@@ -119,8 +119,7 @@ void floatPrimitive() {
 
     @Test
     void inetAddress() throws UnknownHostException {
-        testCodec(InetAddress.class, InetAddress.getLocalHost(), "BPCHAR(128)");
-        testCodec(InetAddress.class, InetAddress.getLocalHost(), "VARCHAR(128)");
+        testCodec(InetAddress.class, InetAddress.getLocalHost(), "INET");
     }
 
     @Test

src/test/java/io/r2dbc/postgresql/codec/CodecIntegrationTests.java

@@ -157,8 +157,7 @@ void floatPrimitive() {
 
     @Test
     void inetAddress() throws UnknownHostException {
-        testCodec(InetAddress.class, InetAddress.getLocalHost(), "BPCHAR(128)");
-        testCodec(InetAddress.class, InetAddress.getLocalHost(), "VARCHAR(128)");
+        testCodec(InetAddress.class, InetAddress.getLocalHost(), "INET");
     }
 
     @Test

src/test/java/io/r2dbc/postgresql/codec/InetAddressCodecTest.java

@@ -26,8 +26,7 @@
 import static io.r2dbc.postgresql.client.ParameterAssert.assertThat;
 import static io.r2dbc.postgresql.message.Format.FORMAT_BINARY;
 import static io.r2dbc.postgresql.message.Format.FORMAT_TEXT;
-import static io.r2dbc.postgresql.type.PostgresqlObjectId.BPCHAR;
-import static io.r2dbc.postgresql.type.PostgresqlObjectId.FLOAT4;
+import static io.r2dbc.postgresql.type.PostgresqlObjectId.INET;
 import static io.r2dbc.postgresql.type.PostgresqlObjectId.MONEY;
 import static io.r2dbc.postgresql.type.PostgresqlObjectId.VARCHAR;
 import static io.r2dbc.postgresql.util.ByteBufUtils.encode;
@@ -37,7 +36,7 @@
 
 final class InetAddressCodecTest {
 
-    private static final int dataType = VARCHAR.getObjectId();
+    private static final int dataType = INET.getObjectId();
 
     @Test
     void constructorNoByteBufAllocator() {
@@ -62,10 +61,8 @@ void decodeNoByteBuf() {
     void doCanDecode() {
         InetAddressCodec codec = new InetAddressCodec(TEST);
 
-        assertThat(codec.doCanDecode(VARCHAR, FORMAT_BINARY)).isTrue();
+        assertThat(codec.doCanDecode(INET, FORMAT_BINARY)).isTrue();
         assertThat(codec.doCanDecode(MONEY, FORMAT_TEXT)).isFalse();
-        assertThat(codec.doCanDecode(BPCHAR, FORMAT_TEXT)).isTrue();
-        assertThat(codec.doCanDecode(VARCHAR, FORMAT_TEXT)).isTrue();
     }
 
     @Test
@@ -86,7 +83,7 @@ void doEncode() throws UnknownHostException {
 
         assertThat(new InetAddressCodec(TEST).doEncode(inetAddress))
             .hasFormat(FORMAT_TEXT)
-            .hasType(VARCHAR.getObjectId())
+            .hasType(INET.getObjectId())
             .hasValue(encode(TEST, inetAddress.getHostAddress()));
     }
 
@@ -99,7 +96,7 @@ void doEncodeNoValue() {
     @Test
     void encodeNull() {
         assertThat(new InetAddressCodec(TEST).encodeNull())
-            .isEqualTo(new Parameter(FORMAT_TEXT, VARCHAR.getObjectId(), NULL_VALUE));
+            .isEqualTo(new Parameter(FORMAT_TEXT, INET.getObjectId(), NULL_VALUE));
     }
 
 }