Merge pull request #2013 from schemacrawler/conn

Refactor database connection code

Author: sualeh

schemacrawler-tools/src/main/java/schemacrawler/tools/databaseconnector/EnvironmentalDatabaseConnectionSourceBuilder.java

@@ -34,33 +34,12 @@ public static DatabaseConnectionSourceBuilder builder(
     requireNonNull(envAccessor, "No environmental accessor provided");
 
     final DatabaseConnectionSourceBuilder dbConnectionSourceBuilder;
-    final String connectionUrl = envAccessor.getenv("SCHCRWLR_JDBC_URL");
+    final String connectionUrl = trimToEmpty(envAccessor.getenv("SCHCRWLR_JDBC_URL"));
 
-    if (isBlank(connectionUrl)) {
-      final String databaseSystemIdentifier = trimToEmpty(envAccessor.getenv("SCHCRWLR_SERVER"));
-
-      final DatabaseConnectorRegistry databaseConnectorRegistry =
-          DatabaseConnectorRegistry.getDatabaseConnectorRegistry();
-      final DatabaseConnector databaseConnector =
-          databaseConnectorRegistry.findDatabaseConnectorFromDatabaseSystemIdentifier(
-              databaseSystemIdentifier);
-
-      dbConnectionSourceBuilder = databaseConnector.databaseConnectionSourceBuilder();
-
-      final String host = trimToEmpty(envAccessor.getenv("SCHCRWLR_HOST"));
-      dbConnectionSourceBuilder.withHost(host);
-
-      final String port = trimToEmpty(envAccessor.getenv("SCHCRWLR_PORT"));
-      if (isValidPort(port)) {
-        dbConnectionSourceBuilder.withPort(Integer.valueOf(port));
-      }
-
-      final String database = trimToEmpty(envAccessor.getenv("SCHCRWLR_DATABASE"));
-      dbConnectionSourceBuilder.withDatabase(database);
+    if (!isBlank(connectionUrl)) {
+      dbConnectionSourceBuilder = builderFromUrl(connectionUrl);
     } else {
-      // This JDBC URL is not expected to have any substitutable parameters, so subsequent
-      // settings should not have any effect
-      dbConnectionSourceBuilder = DatabaseConnectionSourceBuilder.builder(connectionUrl);
+      dbConnectionSourceBuilder = builderForServer(envAccessor);
     }
 
     final UserCredentials userCredentials =
@@ -72,6 +51,50 @@ public static DatabaseConnectionSourceBuilder builder(
     return dbConnectionSourceBuilder;
   }
 
+  private static DatabaseConnectionSourceBuilder builderForServer(
+      final EnvironmentVariableAccessor envAccessor) {
+    final DatabaseConnectionSourceBuilder dbConnectionSourceBuilder;
+    final String databaseSystemIdentifier = trimToEmpty(envAccessor.getenv("SCHCRWLR_SERVER"));
+
+    final DatabaseConnectorRegistry databaseConnectorRegistry =
+        DatabaseConnectorRegistry.getDatabaseConnectorRegistry();
+    final DatabaseConnector databaseConnector =
+        databaseConnectorRegistry.findDatabaseConnectorFromDatabaseSystemIdentifier(
+            databaseSystemIdentifier);
+
+    dbConnectionSourceBuilder = databaseConnector.databaseConnectionSourceBuilder();
+
+    final String host = trimToEmpty(envAccessor.getenv("SCHCRWLR_HOST"));
+    dbConnectionSourceBuilder.withHost(host);
+
+    final String port = trimToEmpty(envAccessor.getenv("SCHCRWLR_PORT"));
+    if (isValidPort(port)) {
+      dbConnectionSourceBuilder.withPort(Integer.valueOf(port));
+    }
+
+    final String database = trimToEmpty(envAccessor.getenv("SCHCRWLR_DATABASE"));
+    dbConnectionSourceBuilder.withDatabase(database);
+
+    return dbConnectionSourceBuilder;
+  }
+
+  private static DatabaseConnectionSourceBuilder builderFromUrl(final String connectionUrl) {
+    final DatabaseConnectionSourceBuilder dbConnectionSourceBuilder;
+
+    // This JDBC URL is not expected to have any substitutable parameters, so subsequent
+    // settings should not have any effect
+    dbConnectionSourceBuilder = DatabaseConnectionSourceBuilder.builder(connectionUrl);
+
+    final DatabaseConnectorRegistry databaseConnectorRegistry =
+        DatabaseConnectorRegistry.getDatabaseConnectorRegistry();
+    DatabaseConnector databaseConnector =
+        databaseConnectorRegistry.findDatabaseConnectorFromUrl(connectionUrl);
+    dbConnectionSourceBuilder.withConnectionInitializer(
+        databaseConnector.databaseConnectionSourceBuilder().getConnectionInitializer());
+
+    return dbConnectionSourceBuilder;
+  }
+
   /**
    * Checks if a string is a valid numeric value.
    *