Polishing

[fixes #341][#373]

Author: mp911de

src/main/java/io/r2dbc/postgresql/ExtendedQueryPostgresqlStatement.java

@@ -59,7 +59,7 @@ final class ExtendedQueryPostgresqlStatement implements PostgresqlStatement {
     private String[] generatedColumns;
 
     ExtendedQueryPostgresqlStatement(ConnectionResources resources, String sql) {
-        this.resources = Assert.requireNonNull(resources, "context must not be null");
+        this.resources = Assert.requireNonNull(resources, "resources must not be null");
         this.connectionContext = resources.getClient().getContext();
         this.sql = Assert.requireNonNull(sql, "sql must not be null");
         this.bindings = new Bindings(expectedSize(sql));

src/main/java/io/r2dbc/postgresql/PostgresqlResult.java

@@ -43,9 +43,7 @@
  */
 final class PostgresqlResult extends AbstractReferenceCounted implements io.r2dbc.postgresql.api.PostgresqlResult {
 
-    private static final Predicate<BackendMessage> TAKE_UNTIL = or(CommandComplete.class::isInstance, EmptyQueryResponse.class::isInstance);
-
-    private final ConnectionResources context;
+    private final ConnectionResources resources;
 
     private final Flux<BackendMessage> messages;
 
@@ -55,10 +53,10 @@ final class PostgresqlResult extends AbstractReferenceCounted implements io.r2db
 
     private volatile RowDescription rowDescription;
 
-    private PostgresqlResult(ConnectionResources context, Flux<BackendMessage> messages, ExceptionFactory factory) {
-        this.context = context;
-        this.messages = messages;
-        this.factory = factory;
+    PostgresqlResult(ConnectionResources resources, Flux<BackendMessage> messages, ExceptionFactory factory) {
+        this.resources = Assert.requireNonNull(resources, "resources must not be null");
+        this.messages = Assert.requireNonNull(messages, "messages must not be null");
+        this.factory = Assert.requireNonNull(factory, "factory must not be null");
     }
 
     @Override
@@ -92,7 +90,7 @@ public Mono<Integer> getRowsUpdated() {
     public <T> Flux<T> map(BiFunction<Row, RowMetadata, ? extends T> f) {
         Assert.requireNonNull(f, "f must not be null");
 
-        return this.messages.takeUntil(TAKE_UNTIL)
+        return this.messages
             .handle((message, sink) -> {
 
                 try {
@@ -103,12 +101,12 @@ public <T> Flux<T> map(BiFunction<Row, RowMetadata, ? extends T> f) {
 
                     if (message instanceof RowDescription) {
                         this.rowDescription = (RowDescription) message;
-                        this.metadata = PostgresqlRowMetadata.toRowMetadata(this.context.getCodecs(), (RowDescription) message);
+                        this.metadata = PostgresqlRowMetadata.toRowMetadata(this.resources.getCodecs(), (RowDescription) message);
                         return;
                     }
 
                     if (message instanceof DataRow) {
-                        PostgresqlRow row = PostgresqlRow.toRow(this.context, (DataRow) message, this.rowDescription);
+                        PostgresqlRow row = PostgresqlRow.toRow(this.resources, (DataRow) message, this.rowDescription);
                         sink.next(f.apply(row, this.metadata));
                     }
 
@@ -133,13 +131,13 @@ public ReferenceCounted touch(Object hint) {
     @Override
     public String toString() {
         return "PostgresqlResult{" +
-            "context=" + this.context +
+            "context=" + this.resources +
             ", messages=" + this.messages +
             '}';
     }
 
-    static PostgresqlResult toResult(ConnectionResources context, Flux<BackendMessage> messages, ExceptionFactory factory) {
-        return new PostgresqlResult(context, messages, factory);
+    static PostgresqlResult toResult(ConnectionResources resources, Flux<BackendMessage> messages, ExceptionFactory factory) {
+        return new PostgresqlResult(resources, messages, factory);
     }
 
 }

src/main/java/io/r2dbc/postgresql/SimpleQueryPostgresqlStatement.java

@@ -55,7 +55,7 @@ final class SimpleQueryPostgresqlStatement implements PostgresqlStatement {
     private int fetchSize;
 
     SimpleQueryPostgresqlStatement(ConnectionResources resources, String sql) {
-        this.resources = Assert.requireNonNull(resources, "context must not be null");
+        this.resources = Assert.requireNonNull(resources, "resources must not be null");
         this.sql = Assert.requireNonNull(sql, "sql must not be null");
         fetchSize(isBatch() ? NO_LIMIT : this.resources.getConfiguration().getFetchSize(sql));
     }

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

@@ -143,9 +143,9 @@ void bindWrongIdentifierFormat() {
     }
 
     @Test
-    void constructorNoContext() {
+    void constructorNoResources() {
         assertThatIllegalArgumentException().isThrownBy(() -> new ExtendedQueryPostgresqlStatement(null, "test-query"))
-            .withMessage("context must not be null");
+            .withMessage("resources must not be null");
     }
 
     @Test

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

@@ -26,6 +26,8 @@
 
 import java.util.Collections;
 
+import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
+
 /**
  * Unit tests for {@link PostgresqlResult}.
  */
@@ -58,6 +60,18 @@ void toResultEmptyQueryResponse() {
             .verifyComplete();
     }
 
+    @Test
+    void toResultNoContext() {
+        assertThatIllegalArgumentException().isThrownBy(() -> PostgresqlResult.toResult(null, Flux.empty(), ExceptionFactory.INSTANCE))
+            .withMessage("resources must not be null");
+    }
+
+    @Test
+    void toResultNoMessages() {
+        assertThatIllegalArgumentException().isThrownBy(() -> PostgresqlResult.toResult(MockContext.empty(), null, ExceptionFactory.INSTANCE))
+            .withMessage("messages must not be null");
+    }
+
     @Test
     void toResultRowDescriptionRowsUpdated() {
         PostgresqlResult result = PostgresqlResult.toResult(MockContext.empty(), Flux.just(new RowDescription(Collections.emptyList()), new DataRow(), new CommandComplete

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

@@ -106,9 +106,9 @@ void fetchSizeWithOneQuery() {
     }
 
     @Test
-    void constructorNoContext() {
+    void constructorNoResources() {
         assertThatIllegalArgumentException().isThrownBy(() -> new SimpleQueryPostgresqlStatement(null, "test-query"))
-            .withMessage("context must not be null");
+            .withMessage("resources must not be null");
     }
 
     @Test