From ec1299fef396a47715d506c842a0811dc2c55deb Mon Sep 17 00:00:00 2001 From: Ben Hale Date: Thu, 21 Jun 2018 15:56:50 +0100 Subject: [PATCH] Upgrade to Californium This change upgrades the project to use Reactor Californium snapshots. --- README.md | 4 ++-- pom.xml | 8 ++++---- src/test/java/io/r2dbc/postgresql/Examples.java | 16 ++-------------- .../ExtendedQueryPostgresqlStatementTest.java | 10 +++++----- .../io/r2dbc/postgresql/PostgresqlBatchTest.java | 8 ++++---- 5 files changed, 17 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index 7c13b621..bdadb50a 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ Artifacts can bound found at the following repositories. spring-snapshots Spring Snapshots - http://repo.spring.io/snapshot + https://repo.spring.io/snapshot true @@ -36,7 +36,7 @@ Artifacts can bound found at the following repositories. spring-milestones Spring Milestones - http://repo.spring.io/milestone + https://repo.spring.io/milestone false diff --git a/pom.xml b/pom.xml index 9eedd603..1fb10cd0 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ UTF-8 UTF-8 1.0.0.BUILD-SNAPSHOT - Bismuth-SR10 + Californium-BUILD-SNAPSHOT 1.7.25 2.0.2.RELEASE @@ -231,7 +231,7 @@ spring-milestones Spring Milestones - http://repo.spring.io/milestone + https://repo.spring.io/milestone false @@ -239,7 +239,7 @@ spring-releases Spring Releases - http://repo.spring.io/release + https://repo.spring.io/release false @@ -247,7 +247,7 @@ spring-snapshots Spring Snapshots - http://repo.spring.io/snapshot + https://repo.spring.io/snapshot true diff --git a/src/test/java/io/r2dbc/postgresql/Examples.java b/src/test/java/io/r2dbc/postgresql/Examples.java index 177bab31..66a8c838 100644 --- a/src/test/java/io/r2dbc/postgresql/Examples.java +++ b/src/test/java/io/r2dbc/postgresql/Examples.java @@ -61,7 +61,7 @@ void batch() { .concatWith(close(connection))) .as(StepVerifier::create) - .expectNextCount(3) // TODO: Decrease by 1 when https://github.com/reactor/reactor-core/issues/1033 + .expectNextCount(2) .verifyComplete(); } @@ -80,7 +80,6 @@ void compoundStatement() { .as(StepVerifier::create) .expectNext(Collections.singletonList(100)) .expectNext(Collections.singletonList(100)) - .expectNextCount(1) // TODO: Remove when https://github.com/reactor/reactor-core/issues/1033 .verifyComplete(); } @@ -129,7 +128,6 @@ void generatedKeys() { .as(StepVerifier::create) .expectNext(Collections.singletonList(1)) .expectNext(Collections.singletonList(2)) - .expectNextCount(1) // TODO: Remove when https://github.com/reactor/reactor-core/issues/1033 .verifyComplete(); } @@ -169,7 +167,7 @@ void prepareStatement() { .concatWith(close(connection)); }) .as(StepVerifier::create) - .expectNextCount(11) // TODO: Decrease by 1 when https://github.com/reactor/reactor-core/issues/1033 + .expectNextCount(10) .verifyComplete(); } @@ -210,15 +208,11 @@ void savePoint() { .concatWith(close(connection))) .as(StepVerifier::create) .expectNext(Collections.singletonList(100)) - .expectNextCount(1) // TODO: Remove when https://github.com/reactor/reactor-core/issues/1033 .expectNext(1) .expectNext(Arrays.asList(100, 200)) - .expectNextCount(1) // TODO: Remove when https://github.com/reactor/reactor-core/issues/1033 .expectNext(1) .expectNext(Arrays.asList(100, 200, 300)) - .expectNextCount(1) // TODO: Remove when https://github.com/reactor/reactor-core/issues/1033 .expectNext(Arrays.asList(100, 200)) - .expectNextCount(1) // TODO: Remove when https://github.com/reactor/reactor-core/issues/1033 .verifyComplete(); } @@ -250,12 +244,9 @@ void transactionCommit() { .concatWith(close(connection))) .as(StepVerifier::create) .expectNext(Collections.singletonList(100)) - .expectNextCount(1) // TODO: Remove when https://github.com/reactor/reactor-core/issues/1033 .expectNext(1) .expectNext(Arrays.asList(100, 200)) - .expectNextCount(1) // TODO: Remove when https://github.com/reactor/reactor-core/issues/1033 .expectNext(Arrays.asList(100, 200)) - .expectNextCount(1) // TODO: Remove when https://github.com/reactor/reactor-core/issues/1033 .verifyComplete(); } @@ -305,12 +296,9 @@ void transactionRollback() { .concatWith(close(connection))) .as(StepVerifier::create) .expectNext(Collections.singletonList(100)) - .expectNextCount(1) // TODO: Remove when https://github.com/reactor/reactor-core/issues/1033 .expectNext(1) .expectNext(Arrays.asList(100, 200)) - .expectNextCount(1) // TODO: Remove when https://github.com/reactor/reactor-core/issues/1033 .expectNext(Collections.singletonList(100)) - .expectNextCount(1) // TODO: Remove when https://github.com/reactor/reactor-core/issues/1033 .verifyComplete(); } diff --git a/src/test/java/io/r2dbc/postgresql/ExtendedQueryPostgresqlStatementTest.java b/src/test/java/io/r2dbc/postgresql/ExtendedQueryPostgresqlStatementTest.java index bdf41405..60a2d5b3 100644 --- a/src/test/java/io/r2dbc/postgresql/ExtendedQueryPostgresqlStatementTest.java +++ b/src/test/java/io/r2dbc/postgresql/ExtendedQueryPostgresqlStatementTest.java @@ -218,7 +218,7 @@ BindComplete.INSTANCE, NoData.INSTANCE, new CommandComplete("test", null, null), .add() .execute() .as(StepVerifier::create) - .expectNextCount(3) // TODO: Decrease by 1 when https://github.com/reactor/reactor-core/issues/1033 + .expectNextCount(2) .verifyComplete(); } @@ -256,7 +256,7 @@ BindComplete.INSTANCE, NoData.INSTANCE, new CommandComplete("test", null, null), .add() .executeReturningGeneratedKeys() .as(StepVerifier::create) - .expectNextCount(2) // TODO: Decrease by 1 when https://github.com/reactor/reactor-core/issues/1033 + .expectNextCount(1) .verifyComplete(); } @@ -287,7 +287,7 @@ BindComplete.INSTANCE, NoData.INSTANCE, new CommandComplete("test", null, null), .add() .executeReturningGeneratedKeys() .as(StepVerifier::create) - .expectNextCount(2) // TODO: Decrease by 1 when https://github.com/reactor/reactor-core/issues/1033 + .expectNextCount(1) .verifyComplete(); } @@ -319,7 +319,7 @@ BindComplete.INSTANCE, NoData.INSTANCE, new CommandComplete("test", null, null), .add() .executeReturningGeneratedKeys() .as(StepVerifier::create) - .expectNextCount(2) // TODO: Decrease by 1 when https://github.com/reactor/reactor-core/issues/1033 + .expectNextCount(1) .verifyComplete(); } @@ -348,7 +348,7 @@ BindComplete.INSTANCE, NoData.INSTANCE, new CommandComplete("test", null, null), .bind("$1", 100) .execute() .as(StepVerifier::create) - .expectNextCount(2) // TODO: Decrease by 1 when https://github.com/reactor/reactor-core/issues/1033 + .expectNextCount(1) .verifyComplete(); } diff --git a/src/test/java/io/r2dbc/postgresql/PostgresqlBatchTest.java b/src/test/java/io/r2dbc/postgresql/PostgresqlBatchTest.java index e170ef90..1332bfa8 100644 --- a/src/test/java/io/r2dbc/postgresql/PostgresqlBatchTest.java +++ b/src/test/java/io/r2dbc/postgresql/PostgresqlBatchTest.java @@ -45,7 +45,7 @@ void add() { .add("test-query-2") .execute() .as(StepVerifier::create) - .expectNextCount(2) // TODO: Decrease by 1 when https://github.com/reactor/reactor-core/issues/1033 + .expectNextCount(1) .verifyComplete(); } @@ -83,7 +83,7 @@ void executeCommandComplete() { .add("test-query") .execute() .as(StepVerifier::create) - .expectNextCount(2) // TODO: Decrease by 1 when https://github.com/reactor/reactor-core/issues/1033 + .expectNextCount(1) .verifyComplete(); } @@ -97,7 +97,7 @@ void executeEmptyQueryResponse() { .add("test-query") .execute() .as(StepVerifier::create) - .expectNextCount(2) // TODO: Decrease by 1 when https://github.com/reactor/reactor-core/issues/1033 + .expectNextCount(1) .verifyComplete(); } @@ -111,7 +111,7 @@ void executeErrorResponse() { .add("test-query") .execute() .as(StepVerifier::create) - .expectNextCount(2) // TODO: Decrease by 1 when https://github.com/reactor/reactor-core/issues/1033 + .expectNextCount(1) .verifyComplete(); }