Move PostgresqlObjectId to codec package and add default Java types

[#378]

Author: mp911de

src/main/java/io/r2dbc/postgresql/PostgresqlColumnMetadata.java

@@ -17,9 +17,9 @@
 package io.r2dbc.postgresql;
 
 import io.r2dbc.postgresql.codec.Codecs;
+import io.r2dbc.postgresql.codec.PostgresqlObjectId;
 import io.r2dbc.postgresql.message.Format;
 import io.r2dbc.postgresql.message.backend.RowDescription.Field;
-import io.r2dbc.postgresql.type.PostgresqlObjectId;
 import io.r2dbc.postgresql.util.Assert;
 import io.r2dbc.spi.ColumnMetadata;
 import io.r2dbc.spi.Type;

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

@@ -20,7 +20,6 @@
 import io.netty.buffer.ByteBufAllocator;
 import io.r2dbc.postgresql.client.EncodedParameter;
 import io.r2dbc.postgresql.message.Format;
-import io.r2dbc.postgresql.type.PostgresqlObjectId;
 import io.r2dbc.postgresql.util.Assert;
 
 import java.lang.reflect.Array;

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

@@ -21,7 +21,6 @@
 import io.netty.buffer.ByteBufUtil;
 import io.r2dbc.postgresql.client.EncodedParameter;
 import io.r2dbc.postgresql.message.Format;
-import io.r2dbc.postgresql.type.PostgresqlObjectId;
 import io.r2dbc.postgresql.util.Assert;
 import io.r2dbc.postgresql.util.ByteBufUtils;
 
@@ -30,8 +29,8 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import static io.r2dbc.postgresql.codec.PostgresqlObjectId.BYTEA;
 import static io.r2dbc.postgresql.message.Format.FORMAT_TEXT;
-import static io.r2dbc.postgresql.type.PostgresqlObjectId.BYTEA;
 
 /**
  * Support class for codecs that read/write {@code BYTEA} values.

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

@@ -19,7 +19,6 @@
 import io.netty.buffer.ByteBuf;
 import io.r2dbc.postgresql.client.EncodedParameter;
 import io.r2dbc.postgresql.message.Format;
-import io.r2dbc.postgresql.type.PostgresqlObjectId;
 import io.r2dbc.postgresql.util.Assert;
 import org.reactivestreams.Publisher;
 import reactor.core.publisher.Flux;

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

@@ -20,7 +20,6 @@
 import io.netty.buffer.ByteBufAllocator;
 import io.r2dbc.postgresql.client.EncodedParameter;
 import io.r2dbc.postgresql.message.Format;
-import io.r2dbc.postgresql.type.PostgresqlObjectId;
 import io.r2dbc.postgresql.util.Assert;
 import io.r2dbc.postgresql.util.ByteBufUtils;
 

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

@@ -18,12 +18,11 @@
 
 import io.r2dbc.postgresql.client.EncodedParameter;
 import io.r2dbc.postgresql.message.Format;
-import io.r2dbc.postgresql.type.PostgresqlObjectId;
 import io.r2dbc.postgresql.util.Assert;
 
+import static io.r2dbc.postgresql.codec.PostgresqlObjectId.JSON;
+import static io.r2dbc.postgresql.codec.PostgresqlObjectId.JSONB;
 import static io.r2dbc.postgresql.message.Format.FORMAT_BINARY;
-import static io.r2dbc.postgresql.type.PostgresqlObjectId.JSON;
-import static io.r2dbc.postgresql.type.PostgresqlObjectId.JSONB;
 
 abstract class AbstractJsonCodec<T> extends AbstractCodec<T> {
 

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

@@ -20,7 +20,6 @@
 import io.netty.buffer.ByteBufAllocator;
 import io.r2dbc.postgresql.client.EncodedParameter;
 import io.r2dbc.postgresql.message.Format;
-import io.r2dbc.postgresql.type.PostgresqlObjectId;
 import io.r2dbc.postgresql.util.Assert;
 import io.r2dbc.postgresql.util.ByteBufUtils;
 import reactor.util.annotation.Nullable;
@@ -29,15 +28,15 @@
 import java.util.Set;
 import java.util.function.Function;
 
+import static io.r2dbc.postgresql.codec.PostgresqlObjectId.FLOAT4;
+import static io.r2dbc.postgresql.codec.PostgresqlObjectId.FLOAT8;
+import static io.r2dbc.postgresql.codec.PostgresqlObjectId.INT2;
+import static io.r2dbc.postgresql.codec.PostgresqlObjectId.INT4;
+import static io.r2dbc.postgresql.codec.PostgresqlObjectId.INT8;
+import static io.r2dbc.postgresql.codec.PostgresqlObjectId.NUMERIC;
+import static io.r2dbc.postgresql.codec.PostgresqlObjectId.OID;
 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.FLOAT4;
-import static io.r2dbc.postgresql.type.PostgresqlObjectId.FLOAT8;
-import static io.r2dbc.postgresql.type.PostgresqlObjectId.INT2;
-import static io.r2dbc.postgresql.type.PostgresqlObjectId.INT4;
-import static io.r2dbc.postgresql.type.PostgresqlObjectId.INT8;
-import static io.r2dbc.postgresql.type.PostgresqlObjectId.NUMERIC;
-import static io.r2dbc.postgresql.type.PostgresqlObjectId.OID;
 
 /**
  * Codec to decode all known numeric types.

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

@@ -19,7 +19,6 @@
 import io.netty.buffer.ByteBuf;
 import io.r2dbc.postgresql.client.EncodedParameter;
 import io.r2dbc.postgresql.message.Format;
-import io.r2dbc.postgresql.type.PostgresqlObjectId;
 import io.r2dbc.postgresql.util.Assert;
 import io.r2dbc.postgresql.util.ByteBufUtils;
 import reactor.util.annotation.Nullable;
@@ -36,13 +35,13 @@
 import java.util.Set;
 import java.util.function.Function;
 
+import static io.r2dbc.postgresql.codec.PostgresqlObjectId.DATE;
+import static io.r2dbc.postgresql.codec.PostgresqlObjectId.TIME;
+import static io.r2dbc.postgresql.codec.PostgresqlObjectId.TIMESTAMP;
+import static io.r2dbc.postgresql.codec.PostgresqlObjectId.TIMESTAMPTZ;
+import static io.r2dbc.postgresql.codec.PostgresqlObjectId.TIMETZ;
 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.DATE;
-import static io.r2dbc.postgresql.type.PostgresqlObjectId.TIME;
-import static io.r2dbc.postgresql.type.PostgresqlObjectId.TIMESTAMP;
-import static io.r2dbc.postgresql.type.PostgresqlObjectId.TIMESTAMPTZ;
-import static io.r2dbc.postgresql.type.PostgresqlObjectId.TIMETZ;
 
 /**
  * Codec to decode all known temporal types.

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

@@ -20,13 +20,12 @@
 import io.netty.buffer.ByteBufAllocator;
 import io.r2dbc.postgresql.client.EncodedParameter;
 import io.r2dbc.postgresql.message.Format;
-import io.r2dbc.postgresql.type.PostgresqlObjectId;
 import io.r2dbc.postgresql.util.Assert;
 
 import java.math.BigDecimal;
 import java.util.function.Supplier;
 
-import static io.r2dbc.postgresql.type.PostgresqlObjectId.NUMERIC_ARRAY;
+import static io.r2dbc.postgresql.codec.PostgresqlObjectId.NUMERIC_ARRAY;
 
 final class BigDecimalArrayCodec extends AbstractArrayCodec<BigDecimal> {
 

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

@@ -20,15 +20,14 @@
 import io.netty.buffer.ByteBufAllocator;
 import io.r2dbc.postgresql.client.EncodedParameter;
 import io.r2dbc.postgresql.message.Format;
-import io.r2dbc.postgresql.type.PostgresqlObjectId;
 import io.r2dbc.postgresql.util.Assert;
 import io.r2dbc.postgresql.util.ByteBufUtils;
 import reactor.util.annotation.Nullable;
 
 import java.math.BigDecimal;
 
+import static io.r2dbc.postgresql.codec.PostgresqlObjectId.NUMERIC;
 import static io.r2dbc.postgresql.message.Format.FORMAT_TEXT;
-import static io.r2dbc.postgresql.type.PostgresqlObjectId.NUMERIC;
 
 final class BigDecimalCodec extends AbstractNumericCodec<BigDecimal> {
 

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

@@ -19,14 +19,13 @@
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufAllocator;
 import io.r2dbc.postgresql.message.Format;
-import io.r2dbc.postgresql.type.PostgresqlObjectId;
 import io.r2dbc.postgresql.util.Assert;
 import reactor.util.annotation.Nullable;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
 
-import static io.r2dbc.postgresql.type.PostgresqlObjectId.NUMERIC;
+import static io.r2dbc.postgresql.codec.PostgresqlObjectId.NUMERIC;
 
 final class BigIntegerCodec extends AbstractNumericCodec<BigInteger> {
 

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

@@ -21,7 +21,6 @@
 import io.netty.buffer.Unpooled;
 import io.r2dbc.postgresql.client.EncodedParameter;
 import io.r2dbc.postgresql.message.Format;
-import io.r2dbc.postgresql.type.PostgresqlObjectId;
 import io.r2dbc.postgresql.util.Assert;
 
 import static io.r2dbc.postgresql.message.Format.FORMAT_TEXT;

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

@@ -21,7 +21,6 @@
 import io.netty.buffer.Unpooled;
 import io.r2dbc.postgresql.client.EncodedParameter;
 import io.r2dbc.postgresql.message.Format;
-import io.r2dbc.postgresql.type.PostgresqlObjectId;
 
 import java.nio.ByteBuffer;
 

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

@@ -21,7 +21,6 @@
 import io.netty.buffer.Unpooled;
 import io.r2dbc.postgresql.client.EncodedParameter;
 import io.r2dbc.postgresql.message.Format;
-import io.r2dbc.postgresql.type.PostgresqlObjectId;
 import io.r2dbc.postgresql.util.Assert;
 import io.r2dbc.spi.Blob;
 import reactor.core.publisher.Flux;
@@ -30,8 +29,8 @@
 
 import java.nio.ByteBuffer;
 
+import static io.r2dbc.postgresql.codec.PostgresqlObjectId.BYTEA;
 import static io.r2dbc.postgresql.message.Format.FORMAT_TEXT;
-import static io.r2dbc.postgresql.type.PostgresqlObjectId.BYTEA;
 
 final class BlobCodec extends AbstractCodec<Blob> {
 

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

@@ -20,13 +20,12 @@
 import io.netty.buffer.ByteBufAllocator;
 import io.r2dbc.postgresql.client.EncodedParameter;
 import io.r2dbc.postgresql.message.Format;
-import io.r2dbc.postgresql.type.PostgresqlObjectId;
 import io.r2dbc.postgresql.util.Assert;
 import io.r2dbc.postgresql.util.ByteBufUtils;
 import reactor.util.annotation.Nullable;
 
+import static io.r2dbc.postgresql.codec.PostgresqlObjectId.BOOL;
 import static io.r2dbc.postgresql.message.Format.FORMAT_TEXT;
-import static io.r2dbc.postgresql.type.PostgresqlObjectId.BOOL;
 
 final class BooleanCodec extends AbstractCodec<Boolean> {
 

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

@@ -18,7 +18,6 @@
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufAllocator;
-import io.r2dbc.postgresql.type.PostgresqlObjectId;
 
 /**
  * @since 0.8.5

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

@@ -20,7 +20,6 @@
 import io.netty.buffer.ByteBufAllocator;
 import io.r2dbc.postgresql.client.EncodedParameter;
 import io.r2dbc.postgresql.message.Format;
-import io.r2dbc.postgresql.type.PostgresqlObjectId;
 import io.r2dbc.postgresql.util.Assert;
 import reactor.util.annotation.Nullable;
 

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

@@ -20,7 +20,6 @@
 import io.netty.buffer.ByteBufAllocator;
 import io.r2dbc.postgresql.client.EncodedParameter;
 import io.r2dbc.postgresql.message.Format;
-import io.r2dbc.postgresql.type.PostgresqlObjectId;
 import io.r2dbc.postgresql.util.Assert;
 import reactor.util.annotation.Nullable;
 

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

@@ -19,7 +19,7 @@
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufAllocator;
 
-import static io.r2dbc.postgresql.type.PostgresqlObjectId.CIRCLE;
+import static io.r2dbc.postgresql.codec.PostgresqlObjectId.CIRCLE;
 
 /**
  * @since 0.8.5

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

@@ -20,17 +20,16 @@
 import io.netty.buffer.ByteBufAllocator;
 import io.r2dbc.postgresql.client.EncodedParameter;
 import io.r2dbc.postgresql.message.Format;
-import io.r2dbc.postgresql.type.PostgresqlObjectId;
 import io.r2dbc.postgresql.util.Assert;
 import io.r2dbc.postgresql.util.ByteBufUtils;
 import io.r2dbc.spi.Clob;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.util.annotation.Nullable;
 
+import static io.r2dbc.postgresql.codec.PostgresqlObjectId.TEXT;
+import static io.r2dbc.postgresql.codec.PostgresqlObjectId.VARCHAR;
 import static io.r2dbc.postgresql.message.Format.FORMAT_TEXT;
-import static io.r2dbc.postgresql.type.PostgresqlObjectId.TEXT;
-import static io.r2dbc.postgresql.type.PostgresqlObjectId.VARCHAR;
 
 final class ClobCodec extends AbstractCodec<Clob> {
 

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

@@ -19,7 +19,6 @@
 import io.netty.buffer.ByteBuf;
 import io.r2dbc.postgresql.client.EncodedParameter;
 import io.r2dbc.postgresql.message.Format;
-import io.r2dbc.postgresql.type.PostgresqlObjectId;
 import reactor.util.annotation.Nullable;
 
 /**

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

@@ -20,7 +20,6 @@
 import io.netty.buffer.ByteBufAllocator;
 import io.r2dbc.postgresql.client.EncodedParameter;
 import io.r2dbc.postgresql.message.Format;
-import io.r2dbc.postgresql.type.PostgresqlObjectId;
 import io.r2dbc.postgresql.util.Assert;
 import reactor.util.annotation.Nullable;
 

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

@@ -20,8 +20,6 @@
 import io.netty.buffer.ByteBufAllocator;
 import io.r2dbc.postgresql.client.EncodedParameter;
 import io.r2dbc.postgresql.message.Format;
-import io.r2dbc.postgresql.type.PostgresTypeIdentifier;
-import io.r2dbc.postgresql.type.PostgresqlObjectId;
 import io.r2dbc.postgresql.util.Assert;
 import io.r2dbc.spi.Parameter;
 import io.r2dbc.spi.R2dbcTypes;

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

@@ -19,11 +19,10 @@
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufAllocator;
 import io.r2dbc.postgresql.message.Format;
-import io.r2dbc.postgresql.type.PostgresqlObjectId;
 import io.r2dbc.postgresql.util.Assert;
 import reactor.util.annotation.Nullable;
 
-import static io.r2dbc.postgresql.type.PostgresqlObjectId.FLOAT8;
+import static io.r2dbc.postgresql.codec.PostgresqlObjectId.FLOAT8;
 
 final class DoubleCodec extends AbstractNumericCodec<Double> {
 

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

@@ -19,11 +19,10 @@
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufAllocator;
 import io.r2dbc.postgresql.message.Format;
-import io.r2dbc.postgresql.type.PostgresqlObjectId;
 import io.r2dbc.postgresql.util.Assert;
 import reactor.util.annotation.Nullable;
 
-import static io.r2dbc.postgresql.type.PostgresqlObjectId.FLOAT4;
+import static io.r2dbc.postgresql.codec.PostgresqlObjectId.FLOAT4;
 
 final class FloatCodec extends AbstractNumericCodec<Float> {
 

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

@@ -20,16 +20,15 @@
 import io.netty.buffer.ByteBufAllocator;
 import io.r2dbc.postgresql.client.EncodedParameter;
 import io.r2dbc.postgresql.message.Format;
-import io.r2dbc.postgresql.type.PostgresqlObjectId;
 import io.r2dbc.postgresql.util.Assert;
 import io.r2dbc.postgresql.util.ByteBufUtils;
 import reactor.util.annotation.Nullable;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 
+import static io.r2dbc.postgresql.codec.PostgresqlObjectId.INET;
 import static io.r2dbc.postgresql.message.Format.FORMAT_TEXT;
-import static io.r2dbc.postgresql.type.PostgresqlObjectId.INET;
 
 final class InetAddressCodec extends AbstractCodec<InetAddress> {
 

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

@@ -20,7 +20,6 @@
 import io.netty.buffer.ByteBufAllocator;
 import io.r2dbc.postgresql.client.EncodedParameter;
 import io.r2dbc.postgresql.message.Format;
-import io.r2dbc.postgresql.type.PostgresqlObjectId;
 import io.r2dbc.postgresql.util.Assert;
 import io.r2dbc.postgresql.util.ByteBufUtils;
 import reactor.util.annotation.Nullable;
@@ -31,8 +30,8 @@
 import java.time.ZoneId;
 import java.time.ZoneOffset;
 
+import static io.r2dbc.postgresql.codec.PostgresqlObjectId.TIMESTAMPTZ;
 import static io.r2dbc.postgresql.message.Format.FORMAT_TEXT;
-import static io.r2dbc.postgresql.type.PostgresqlObjectId.TIMESTAMPTZ;
 
 final class InstantCodec extends AbstractTemporalCodec<Instant> {
 

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

@@ -19,13 +19,12 @@
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufAllocator;
 import io.r2dbc.postgresql.client.EncodedParameter;
-import io.r2dbc.postgresql.type.PostgresqlObjectId;
 import io.r2dbc.postgresql.util.Assert;
 
 import java.util.function.Supplier;
 
+import static io.r2dbc.postgresql.codec.PostgresqlObjectId.INT4_ARRAY;
 import static io.r2dbc.postgresql.message.Format.FORMAT_TEXT;
-import static io.r2dbc.postgresql.type.PostgresqlObjectId.INT4_ARRAY;
 
 final class IntegerArrayCodec extends AbstractArrayCodec<Integer> {
 

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

@@ -19,11 +19,10 @@
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufAllocator;
 import io.r2dbc.postgresql.message.Format;
-import io.r2dbc.postgresql.type.PostgresqlObjectId;
 import io.r2dbc.postgresql.util.Assert;
 import reactor.util.annotation.Nullable;
 
-import static io.r2dbc.postgresql.type.PostgresqlObjectId.INT4;
+import static io.r2dbc.postgresql.codec.PostgresqlObjectId.INT4;
 
 final class IntegerCodec extends AbstractNumericCodec<Integer> {