From 213cb6ad2da84e7066d15bf577406fac7488e8eb Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@vmware.com>
Date: Wed, 6 Apr 2022 14:07:15 +0200
Subject: [PATCH] Polishing.

[#486][resolves #504]

Signed-off-by: Mark Paluch <mpaluch@vmware.com>
---
 .../PostgresqlConnectionFactoryProvider.java  | 31 +++++++------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/src/main/java/io/r2dbc/postgresql/PostgresqlConnectionFactoryProvider.java b/src/main/java/io/r2dbc/postgresql/PostgresqlConnectionFactoryProvider.java
index b2578bae..633002d9 100644
--- a/src/main/java/io/r2dbc/postgresql/PostgresqlConnectionFactoryProvider.java
+++ b/src/main/java/io/r2dbc/postgresql/PostgresqlConnectionFactoryProvider.java
@@ -182,6 +182,8 @@ public final class PostgresqlConnectionFactoryProvider implements ConnectionFact
 
     /**
      * Ssl mode alias (JDBC style). Default: disabled
+     *
+     * @since 0.9.2
      */
     public static final Option<SSLMode> SSL_MODE_ALIAS = Option.valueOf("sslmode");
 
@@ -298,25 +300,8 @@ private static void setupSsl(PostgresqlConnectionConfiguration.Builder builder,
             }
         });
 
-        mapper.from(SSL_MODE).map(it -> {
-
-            if (it instanceof String) {
-                return SSLMode.fromValue(it.toString());
-            }
-
-            return (SSLMode) it;
-
-        }).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.from(SSL_MODE).map(PostgresqlConnectionFactoryProvider::toSSLMode).to(builder::sslMode).otherwise(() -> {
+            mapper.from(SSL_MODE_ALIAS).map(PostgresqlConnectionFactoryProvider::toSSLMode).to(builder::sslMode);
         });
 
         mapper.fromTyped(SSL_CERT).to(builder::sslCert);
@@ -343,6 +328,14 @@ private static void setupSsl(PostgresqlConnectionConfiguration.Builder builder,
         }).to(builder::sslHostnameVerifier);
     }
 
+    private static SSLMode toSSLMode(Object it) {
+        if (it instanceof String) {
+            return SSLMode.fromValue(it.toString());
+        }
+
+        return (SSLMode) it;
+    }
+
     @SuppressWarnings("unchecked")
     private static Map<String, String> convertToMap(Object options) {
         if (options instanceof Map) {