Merge branch '1-californium'

pgjdbc · Jun 21, 2018 · 0ab72c5 · 0ab72c5
2 parents 514b7a1 + ec1299f
commit 0ab72c5
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ Artifacts can bound found at the following repositories.
 <repository>
     <id>spring-snapshots</id>
     <name>Spring Snapshots</name>
-    <url>http://repo.spring.io/snapshot</url>
+    <url>https://repo.spring.io/snapshot</url>
     <snapshots>
         <enabled>true</enabled>
     </snapshots>
@@ -36,7 +36,7 @@ Artifacts can bound found at the following repositories.
 <repository>
     <id>spring-milestones</id>
     <name>Spring Milestones</name>
-    <url>http://repo.spring.io/milestone</url>
+    <url>https://repo.spring.io/milestone</url>
     <snapshots>
         <enabled>false</enabled>
     </snapshots>

diff --git a/pom.xml b/pom.xml
@@ -42,7 +42,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <r2dbc-spi.version>1.0.0.BUILD-SNAPSHOT</r2dbc-spi.version>
-        <reactor.version>Bismuth-SR10</reactor.version>
+        <reactor.version>Californium-BUILD-SNAPSHOT</reactor.version>
         <slf4j.version>1.7.25</slf4j.version>
         <spring-boot.version>2.0.2.RELEASE</spring-boot.version>
     </properties>
@@ -231,23 +231,23 @@
         <repository>
             <id>spring-milestones</id>
             <name>Spring Milestones</name>
-            <url>http://repo.spring.io/milestone</url>
+            <url>https://repo.spring.io/milestone</url>
             <snapshots>
                 <enabled>false</enabled>
             </snapshots>
         </repository>
         <repository>
             <id>spring-releases</id>
             <name>Spring Releases</name>
-            <url>http://repo.spring.io/release</url>
+            <url>https://repo.spring.io/release</url>
             <snapshots>
                 <enabled>false</enabled>
             </snapshots>
         </repository>
         <repository>
             <id>spring-snapshots</id>
             <name>Spring Snapshots</name>
-            <url>http://repo.spring.io/snapshot</url>
+            <url>https://repo.spring.io/snapshot</url>
             <snapshots>
                 <enabled>true</enabled>
             </snapshots>

diff --git 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
@@ -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
@@ -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();
     }