Polishing

Add fast-path BigInteger conversion from BigDecimal. Use long value for all other numeric types to construct a BigInteger. Update copyright license header years.

[#233][#235]

Author: mp911de

README.md

@@ -312,7 +312,7 @@ This reference table shows the type mapping between [PostgreSQL][p] and Java dat
 | [`cidr`][psql-cidr-ref]                         | Not yet supported.|
 | [`circle`][psql-circle-ref]                     | Not yet supported.|
 | [`date`][psql-date-ref]                         | [`LocalDate`][java-ld-ref]|
-| [`double precision`][psql-floating-point-ref]   | [**`Double`**][java-double-ref], [`Float`][java-float-ref], [`Boolean`][java-boolean-ref], [`Byte`][java-byte-ref], [`Short`][java-short-ref], [`Integer`][java-integer-ref], [`Long`][java-long-ref], [`BigDecimal`][java-bigdecimal-ref]|
+| [`double precision`][psql-floating-point-ref]   | [**`Double`**][java-double-ref], [`Float`][java-float-ref], [`Boolean`][java-boolean-ref], [`Byte`][java-byte-ref], [`Short`][java-short-ref], [`Integer`][java-integer-ref], [`Long`][java-long-ref], [`BigDecimal`][java-bigdecimal-ref], [`BigInteger`][java-biginteger-ref]|
 | [`inet`][psql-inet-ref]                         | [**`InetAddress`**][java-inet-ref]|
 | [`integer`][psql-integer-ref]                   | [**`Integer`**][java-integer-ref], [`Boolean`][java-boolean-ref], [`Byte`][java-byte-ref], [`Short`][java-short-ref], [`Long`][java-long-ref], [`BigDecimal`][java-bigdecimal-ref], [`BigInteger`][java-biginteger-ref]|
 | [`interval`][psql-interval-ref]                 | Not yet supported.|

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@
 import io.r2dbc.postgresql.util.ByteBufUtils;
 import reactor.util.annotation.Nullable;
 
+import java.math.BigDecimal;
 import java.math.BigInteger;
 
 import static io.r2dbc.postgresql.message.Format.FORMAT_TEXT;
@@ -48,7 +49,9 @@ public Parameter encodeNull() {
     BigInteger doDecode(ByteBuf buffer, PostgresqlObjectId dataType, @Nullable Format format, @Nullable Class<? extends BigInteger> type) {
         Assert.requireNonNull(buffer, "byteBuf must not be null");
 
-        return this.decodeNumber(buffer, dataType, format, BigInteger.class, it -> new BigInteger(it.toString()));
+        return this.decodeNumber(buffer, dataType, format, BigInteger.class, it -> {
+            return it instanceof BigDecimal ? ((BigDecimal) it).toBigInteger() : BigInteger.valueOf(it.longValue());
+        });
     }
 
     @Override

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -81,9 +81,9 @@ void bigDecimal() {
     void bigInteger() {
         testCodec(BigInteger.class, new BigInteger("1000"), "NUMERIC");
         testCodec(BigInteger.class, new BigInteger("-1"), "NUMERIC");
-        testCodec(BigInteger.class, new BigInteger("10000"), "NUMERIC");
-        testCodec(BigInteger.class, new BigInteger("10010"), "NUMERIC");
-        testCodec(BigInteger.class, new BigInteger("2000010010"), "NUMERIC");
+        testCodecReadAs(new BigDecimal("10000.0000023"), BigInteger.class, new BigInteger("10000"), "NUMERIC");
+        testCodecReadAs(new BigDecimal("10010.1200023"), BigInteger.class, new BigInteger("10010"), "NUMERIC");
+        testCodecReadAs(new BigDecimal("2000010010.1200023"), BigInteger.class, new BigInteger("2000010010"), "NUMERIC");
         testCodec(BigInteger.class, new BigInteger("0"), "NUMERIC");
         testCodec(BigInteger.class, new BigInteger("100"), "INT2");
         testCodec(BigInteger.class, new BigInteger("100"), "INT4");
@@ -490,7 +490,6 @@ private <T> void testCodec(Class<T> javaType, T value, BiConsumer<T, T> equality
         }
     }
 
-
     private <T> void testRead(Class<T> javaType, T value, String sqlType, String insertPlaceholder) {
         testCodec(javaType, value, (actual, expected) -> {
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,15 +40,15 @@ class BigIntegerCodecTest {
     @Test
     void constructorNoByteBufAllocator() {
         assertThatIllegalArgumentException().isThrownBy(() -> new BigIntegerCodec(null))
-                .withMessage("byteBufAllocator must not be null");
+            .withMessage("byteBufAllocator must not be null");
     }
 
     @Test
     void decode() {
         BigInteger bigInteger = new BigInteger("100");
 
         assertThat(new BigIntegerCodec(TEST).decode(encode(TEST, bigInteger.toString()), dataType, FORMAT_TEXT, BigInteger.class))
-                .isEqualTo(bigInteger);
+            .isEqualTo(bigInteger);
     }
 
     @Test
@@ -68,35 +68,35 @@ void doCanDecode() {
     @Test
     void doCanDecodeNoFormat() {
         assertThatIllegalArgumentException().isThrownBy(() -> new BigIntegerCodec(TEST).doCanDecode(VARCHAR, null))
-                .withMessage("format must not be null");
+            .withMessage("format must not be null");
     }
 
     @Test
     void doCanDecodeNoType() {
         assertThatIllegalArgumentException().isThrownBy(() -> new BigIntegerCodec(TEST).doCanDecode(null, FORMAT_TEXT))
-                .withMessage("type must not be null");
+            .withMessage("type must not be null");
     }
 
     @Test
     void doEncode() {
         BigInteger bigInteger = new BigInteger("100");
 
         assertThat(new BigIntegerCodec(TEST).doEncode(bigInteger))
-                .hasFormat(FORMAT_TEXT)
-                .hasType(NUMERIC.getObjectId())
-                .hasValue(encode(TEST, "100"));
+            .hasFormat(FORMAT_TEXT)
+            .hasType(NUMERIC.getObjectId())
+            .hasValue(encode(TEST, "100"));
     }
 
     @Test
     void doEncodeNoValue() {
         assertThatIllegalArgumentException().isThrownBy(() -> new BigIntegerCodec(TEST).doEncode(null))
-                .withMessage("value must not be null");
+            .withMessage("value must not be null");
     }
 
     @Test
     void encodeNull() {
         assertThat(new BigIntegerCodec(TEST).encodeNull())
-                .isEqualTo(new Parameter(FORMAT_TEXT, NUMERIC.getObjectId(), NULL_VALUE));
+            .isEqualTo(new Parameter(FORMAT_TEXT, NUMERIC.getObjectId(), NULL_VALUE));
     }
-    
+
 }