Polishing

[resolves pgjdbc#56][resolves pgjdbc#66]

Signed-off-by: Ben Hale <bhale@pivotal.io>

Author: nebhale

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

@@ -34,6 +34,8 @@ public final class PostgresqlConnectionConfiguration {
 
     private final String applicationName;
 
+    private final Duration connectTimeout;
+
     private final String database;
 
     private final String host;
@@ -46,18 +48,17 @@ public final class PostgresqlConnectionConfiguration {
 
     private final String username;
 
-    private final Duration connectTimeout;
+    private PostgresqlConnectionConfiguration(String applicationName, @Nullable Duration connectTimeout, @Nullable String database, String host, String password, int port, @Nullable String schema,
+                                              String username) {
 
-    private PostgresqlConnectionConfiguration(String applicationName, @Nullable String database, String host, String password, int port, @Nullable String schema, String username,
-                                              Duration connectTimeout) {
         this.applicationName = Assert.requireNonNull(applicationName, "applicationName must not be null");
+        this.connectTimeout = connectTimeout;
         this.database = database;
         this.host = Assert.requireNonNull(host, "host must not be null");
         this.password = Assert.requireNonNull(password, "password must not be null");
         this.port = port;
         this.schema = schema;
         this.username = Assert.requireNonNull(username, "username must not be null");
-        this.connectTimeout = connectTimeout;
     }
 
     /**
@@ -71,22 +72,27 @@ public static Builder builder() {
 
     @Override
     public String toString() {
-        return "PostgresConnectionConfiguration{" +
+        return "PostgresqlConnectionConfiguration{" +
             "applicationName='" + this.applicationName + '\'' +
+            ", connectTimeout=" + this.connectTimeout +
             ", database='" + this.database + '\'' +
             ", host='" + this.host + '\'' +
             ", password='" + this.password + '\'' +
             ", port=" + this.port +
             ", schema='" + this.schema + '\'' +
             ", username='" + this.username + '\'' +
-            ", connectTimeout='" + this.connectTimeout + '\'' +
             '}';
     }
 
     String getApplicationName() {
         return this.applicationName;
     }
 
+    @Nullable
+    Duration getConnectTimeout() {
+        return this.connectTimeout;
+    }
+
     @Nullable
     String getDatabase() {
         return this.database;
@@ -113,11 +119,6 @@ String getUsername() {
         return this.username;
     }
 
-    @Nullable
-    Duration getConnectTimeout() {
-        return this.connectTimeout;
-    }
-
     /**
      * A builder for {@link PostgresqlConnectionConfiguration} instances.
      * <p>
@@ -127,6 +128,8 @@ public static final class Builder {
 
         private String applicationName = "r2dbc-postgresql";
 
+        private Duration connectTimeout;
+
         private String database;
 
         private String host;
@@ -139,8 +142,6 @@ public static final class Builder {
 
         private String username;
 
-        private Duration connectTimeout;
-
         private Builder() {
         }
 
@@ -162,7 +163,12 @@ public Builder applicationName(String applicationName) {
          * @return a configured {@link PostgresqlConnectionConfiguration}
          */
         public PostgresqlConnectionConfiguration build() {
-            return new PostgresqlConnectionConfiguration(this.applicationName, this.database, this.host, this.password, this.port, this.schema, this.username, this.connectTimeout);
+            return new PostgresqlConnectionConfiguration(this.applicationName, this.connectTimeout, this.database, this.host, this.password, this.port, this.schema, this.username);
+        }
+
+        public Builder connectTimeout(@Nullable Duration connectTimeout) {
+            this.connectTimeout = connectTimeout;
+            return this;
         }
 
         /**
@@ -222,22 +228,17 @@ public Builder schema(@Nullable String schema) {
             return this;
         }
 
-        public Builder connectTimeout(@Nullable Duration connectTimeout) {
-            this.connectTimeout = connectTimeout;
-            return this;
-        }
-
         @Override
         public String toString() {
             return "Builder{" +
                 "applicationName='" + this.applicationName + '\'' +
+                ", connectTimeout='" + this.connectTimeout + '\'' +
                 ", database='" + this.database + '\'' +
                 ", host='" + this.host + '\'' +
                 ", password='" + this.password + '\'' +
                 ", port=" + this.port +
                 ", schema='" + this.schema + '\'' +
                 ", username='" + this.username + '\'' +
-                ", connectTimeout='" + this.connectTimeout + '\'' +
                 '}';
         }
 

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

@@ -59,13 +59,13 @@ public PostgresqlConnectionFactory create(ConnectionFactoryOptions connectionFac
             builder.applicationName(applicationName);
         }
 
+        builder.connectTimeout(connectionFactoryOptions.getValue(CONNECT_TIMEOUT));
         builder.database(connectionFactoryOptions.getValue(DATABASE));
         builder.host(connectionFactoryOptions.getRequiredValue(HOST));
         builder.password(connectionFactoryOptions.getRequiredValue(PASSWORD).toString());
         builder.port(connectionFactoryOptions.getRequiredValue(PORT));
         builder.schema(connectionFactoryOptions.getValue(SCHEMA));
         builder.username(connectionFactoryOptions.getRequiredValue(USER));
-        builder.connectTimeout(connectionFactoryOptions.getValue(CONNECT_TIMEOUT));
 
         return new PostgresqlConnectionFactory(builder.build());
     }

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

@@ -197,13 +197,13 @@ public static Mono<ReactorNettyClient> connect(String host, int port, @Nullable
      * @param connectTimeout     connect timeout
      * @throws IllegalArgumentException if {@code host} is {@code null}
      */
-    // TODO deal with growing argument list
     public static Mono<ReactorNettyClient> connect(ConnectionProvider connectionProvider, String host, int port, @Nullable Duration connectTimeout) {
         Assert.requireNonNull(connectionProvider, "connectionProvider must not be null");
         Assert.requireNonNull(host, "host must not be null");
 
         TcpClient tcpClient = TcpClient.create(connectionProvider)
             .host(host).port(port);
+
         if (connectTimeout != null) {
             tcpClient = tcpClient.option(ChannelOption.CONNECT_TIMEOUT_MILLIS, Math.toIntExact(connectTimeout.toMillis()));
         }

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

@@ -53,24 +53,24 @@ void builderNoUsername() {
     void configuration() {
         PostgresqlConnectionConfiguration configuration = PostgresqlConnectionConfiguration.builder()
             .applicationName("test-application-name")
+            .connectTimeout(Duration.ofMillis(1000))
             .database("test-database")
             .host("test-host")
             .password("test-password")
             .port(100)
             .schema("test-schema")
             .username("test-username")
-            .connectTimeout(Duration.ofMillis(1000))
             .build();
 
         assertThat(configuration)
             .hasFieldOrPropertyWithValue("applicationName", "test-application-name")
+            .hasFieldOrPropertyWithValue("connectTimeout", Duration.ofMillis(1000))
             .hasFieldOrPropertyWithValue("database", "test-database")
             .hasFieldOrPropertyWithValue("host", "test-host")
             .hasFieldOrPropertyWithValue("password", "test-password")
             .hasFieldOrPropertyWithValue("port", 100)
             .hasFieldOrPropertyWithValue("schema", "test-schema")
-            .hasFieldOrPropertyWithValue("username", "test-username")
-            .hasFieldOrPropertyWithValue("connectTimeout", Duration.ofMillis(1000));
+            .hasFieldOrPropertyWithValue("username", "test-username");
     }
 
     @Test