Skip to content

Commit 3c7ca5c

Browse files
mp911demp911de
committed
Upgrade dependencies
* AssertJ 3.15.0 -> 3.16.1 * HikariCP 3.4.2 -> 3.4.5 * Netty 4.1.47.Final -> 4.1.50.Final * PGJDBC 42.2.11 -> 42.2.12 * Reactor BOM Dysprosium SR6 -> Dysprosium SR7 * Testcontainer 1.13.0 -> 1.14.2 Suppress deprecations to remain compatible with earlier Reactor Netty versions. Adopt tests to refined array assertion behavior. [resolves #281]
1 parent cec81c3 commit 3c7ca5c

File tree

7 files changed

+29
-30
lines changed

7 files changed

+29
-30
lines changed

‎pom.xml

+7-7
Original file line numberDiff line numberDiff line change
@@ -32,25 +32,25 @@
3232
<url>https://github.com/r2dbc/r2dbc-postgresql</url>
3333

3434
<properties>
35-
<assertj.version>3.14.0</assertj.version>
35+
<assertj.version>3.16.1</assertj.version>
3636
<blockhound.version>1.0.3.RELEASE</blockhound.version>
37-
<hikari-cp.version>3.4.0</hikari-cp.version>
37+
<hikari-cp.version>3.4.5</hikari-cp.version>
3838
<java.version>1.8</java.version>
3939
<jsr305.version>3.0.2</jsr305.version>
4040
<junit.version>5.6.1</junit.version>
4141
<jmh.version>1.23</jmh.version>
4242
<mbr.version>0.2.0.RELEASE</mbr.version>
4343
<logback.version>1.2.3</logback.version>
4444
<mockito.version>3.3.3</mockito.version>
45-
<netty.version>4.1.47.Final</netty.version>
46-
<postgresql.version>42.2.11</postgresql.version>
45+
<netty.version>4.1.50.Final</netty.version>
46+
<postgresql.version>42.2.12</postgresql.version>
4747
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4848
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
4949
<r2dbc-spi.version>0.8.1.RELEASE</r2dbc-spi.version>
50-
<reactor.version>Dysprosium-SR6</reactor.version>
50+
<reactor.version>Dysprosium-SR7</reactor.version>
5151
<scram-client.version>2.1</scram-client.version>
52-
<spring-framework.version>5.2.1.RELEASE</spring-framework.version>
53-
<testcontainers.version>1.13.0</testcontainers.version>
52+
<spring-framework.version>5.2.6.RELEASE</spring-framework.version>
53+
<testcontainers.version>1.14.2</testcontainers.version>
5454
</properties>
5555

5656
<licenses>

‎src/main/java/io/r2dbc/postgresql/client/ReactorNettyClient.java

+1
Original file line numberDiff line numberDiff line change
@@ -357,6 +357,7 @@ public static Mono<ReactorNettyClient> connect(String host, int port, @Nullable
357357
* @param settings the connection settings
358358
* @throws IllegalArgumentException if {@code socketAddress} or {@code settings} is {@code null}
359359
*/
360+
@SuppressWarnings("deprecation")
360361
public static Mono<ReactorNettyClient> connect(SocketAddress socketAddress, ConnectionSettings settings) {
361362
Assert.requireNonNull(socketAddress, "socketAddress must not be null");
362363
Assert.requireNonNull(settings, "settings must not be null");

‎src/test/java/io/r2dbc/postgresql/codec/DefaultCodecsTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,9 @@ void delegatePriority() {
9595
assertThat(codecs.decode(ByteBufUtils.encode(TEST, "test"), VARCHAR.getObjectId(), FORMAT_TEXT, Object.class)).isInstanceOf(String.class);
9696
assertThat(codecs.decode(ByteBufUtils.encode(TEST, "2018-11-04 15:35:00.847108"), TIMESTAMP.getObjectId(), FORMAT_TEXT, Object.class)).isInstanceOf(LocalDateTime.class);
9797
assertThat(codecs.decode(ByteBufUtils.encode(TEST, "2018-11-05 00:35:43.048593+09"), TIMESTAMPTZ.getObjectId(), FORMAT_TEXT, Object.class)).isInstanceOf(OffsetDateTime.class);
98-
assertThat(codecs.decode(ByteBufUtils.encode(TEST, "{100,200}"), INT2_ARRAY.getObjectId(), FORMAT_TEXT, Object.class)).isEqualTo(new short[]{100, 200});
99-
assertThat(codecs.decode(ByteBufUtils.encode(TEST, "{100,200}"), INT4_ARRAY.getObjectId(), FORMAT_TEXT, Object.class)).isEqualTo(new int[]{100, 200});
100-
assertThat(codecs.decode(ByteBufUtils.encode(TEST, "{100,200}"), INT8_ARRAY.getObjectId(), FORMAT_TEXT, Object.class)).isEqualTo(new long[]{100, 200});
98+
assertThat(codecs.decode(ByteBufUtils.encode(TEST, "{100,200}"), INT2_ARRAY.getObjectId(), FORMAT_TEXT, Object.class)).isEqualTo(new Short[]{100, 200});
99+
assertThat(codecs.decode(ByteBufUtils.encode(TEST, "{100,200}"), INT4_ARRAY.getObjectId(), FORMAT_TEXT, Object.class)).isEqualTo(new Integer[]{100, 200});
100+
assertThat(codecs.decode(ByteBufUtils.encode(TEST, "{100,200}"), INT8_ARRAY.getObjectId(), FORMAT_TEXT, Object.class)).isEqualTo(new Long[]{100L, 200L});
101101
assertThat(codecs.decode(ByteBufUtils.encode(TEST, "{alpha,bravo}"), VARCHAR_ARRAY.getObjectId(), FORMAT_TEXT, Object.class)).isEqualTo(new String[]{"alpha", "bravo"});
102102
}
103103

‎src/test/java/io/r2dbc/postgresql/codec/IntegerArrayCodecTest.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,15 @@ final class IntegerArrayCodecTest {
6363

6464
@Test
6565
void decodeItem() {
66-
assertThat(new IntegerArrayCodec(TEST).decode(SINGLE_DIM_BINARY_ARRAY, dataType, FORMAT_BINARY, Integer[].class)).isEqualTo(new int[]{100, 200});
66+
assertThat(new IntegerArrayCodec(TEST).decode(SINGLE_DIM_BINARY_ARRAY, dataType, FORMAT_BINARY, Integer[].class)).isEqualTo(new Integer[]{100, 200});
6767
assertThat(new IntegerArrayCodec(TEST).decode(encode(TEST, "{100,200}"), dataType, FORMAT_TEXT, Integer[].class))
68-
.isEqualTo(new int[]{100, 200});
68+
.isEqualTo(new Integer[]{100, 200});
6969
}
7070

7171
@Test
7272
void decodeItem_emptyArray() {
7373
assertThat(new IntegerArrayCodec(TEST).decode(encode(TEST, "{}"), dataType, FORMAT_TEXT, Integer[][].class))
74-
.isEqualTo(new int[][]{});
74+
.isEqualTo(new Integer[][]{});
7575
}
7676

7777
@Test
@@ -82,7 +82,7 @@ void decodeItem_emptyBinaryArray() {
8282
.writeInt(0)
8383
.writeInt(23);
8484

85-
assertThat(new IntegerArrayCodec(TEST).decode(buf, dataType, FORMAT_BINARY, Integer[][].class)).isEqualTo(new int[][]{});
85+
assertThat(new IntegerArrayCodec(TEST).decode(buf, dataType, FORMAT_BINARY, Integer[][].class)).isEqualTo(new Integer[][]{});
8686
}
8787

8888
@Test
@@ -130,8 +130,8 @@ void decodeObject() {
130130
Codec codec = new IntegerArrayCodec(TEST);
131131
codec.canDecode(PostgresqlObjectId.INT4_ARRAY.getObjectId(), FORMAT_TEXT, Object.class);
132132

133-
assertThat(codec.decode(SINGLE_DIM_BINARY_ARRAY, dataType, FORMAT_BINARY, Object.class)).isEqualTo(new int[]{100, 200});
134-
assertThat(codec.decode(encode(TEST, "{100,200}"), dataType, FORMAT_TEXT, Object.class)).isEqualTo(new int[]{100, 200});
133+
assertThat(codec.decode(SINGLE_DIM_BINARY_ARRAY, dataType, FORMAT_BINARY, Object.class)).isEqualTo(new Integer[]{100, 200});
134+
assertThat(codec.decode(encode(TEST, "{100,200}"), dataType, FORMAT_TEXT, Object.class)).isEqualTo(new Integer[]{100, 200});
135135
}
136136

137137
@Test

‎src/test/java/io/r2dbc/postgresql/codec/LongArrayCodecTest.java

+6-8
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@
3333

3434
final class LongArrayCodecTest {
3535

36-
private static final int dataType = INT8_ARRAY.getObjectId();
37-
3836
private final ByteBuf BINARY_ARRAY = TEST
3937
.buffer()
4038
.writeInt(1)
@@ -49,17 +47,17 @@ final class LongArrayCodecTest {
4947

5048
@Test
5149
void decodeItem() {
52-
assertThat(new LongArrayCodec(TEST).decode(BINARY_ARRAY, 0, FORMAT_BINARY, Long[].class)).isEqualTo(new long[]{100, 200});
53-
assertThat(new LongArrayCodec(TEST).decode(TEST.buffer(), 0, FORMAT_BINARY, Long[].class)).isEqualTo(new long[]{});
54-
assertThat(new LongArrayCodec(TEST).decode(encode(TEST, "{100,200}"), 0, FORMAT_TEXT, Long[].class)).isEqualTo(new long[]{100, 200});
55-
assertThat(new LongArrayCodec(TEST).decode(encode(TEST, "{}"), 0, FORMAT_TEXT, Long[].class)).isEqualTo(new long[]{});
50+
assertThat(new LongArrayCodec(TEST).decode(BINARY_ARRAY, 0, FORMAT_BINARY, Long[].class)).isEqualTo(new Long[]{100L, 200L});
51+
assertThat(new LongArrayCodec(TEST).decode(TEST.buffer(), 0, FORMAT_BINARY, Long[].class)).isEqualTo(new Long[]{});
52+
assertThat(new LongArrayCodec(TEST).decode(encode(TEST, "{100,200}"), 0, FORMAT_TEXT, Long[].class)).isEqualTo(new Long[]{100L, 200L});
53+
assertThat(new LongArrayCodec(TEST).decode(encode(TEST, "{}"), 0, FORMAT_TEXT, Long[].class)).isEqualTo(new Long[]{});
5654
}
5755

5856
@Test
5957
@SuppressWarnings({"rawtypes", "unchecked"})
6058
void decodeObject() {
61-
assertThat(((Codec) new LongArrayCodec(TEST)).decode(BINARY_ARRAY, 0, FORMAT_BINARY, Object.class)).isEqualTo(new long[]{100, 200});
62-
assertThat(((Codec) new LongArrayCodec(TEST)).decode(encode(TEST, "{100,200}"), 0, FORMAT_TEXT, Object.class)).isEqualTo(new long[]{100, 200});
59+
assertThat(((Codec) new LongArrayCodec(TEST)).decode(BINARY_ARRAY, 0, FORMAT_BINARY, Object.class)).isEqualTo(new Long[]{100L, 200L});
60+
assertThat(((Codec) new LongArrayCodec(TEST)).decode(encode(TEST, "{100,200}"), 0, FORMAT_TEXT, Object.class)).isEqualTo(new Long[]{100L, 200L});
6361
}
6462

6563
@Test

‎src/test/java/io/r2dbc/postgresql/codec/ShortArrayCodecTest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,15 @@ final class ShortArrayCodecTest {
4949

5050
@Test
5151
void decodeItem() {
52-
assertThat(new ShortArrayCodec(TEST).decode(BINARY_ARRAY, dataType, FORMAT_BINARY, Short[].class)).isEqualTo(new short[]{100, 200});
53-
assertThat(new ShortArrayCodec(TEST).decode(encode(TEST, "{100,200}"), dataType, FORMAT_TEXT, Short[].class)).isEqualTo(new short[]{100, 200});
52+
assertThat(new ShortArrayCodec(TEST).decode(BINARY_ARRAY, dataType, FORMAT_BINARY, Short[].class)).isEqualTo(new Short[]{100, 200});
53+
assertThat(new ShortArrayCodec(TEST).decode(encode(TEST, "{100,200}"), dataType, FORMAT_TEXT, Short[].class)).isEqualTo(new Short[]{100, 200});
5454
}
5555

5656
@Test
5757
@SuppressWarnings({"rawtypes", "unchecked"})
5858
void decodeObject() {
59-
assertThat(((Codec) new ShortArrayCodec(TEST)).decode(BINARY_ARRAY, dataType, FORMAT_BINARY, Object.class)).isEqualTo(new short[]{100, 200});
60-
assertThat(((Codec) new ShortArrayCodec(TEST)).decode(encode(TEST, "{100,200}"), dataType, FORMAT_TEXT, Object.class)).isEqualTo(new short[]{100, 200});
59+
assertThat(((Codec) new ShortArrayCodec(TEST)).decode(BINARY_ARRAY, dataType, FORMAT_BINARY, Object.class)).isEqualTo(new Short[]{100, 200});
60+
assertThat(((Codec) new ShortArrayCodec(TEST)).decode(encode(TEST, "{100,200}"), dataType, FORMAT_TEXT, Object.class)).isEqualTo(new Short[]{100, 200});
6161
}
6262

6363
@Test

‎src/test/java/io/r2dbc/postgresql/message/frontend/FrontendMessageAssert.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
import io.netty.buffer.ByteBuf;
2020
import io.netty.buffer.ByteBufUtil;
2121
import org.assertj.core.api.AbstractObjectAssert;
22-
import org.assertj.core.util.Objects;
2322
import org.reactivestreams.Publisher;
2423
import reactor.core.publisher.Mono;
2524
import reactor.test.StepVerifier;
2625

26+
import java.util.Objects;
2727
import java.util.function.Function;
2828

2929
import static io.r2dbc.postgresql.util.TestByteBufAllocator.TEST;
@@ -73,7 +73,7 @@ EncodedAssert isEncodedAs(Function<ByteBuf, ByteBuf> encoded) {
7373
.consumeNextWith(actual -> {
7474
ByteBuf expected = encoded.apply(TEST.buffer());
7575

76-
if (!Objects.areEqual(actual, expected)) {
76+
if (!Objects.deepEquals(actual, expected)) {
7777
failWithMessage("\nExpected:\n%s\nActual:\n%s", ByteBufUtil.prettyHexDump(expected), ByteBufUtil.prettyHexDump(actual));
7878
}
7979
})

0 commit comments

Comments
 (0)