Add sslMode option lowercase alias

For easier JDBC URL adaption [resolves pgjdbc#486]
ssttaarr · Apr 5, 2022 · 136e495 · 136e495
1 parent 9e152d6
commit 136e495
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 1 deletion.
diff --git a/src/main/java/io/r2dbc/postgresql/PostgresqlConnectionFactoryProvider.java b/src/main/java/io/r2dbc/postgresql/PostgresqlConnectionFactoryProvider.java
@@ -180,6 +180,11 @@ public final class PostgresqlConnectionFactoryProvider implements ConnectionFact
      */
     public static final Option<SSLMode> SSL_MODE = Option.valueOf("sslMode");
 
+    /**
+     * Ssl mode alias (JDBC style). Default: disabled
+     */
+    public static final Option<SSLMode> SSL_MODE_ALIAS = Option.valueOf("sslmode");
+
     /**
      * SSL key password
      */
@@ -301,7 +306,18 @@ private static void setupSsl(PostgresqlConnectionConfiguration.Builder builder,
 
             return (SSLMode) it;
 
-        }).to(builder::sslMode);
+        }).to(builder::sslMode).otherwise(() -> {
+
+            mapper.from(SSL_MODE_ALIAS).map(it -> {
+
+                if (it instanceof String) {
+                    return SSLMode.fromValue(it.toString());
+                }
+
+                return (SSLMode) it;
+
+            }).to(builder::sslMode);
+        });
 
         mapper.fromTyped(SSL_CERT).to(builder::sslCert);
         mapper.fromTyped(SSL_CONTEXT_BUILDER_CUSTOMIZER).to(builder::sslContextBuilderCustomizer);

diff --git a/src/test/java/io/r2dbc/postgresql/PostgresqlConnectionFactoryProviderUnitTests.java b/src/test/java/io/r2dbc/postgresql/PostgresqlConnectionFactoryProviderUnitTests.java
@@ -225,6 +225,21 @@ void supportsSslMode() {
         assertThat(sslConfig.getSslMode()).isEqualTo(SSLMode.DISABLE);
     }
 
+    @Test
+    void supportsSslModeAlias() {
+        PostgresqlConnectionFactory factory = this.provider.create(builder()
+            .option(DRIVER, POSTGRESQL_DRIVER)
+            .option(HOST, "test-host")
+            .option(PASSWORD, "test-password")
+            .option(USER, "test-user")
+            .option(Option.valueOf("sslmode"), "require")
+            .build());
+
+        SSLConfig sslConfig = factory.getConfiguration().getSslConfig();
+
+        assertThat(sslConfig.getSslMode()).isEqualTo(SSLMode.REQUIRE);
+    }
+
     @Test
     void shouldCreateConnectionFactoryWithoutPassword() {
         assertThat(this.provider.create(ConnectionFactoryOptions.builder()