Polishing

Align parameter conversion with existing converter methods. Simplify tests.

[#273]

Author: mp911de

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

@@ -24,7 +24,7 @@
 import io.r2dbc.spi.Option;
 
 import javax.net.ssl.HostnameVerifier;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Locale;
 import java.util.Map;
 import java.util.function.Function;
@@ -188,15 +188,9 @@ private static PostgresqlConnectionConfiguration createConfiguration(ConnectionF
             builder.forceBinary(convertToBoolean(forceBinary));
         }
 
-        Option<Object> optionsAsObject = Option.valueOf("options");
-        Object optionsObject = connectionFactoryOptions.getValue(optionsAsObject);
-
-        Map<String, String> options = optionsObject instanceof String
-            ? mapOptionsFromUrlString((String) optionsObject)
-            : connectionFactoryOptions.getValue(OPTIONS);
-
+        Object options = connectionFactoryOptions.getValue(Option.valueOf("options"));
         if (options != null) {
-            builder.options(options);
+            builder.options(convertToMap(options));
         }
 
         if (tcp) {
@@ -281,15 +275,21 @@ private static int convertToInt(Object value) {
         return value instanceof Integer ? (int) value : Integer.parseInt(value.toString());
     }
 
-     private static Map<String, String> mapOptionsFromUrlString(String optionsString) {
-        Map<String, String> result = new HashMap<>();
-        for (String pair : optionsString.split(";")) {
-            String[] nameValue = pair.split("=");
-            if (nameValue.length != 2) {
-                throw new IllegalArgumentException(String.format("One of the options, provided via URL is not a valid name=value pair: %s", pair));
+    @SuppressWarnings("unchecked")
+    private static Map<String, String> convertToMap(Object options) {
+        if (options instanceof Map) {
+            return Map.class.cast(options);
+        }
+
+        Map<String, String> result = new LinkedHashMap<>();
+        for (String pair : options.toString().split(";")) {
+            String[] items = pair.split("=");
+            if (items.length != 2) {
+                throw new IllegalArgumentException(String.format("Provided options pair is not a valid name=value pair: %s", pair));
             }
-            result.put(nameValue[0], nameValue[1]);
+            result.put(items[0], items[1]);
         }
+
         return result;
     }
 }

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

@@ -22,7 +22,6 @@
 import io.r2dbc.spi.Option;
 import org.junit.jupiter.api.Test;
 
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -156,25 +155,25 @@ void shouldCreateConnectionFactoryWithoutPassword() {
     @Test
     void providerShouldConsiderFetchSize() {
         PostgresqlConnectionFactory factory = this.provider.create(builder()
-                .option(DRIVER, LEGACY_POSTGRESQL_DRIVER)
-                .option(HOST, "test-host")
-                .option(PASSWORD, "test-password")
-                .option(USER, "test-user")
-                .option(FETCH_SIZE, 100)
-                .build());
+            .option(DRIVER, LEGACY_POSTGRESQL_DRIVER)
+            .option(HOST, "test-host")
+            .option(PASSWORD, "test-password")
+            .option(USER, "test-user")
+            .option(FETCH_SIZE, 100)
+            .build());
 
         assertThat(factory.getConfiguration().getFetchSize().applyAsInt("")).isEqualTo(100);
     }
 
     @Test
     void providerShouldConsiderFetchSizeAsString() {
         PostgresqlConnectionFactory factory = this.provider.create(builder()
-                .option(DRIVER, LEGACY_POSTGRESQL_DRIVER)
-                .option(HOST, "test-host")
-                .option(PASSWORD, "test-password")
-                .option(USER, "test-user")
-                .option(Option.valueOf("fetchSize"), "100")
-                .build());
+            .option(DRIVER, LEGACY_POSTGRESQL_DRIVER)
+            .option(HOST, "test-host")
+            .option(PASSWORD, "test-password")
+            .option(USER, "test-user")
+            .option(Option.valueOf("fetchSize"), "100")
+            .build());
 
         assertThat(factory.getConfiguration().getFetchSize().applyAsInt("")).isEqualTo(100);
     }
@@ -279,7 +278,7 @@ void shouldConnectUsingUnixDomainSocket() {
 
     @Test
     void shouldParseOptionsProvidedAsString() {
-        final Option<String> options = Option.valueOf("options");
+        Option<String> options = Option.valueOf("options");
         PostgresqlConnectionFactory factory = this.provider.create(builder()
             .option(DRIVER, POSTGRESQL_DRIVER)
             .option(HOST, "test-host")
@@ -294,7 +293,7 @@ void shouldParseOptionsProvidedAsString() {
 
     @Test
     void shouldParseOptionsProvidedAsMap() {
-        final Option<Map<String, String>> options = Option.valueOf("options");
+        Option<Map<String, String>> options = Option.valueOf("options");
 
         Map<String, String> optionsMap = new HashMap<>();
         optionsMap.put("search_path", "public,private");