added workaround for cases when "options" have been provided via URL (and are represented by a String, not a Map)

added unit-tests and type checking (instead of catching ClassCastException)

[#273]

Author: Kirill Marchuk

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

@@ -24,6 +24,8 @@
 import io.r2dbc.spi.Option;
 
 import javax.net.ssl.HostnameVerifier;
+import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 import java.util.function.Function;
 
@@ -186,7 +188,13 @@ private static PostgresqlConnectionConfiguration createConfiguration(ConnectionF
             builder.forceBinary(convertToBoolean(forceBinary));
         }
 
-        Map<String, String> options = connectionFactoryOptions.getValue(OPTIONS);
+        Option<Object> optionsAsObject = Option.valueOf("options");
+        Object optionsObject = connectionFactoryOptions.getValue(optionsAsObject);
+
+        Map<String, String> options = optionsObject instanceof String
+            ? mapOptionsFromUrlString((String) optionsObject)
+            : connectionFactoryOptions.getValue(OPTIONS);
+
         if (options != null) {
             builder.options(options);
         }
@@ -272,4 +280,16 @@ private static boolean convertToBoolean(Object value) {
     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));
+            }
+            result.put(nameValue[0], nameValue[1]);
+        }
+        return result;
+    }
 }

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

@@ -22,6 +22,7 @@
 import io.r2dbc.spi.Option;
 import org.junit.jupiter.api.Test;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -276,4 +277,38 @@ void shouldConnectUsingUnixDomainSocket() {
         assertThat(factory.getConfiguration().getRequiredSocket()).isEqualTo("/tmp/.s.PGSQL.5432");
     }
 
+    @Test
+    void shouldParseOptionsProvidedAsString() {
+        final Option<String> options = Option.valueOf("options");
+        PostgresqlConnectionFactory factory = this.provider.create(builder()
+            .option(DRIVER, POSTGRESQL_DRIVER)
+            .option(HOST, "test-host")
+            .option(PASSWORD, "test-password")
+            .option(USER, "test-user")
+            .option(options, "search_path=public,private;default_tablespace=unknown")
+            .build());
+
+        assertThat(factory.getConfiguration().getOptions().get("search_path")).isEqualTo("public,private");
+        assertThat(factory.getConfiguration().getOptions().get("default_tablespace")).isEqualTo("unknown");
+    }
+
+    @Test
+    void shouldParseOptionsProvidedAsMap() {
+        final Option<Map<String, String>> options = Option.valueOf("options");
+
+        Map<String, String> optionsMap = new HashMap<>();
+        optionsMap.put("search_path", "public,private");
+        optionsMap.put("default_tablespace", "unknown");
+
+        PostgresqlConnectionFactory factory = this.provider.create(builder()
+            .option(DRIVER, POSTGRESQL_DRIVER)
+            .option(HOST, "test-host")
+            .option(PASSWORD, "test-password")
+            .option(USER, "test-user")
+            .option(options, optionsMap)
+            .build());
+
+        assertThat(factory.getConfiguration().getOptions().get("search_path")).isEqualTo("public,private");
+        assertThat(factory.getConfiguration().getOptions().get("default_tablespace")).isEqualTo("unknown");
+    }
 }