Polishing

Decouple options map creation. Return unmodifiable options map to prevent unwanted modifications. Add since tag.

[#271][resolves #272]

Author: mp911de

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

@@ -33,9 +33,10 @@
 import java.io.File;
 import java.time.Duration;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.HashMap;
 import java.util.ServiceLoader;
 import java.util.function.Function;
 import java.util.function.Supplier;
@@ -83,7 +84,8 @@ public final class PostgresqlConnectionConfiguration {
     private final SSLConfig sslConfig;
 
     private PostgresqlConnectionConfiguration(String applicationName, boolean autodetectExtensions,
-                                              @Nullable Duration connectTimeout, @Nullable String database, List<Extension> extensions, ToIntFunction<String> fetchSize, boolean forceBinary,
+                                              @Nullable Duration connectTimeout, @Nullable String database, List<Extension> extensions,
+                                              ToIntFunction<String> fetchSize, boolean forceBinary,
                                               @Nullable String host,
                                               @Nullable Map<String, String> options, @Nullable CharSequence password, int port, @Nullable String schema, @Nullable String socket, String username,
                                               SSLConfig sslConfig) {
@@ -95,29 +97,19 @@ private PostgresqlConnectionConfiguration(String applicationName, boolean autode
         this.fetchSize = fetchSize;
         this.forceBinary = forceBinary;
         this.host = host;
-        this.options = initOptions(options);
+        this.options = options == null ? new LinkedHashMap<>() : new LinkedHashMap<>(options);
+
+        if (schema != null && !schema.isEmpty()) {
+            this.options.put("search_path", schema);
+        }
+
         this.password = password;
         this.port = port;
-        addToOptions(schema);
         this.socket = socket;
         this.username = Assert.requireNonNull(username, "username must not be null");
         this.sslConfig = sslConfig;
     }
 
-    private Map<String, String> initOptions(@Nullable Map<String, String> options) {
-        if (options == null) {
-            return new HashMap<>();
-        } else {
-            return options;
-        }
-    }
-
-    private void addToOptions(String schema) {
-        if (schema != null && !schema.isEmpty()) {
-            options.put("search_path", schema);
-        }
-    }
-
     /**
      * Returns a new {@link Builder}.
      *
@@ -198,9 +190,8 @@ String getRequiredHost() {
         return host;
     }
 
-    @Nullable
     Map<String, String> getOptions() {
-        return this.options;
+        return Collections.unmodifiableMap(this.options);
     }
 
     @Nullable

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

@@ -44,7 +44,7 @@
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -128,13 +128,7 @@ public Mono<io.r2dbc.postgresql.api.PostgresqlConnection> create() {
      */
     public Mono<io.r2dbc.postgresql.api.PostgresqlReplicationConnection> replication() {
 
-        Map<String, String> options = this.configuration.getOptions();
-        if (options == null) {
-            options = new HashMap<>();
-        } else {
-            options = new HashMap<>(options);
-        }
-
+        Map<String, String> options = new LinkedHashMap<>(this.configuration.getOptions());
         options.put(REPLICATION_OPTION, REPLICATION_DATABASE);
 
         return doCreateConnection(true, options).map(DefaultPostgresqlReplicationConnection::new);
@@ -186,7 +180,7 @@ private Mono<PostgresqlConnection> doCreateConnection(boolean forReplication, @N
 
     private boolean isReplicationConnection() {
         Map<String, String> options = this.configuration.getOptions();
-        return options != null && REPLICATION_DATABASE.equalsIgnoreCase(options.get(REPLICATION_OPTION));
+        return REPLICATION_DATABASE.equalsIgnoreCase(options.get(REPLICATION_OPTION));
     }
 
     private Mono<Client> tryConnectWithConfig(SSLConfig sslConfig, @Nullable Map<String, String> options) {

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

@@ -78,6 +78,8 @@ public final class PostgresqlConnectionFactoryProvider implements ConnectionFact
 
     /**
      * Schema search path.
+     *
+     * @since 0.8.3
      */
     public static final Option<String> CURRENT_SCHEMA = Option.valueOf("currentSchema");
 
@@ -158,13 +160,13 @@ private static PostgresqlConnectionConfiguration createConfiguration(ConnectionF
             builder.host(connectionFactoryOptions.getRequiredValue(HOST));
         }
         builder.password(connectionFactoryOptions.getValue(PASSWORD));
-        
+
         if (connectionFactoryOptions.getValue(CURRENT_SCHEMA) != null) {
             builder.schema(connectionFactoryOptions.getValue(CURRENT_SCHEMA));
         } else {
             builder.schema(connectionFactoryOptions.getValue(SCHEMA));
         }
-        
+
         builder.username(connectionFactoryOptions.getRequiredValue(USER));
 
         Integer port = connectionFactoryOptions.getValue(PORT);