Polishing

Switch argument ordering for format and type arguments

[#378]

Author: mp911de

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

@@ -51,7 +51,7 @@ abstract class AbstractBinaryCodec<T> extends AbstractCodec<T> {
 
     @Override
     public EncodedParameter encodeNull() {
-        return createNull(BYTEA, FORMAT_TEXT);
+        return createNull(FORMAT_TEXT, BYTEA);
     }
 
     @Override

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

@@ -111,40 +111,40 @@ public Class<?> type() {
     /**
      * Create a {@link EncodedParameter}.
      *
-     * @param type   the well-known {@link PostgresqlObjectId type OID}
      * @param format the format to use
+     * @param type   the well-known {@link PostgresqlObjectId type OID}
      * @param value  {@link Publisher} emitting {@link ByteBuf buffers}
      * @return the encoded  {@link EncodedParameter}
      * @implNote use deferred buffer creation instead of {@link Mono#just(Object)} and {@link Flux#just(Object)} to avoid memory
      * leaks
      */
-    static EncodedParameter create(PostgresqlObjectId type, Format format, Publisher<? extends ByteBuf> value) {
+    static EncodedParameter create(Format format, PostgresqlObjectId type, Publisher<? extends ByteBuf> value) {
         Assert.requireNonNull(type, "type must not be null");
         return new EncodedParameter(format, type.getObjectId(), value);
     }
 
     /**
      * Create a {@link EncodedParameter}.
      *
-     * @param type           the well-known {@link PostgresqlObjectId type OID}
      * @param format         the format to use
+     * @param type           the well-known {@link PostgresqlObjectId type OID}
      * @param bufferSupplier {@link Supplier} supplying the encoded {@link ByteBuf buffer}
      * @return the encoded  {@link EncodedParameter}
      */
-    static EncodedParameter create(PostgresqlObjectId type, Format format, Supplier<? extends ByteBuf> bufferSupplier) {
+    static EncodedParameter create(Format format, PostgresqlObjectId type, Supplier<? extends ByteBuf> bufferSupplier) {
         Assert.requireNonNull(type, "type must not be null");
         return new EncodedParameter(format, type.getObjectId(), Mono.fromSupplier(bufferSupplier));
     }
 
     /**
      * Encode a {@code null} value.
      *
-     * @param type   the well-known {@link PostgresqlObjectId type OID}
      * @param format the data type {@link Format}, text or binary
+     * @param type   the well-known {@link PostgresqlObjectId type OID}
      * @return the encoded {@code null} value
      */
-    static EncodedParameter createNull(PostgresqlObjectId type, Format format) {
-        return create(type, format, NULL_VALUE);
+    static EncodedParameter createNull(Format format, PostgresqlObjectId type) {
+        return create(format, type, NULL_VALUE);
     }
 
     /**

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

@@ -92,7 +92,7 @@ EncodedParameter doEncode(T value) {
     EncodedParameter doEncode(T value, PostgresqlObjectId dataType) {
         Assert.requireNonNull(value, "value must not be null");
 
-        return create(dataType, Format.FORMAT_BINARY, () -> doEncodeBinary(value));
+        return create(Format.FORMAT_BINARY, dataType, () -> doEncodeBinary(value));
     }
 
     /**
@@ -105,7 +105,7 @@ EncodedParameter doEncode(T value, PostgresqlObjectId dataType) {
 
     @Override
     public EncodedParameter encodeNull() {
-        return createNull(this.postgresqlObjectId, Format.FORMAT_BINARY);
+        return createNull(Format.FORMAT_BINARY, this.postgresqlObjectId);
     }
 
     /**

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

@@ -38,7 +38,7 @@ EncodedParameter doEncode(T value) {
 
     @Override
     public EncodedParameter encodeNull() {
-        return createNull(JSONB, FORMAT_BINARY);
+        return createNull(FORMAT_BINARY, JSONB);
     }
 
     @Override

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

@@ -98,7 +98,7 @@ T decodeNumber(ByteBuf buffer, PostgresqlObjectId dataType, @Nullable Format for
 
     @Override
     public EncodedParameter encodeNull() {
-        return createNull(getDefaultType(), FORMAT_BINARY);
+        return createNull(FORMAT_BINARY, getDefaultType());
     }
 
     /**

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

@@ -112,7 +112,7 @@ public EncodedParameter encodeNull() {
             throw new IllegalStateException("Cannot encode null, default type of " + getClass().getName() + " must not be null!");
         }
 
-        return createNull(defaultType, FORMAT_TEXT);
+        return createNull(FORMAT_TEXT, defaultType);
     }
 
     /**

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

@@ -53,7 +53,7 @@ String doEncodeText(BigDecimal value) {
 
     @Override
     EncodedParameter encodeArray(Supplier<ByteBuf> encodedSupplier, PostgresqlObjectId dataType) {
-        return create(dataType, Format.FORMAT_TEXT, encodedSupplier);
+        return create(Format.FORMAT_TEXT, dataType, encodedSupplier);
     }
 
 }

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

@@ -50,7 +50,7 @@ BigDecimal doDecode(ByteBuf buffer, PostgresqlObjectId dataType, @Nullable Forma
     EncodedParameter doEncode(BigDecimal value, PostgresqlObjectId dataType) {
         Assert.requireNonNull(value, "value must not be null");
 
-        return create(dataType, FORMAT_TEXT, () -> ByteBufUtils.encode(this.byteBufAllocator, value.toString()));
+        return create(FORMAT_TEXT, dataType, () -> ByteBufUtils.encode(this.byteBufAllocator, value.toString()));
     }
 
     @Override

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

@@ -53,7 +53,7 @@ BigInteger doDecode(ByteBuf buffer, PostgresqlObjectId dataType, @Nullable Forma
     EncodedParameter doEncode(BigInteger value, PostgresqlObjectId dataType) {
         Assert.requireNonNull(value, "value must not be null");
 
-        return create(dataType, FORMAT_TEXT, () -> ByteBufUtils.encode(this.byteBufAllocator, value.toString()));
+        return create(FORMAT_TEXT, dataType, () -> ByteBufUtils.encode(this.byteBufAllocator, value.toString()));
     }
 
     @Override

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

@@ -41,7 +41,7 @@ byte[] doDecode(ByteBuf buffer, PostgresqlObjectId dataType, Format format, Clas
     EncodedParameter doEncode(byte[] value, PostgresqlObjectId dataType) {
         Assert.requireNonNull(value, "value must not be null");
 
-        return create(dataType, FORMAT_TEXT, () -> encodeToHex(Unpooled.wrappedBuffer(value)));
+        return create(FORMAT_TEXT, dataType, () -> encodeToHex(Unpooled.wrappedBuffer(value)));
     }
 
 }

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

@@ -40,7 +40,7 @@ ByteBuffer doDecode(ByteBuf buffer, PostgresqlObjectId dataType, Format format,
 
     @Override
     EncodedParameter doEncode(ByteBuffer value, PostgresqlObjectId dataType) {
-        return create(dataType, FORMAT_TEXT, () -> encodeToHex(Unpooled.wrappedBuffer(value)));
+        return create(FORMAT_TEXT, dataType, () -> encodeToHex(Unpooled.wrappedBuffer(value)));
     }
 
 }

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

@@ -44,7 +44,7 @@ final class BlobCodec extends AbstractCodec<Blob> {
 
     @Override
     public EncodedParameter encodeNull() {
-        return createNull(BYTEA, FORMAT_TEXT);
+        return createNull(FORMAT_TEXT, BYTEA);
     }
 
     @Override
@@ -71,7 +71,7 @@ EncodedParameter doEncode(Blob value) {
     EncodedParameter doEncode(Blob value, PostgresqlObjectId dataType) {
         Assert.requireNonNull(value, "value must not be null");
 
-        return create(dataType, FORMAT_TEXT,
+        return create(FORMAT_TEXT, dataType,
             Flux.from(value.stream())
                 .reduce(this.byteBufAllocator.compositeBuffer(), (a, b) -> a.addComponent(true, Unpooled.wrappedBuffer(b)))
                 .map(it -> AbstractBinaryCodec.encodeToHex(it, this.byteBufAllocator))

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

@@ -39,7 +39,7 @@ final class BooleanCodec extends AbstractCodec<Boolean> {
 
     @Override
     public EncodedParameter encodeNull() {
-        return createNull(BOOL, FORMAT_TEXT);
+        return createNull(FORMAT_TEXT, BOOL);
     }
 
     @Override
@@ -76,7 +76,7 @@ EncodedParameter doEncode(Boolean value) {
     EncodedParameter doEncode(Boolean value, PostgresqlObjectId dataType) {
         Assert.requireNonNull(value, "value must not be null");
 
-        return create(dataType, FORMAT_TEXT, () -> ByteBufUtils.encode(this.byteBufAllocator, value ? "TRUE" : "FALSE"));
+        return create(FORMAT_TEXT, dataType, () -> ByteBufUtils.encode(this.byteBufAllocator, value ? "TRUE" : "FALSE"));
     }
 
 }

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

@@ -43,7 +43,7 @@ final class ClobCodec extends AbstractCodec<Clob> {
 
     @Override
     public EncodedParameter encodeNull() {
-        return createNull(TEXT, FORMAT_TEXT);
+        return createNull(FORMAT_TEXT, TEXT);
     }
 
     @Override
@@ -70,7 +70,7 @@ EncodedParameter doEncode(Clob value) {
     EncodedParameter doEncode(Clob value, PostgresqlObjectId dataType) {
         Assert.requireNonNull(value, "value must not be null");
 
-        return create(dataType, FORMAT_TEXT,
+        return create(FORMAT_TEXT, dataType,
             Flux.from(value.stream())
                 .reduce(new StringBuilder(), StringBuilder::append)
                 .map(sb -> ByteBufUtils.encode(this.byteBufAllocator, sb.toString()))

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

@@ -46,7 +46,7 @@ Double doDecode(ByteBuf buffer, PostgresqlObjectId dataType, Format format, @Nul
 
     @Override
     EncodedParameter doEncode(Double value, PostgresqlObjectId dataType) {
-        return create(dataType, FORMAT_BINARY, () -> this.byteBufAllocator.buffer(8).writeDouble(value));
+        return create(FORMAT_BINARY, dataType, () -> this.byteBufAllocator.buffer(8).writeDouble(value));
     }
 
     @Override

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

@@ -46,7 +46,7 @@ Float doDecode(ByteBuf buffer, PostgresqlObjectId dataType, Format format, @Null
 
     @Override
     EncodedParameter doEncode(Float value, PostgresqlObjectId dataType) {
-        return create(dataType, FORMAT_BINARY, () -> this.byteBufAllocator.buffer(4).writeFloat(value));
+        return create(FORMAT_BINARY, dataType, () -> this.byteBufAllocator.buffer(4).writeFloat(value));
     }
 
     @Override

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

@@ -42,7 +42,7 @@ final class InetAddressCodec extends AbstractCodec<InetAddress> {
 
     @Override
     public EncodedParameter encodeNull() {
-        return createNull(INET, FORMAT_TEXT);
+        return createNull(FORMAT_TEXT, INET);
     }
 
     @Override
@@ -87,7 +87,7 @@ EncodedParameter doEncode(InetAddress value) {
     EncodedParameter doEncode(InetAddress value, PostgresqlObjectId dataType) {
         Assert.requireNonNull(value, "value must not be null");
 
-        return create(dataType, FORMAT_TEXT, () -> ByteBufUtils.encode(this.byteBufAllocator, value.getHostAddress()));
+        return create(FORMAT_TEXT, dataType, () -> ByteBufUtils.encode(this.byteBufAllocator, value.getHostAddress()));
     }
 
 }

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

@@ -45,7 +45,7 @@ final class InstantCodec extends AbstractTemporalCodec<Instant> {
 
     @Override
     public EncodedParameter encodeNull() {
-        return createNull(TIMESTAMPTZ, FORMAT_TEXT);
+        return createNull(FORMAT_TEXT, TIMESTAMPTZ);
     }
 
     @Override
@@ -75,7 +75,7 @@ EncodedParameter doEncode(Instant value) {
     EncodedParameter doEncode(Instant value, PostgresqlObjectId dataType) {
         Assert.requireNonNull(value, "value must not be null");
 
-        return create(dataType, FORMAT_TEXT, () -> ByteBufUtils.encode(this.byteBufAllocator, value.toString()));
+        return create(FORMAT_TEXT, dataType, () -> ByteBufUtils.encode(this.byteBufAllocator, value.toString()));
     }
 
     @Override

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

@@ -45,7 +45,7 @@ Integer doDecodeText(String text) {
 
     @Override
     EncodedParameter encodeArray(Supplier<ByteBuf> encodedSupplier, PostgresqlObjectId dataType) {
-        return create(dataType, FORMAT_TEXT, encodedSupplier);
+        return create(FORMAT_TEXT, dataType, encodedSupplier);
     }
 
     @Override

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

@@ -46,7 +46,7 @@ Integer doDecode(ByteBuf buffer, PostgresqlObjectId dataType, @Nullable Format f
 
     @Override
     EncodedParameter doEncode(Integer value, PostgresqlObjectId dataType) {
-        return create(dataType, FORMAT_BINARY, () -> this.byteBufAllocator.buffer(4).writeInt(value));
+        return create(FORMAT_BINARY, dataType, () -> this.byteBufAllocator.buffer(4).writeInt(value));
     }
 
     @Override

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

@@ -58,12 +58,12 @@ EncodedParameter doEncode(Interval value) {
     EncodedParameter doEncode(Interval value, PostgresqlObjectId dataType) {
         Assert.requireNonNull(value, "value must not be null");
 
-        return create(dataType, FORMAT_TEXT,
+        return create(FORMAT_TEXT, dataType,
             () -> ByteBufUtils.encode(this.byteBufAllocator, value.getValue()));
     }
 
     @Override
     public EncodedParameter encodeNull() {
-        return createNull(INTERVAL, FORMAT_TEXT);
+        return createNull(FORMAT_TEXT, INTERVAL);
     }
 }

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

@@ -47,7 +47,7 @@ byte[] doDecode(ByteBuf buffer, PostgresqlObjectId dataType, Format format, Clas
     EncodedParameter doEncode(byte[] value, PostgresqlObjectId dataType) {
         Assert.requireNonNull(value, "value must not be null");
 
-        return create(JSON, FORMAT_TEXT, () -> this.byteBufAllocator.buffer(value.length).writeBytes(value));
+        return create(FORMAT_TEXT, JSON, () -> this.byteBufAllocator.buffer(value.length).writeBytes(value));
     }
 
 }

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

@@ -50,7 +50,7 @@ EncodedParameter doEncode(ByteBuf value) {
     EncodedParameter doEncode(ByteBuf value, PostgresqlObjectId dataType) {
         Assert.requireNonNull(value, "value must not be null");
 
-        return create(dataType, FORMAT_BINARY, () -> {
+        return create(FORMAT_BINARY, dataType, () -> {
             try {
                 return this.byteBufAllocator.buffer(value.readByte() + 1).writeByte(1).writeBytes(value);
             } finally {

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

@@ -50,7 +50,7 @@ ByteBuffer doDecode(ByteBuf buffer, PostgresqlObjectId dataType, Format format,
     EncodedParameter doEncode(ByteBuffer value, PostgresqlObjectId dataType) {
         Assert.requireNonNull(value, "value must not be null");
 
-        return create(dataType, FORMAT_TEXT, () -> this.byteBufAllocator.buffer(value.remaining()).writeBytes(value));
+        return create(FORMAT_TEXT, dataType, () -> this.byteBufAllocator.buffer(value.remaining()).writeBytes(value));
     }
 
 }

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

@@ -74,7 +74,7 @@ EncodedParameter doEncode(Json value, PostgresqlObjectId dataType) {
             throw new IllegalArgumentException("value must be JsonInput or JsonOutput");
         }
 
-        return create(dataType, FORMAT_BINARY, () -> {
+        return create(FORMAT_BINARY, dataType, () -> {
 
             Object toEncode;
 

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

@@ -55,7 +55,7 @@ EncodedParameter doEncode(InputStream value) {
     EncodedParameter doEncode(InputStream value, PostgresqlObjectId dataType) {
         Assert.requireNonNull(value, "value must not be null");
 
-        return create(dataType, FORMAT_BINARY, () -> doEncode(value, this.byteBufAllocator));
+        return create(FORMAT_BINARY, dataType, () -> doEncode(value, this.byteBufAllocator));
     }
 
     static ByteBuf doEncode(InputStream value, ByteBufAllocator alloc) {

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

@@ -50,7 +50,7 @@ EncodedParameter doEncode(String value) {
     EncodedParameter doEncode(String value, PostgresqlObjectId dataType) {
         Assert.requireNonNull(value, "value must not be null");
 
-        return create(dataType, FORMAT_TEXT, () -> ByteBufUtils.encode(this.byteBufAllocator, value));
+        return create(FORMAT_TEXT, dataType, () -> ByteBufUtils.encode(this.byteBufAllocator, value));
     }
 
 }

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

@@ -58,7 +58,7 @@ LocalDate doDecode(ByteBuf buffer, PostgresqlObjectId dataType, @Nullable Format
     EncodedParameter doEncode(LocalDate value, PostgresqlObjectId dataType) {
         Assert.requireNonNull(value, "value must not be null");
 
-        return create(dataType, FORMAT_TEXT, () -> ByteBufUtils.encode(this.byteBufAllocator, value.toString()));
+        return create(FORMAT_TEXT, dataType, () -> ByteBufUtils.encode(this.byteBufAllocator, value.toString()));
     }
 
     @Override

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

@@ -60,7 +60,7 @@ LocalDateTime doDecode(ByteBuf buffer, PostgresqlObjectId dataType, @Nullable Fo
     EncodedParameter doEncode(LocalDateTime value, PostgresqlObjectId dataType) {
         Assert.requireNonNull(value, "value must not be null");
 
-        return create(dataType, FORMAT_TEXT, () -> ByteBufUtils.encode(this.byteBufAllocator, value.toString()));
+        return create(FORMAT_TEXT, dataType, () -> ByteBufUtils.encode(this.byteBufAllocator, value.toString()));
     }
 
     @Override

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

@@ -59,7 +59,7 @@ LocalTime doDecode(ByteBuf buffer, PostgresqlObjectId dataType, @Nullable Format
     EncodedParameter doEncode(LocalTime value, PostgresqlObjectId dataType) {
         Assert.requireNonNull(value, "value must not be null");
 
-        return create(dataType, FORMAT_TEXT, () -> ByteBufUtils.encode(this.byteBufAllocator, value.toString()));
+        return create(FORMAT_TEXT, dataType, () -> ByteBufUtils.encode(this.byteBufAllocator, value.toString()));
     }
 
     @Override

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

@@ -45,7 +45,7 @@ Long doDecodeText(String text) {
 
     @Override
     EncodedParameter encodeArray(Supplier<ByteBuf> encodedSupplier, PostgresqlObjectId dataType) {
-        return create(dataType, FORMAT_TEXT, encodedSupplier);
+        return create(FORMAT_TEXT, dataType, encodedSupplier);
     }
 
     @Override

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

@@ -46,7 +46,7 @@ Long doDecode(ByteBuf buffer, PostgresqlObjectId dataType, Format format, @Nulla
 
     @Override
     EncodedParameter doEncode(Long value, PostgresqlObjectId dataType) {
-        return create(dataType, FORMAT_BINARY, () -> this.byteBufAllocator.buffer(8).writeLong(value));
+        return create(FORMAT_BINARY, dataType, () -> this.byteBufAllocator.buffer(8).writeLong(value));
     }
 
     @Override

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

@@ -50,7 +50,7 @@ OffsetDateTime doDecode(ByteBuf buffer, PostgresqlObjectId dataType, @Nullable F
     EncodedParameter doEncode(OffsetDateTime value, PostgresqlObjectId dataType) {
         Assert.requireNonNull(value, "value must not be null");
 
-        return create(dataType, FORMAT_TEXT, () -> ByteBufUtils.encode(this.byteBufAllocator, value.toString()));
+        return create(FORMAT_TEXT, dataType, () -> ByteBufUtils.encode(this.byteBufAllocator, value.toString()));
     }
 
     @Override