Refactoring in ConnectionFactory

peter-gergely-horvath · Aug 6, 2017 · 3a4cf60 · 3a4cf60
1 parent ac5d356
commit 3a4cf60
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 17 deletions.
diff --git a/src/main/java/com/github/dyna4jdbc/ConnectionFactory.java b/src/main/java/com/github/dyna4jdbc/ConnectionFactory.java
@@ -83,25 +83,57 @@ Hence, we intentionally and knowingly catch all Throwables (including
         }
     }
 
+    protected Connection newConnection(String connectionTypeName, String config, Properties properties)
+            throws Exception {
 
-    protected Connection newConnection(String connectionType, String config, Properties properties) throws Exception {
+        ConnectionType connectionType = ConnectionType.getByName(connectionTypeName);
 
-        switch (connectionType) {
-            case "process-runner":
-                return new ProcessRunnerConnection(config, properties);
+        return connectionType.newConnection(config, properties);
 
+    }
 
-            case "scriptengine":
+    private enum ConnectionType {
+        SCRIPTENGINE("scriptengine") {
+            @Override
+            protected Connection newConnection(String config, Properties properties)
+                    throws MisconfigurationException, SQLException {
                 return new ScriptEngineConnection(config, properties);
+            }
+        },
+        PROCESS_RUNNER("process-runner") {
+            @Override
+            protected Connection newConnection(String config, Properties properties)
+                    throws MisconfigurationException, SQLException {
+                return new ProcessRunnerConnection(config, properties);
+            }
+        },
+        NODE_JS("nodejs") {
+            @Override
+            protected Connection newConnection(String config, Properties properties)
+                    throws MisconfigurationException, SQLException {
+                return new NodeJsConnection(config, properties);
+            }
+        };
 
+        private final String publicName;
 
-            case "nodejs":
-                return new NodeJsConnection(config, properties);
+        ConnectionType(String publicName) {
+            this.publicName = publicName;
+        }
 
+        private static ConnectionType getByName(String requestedPublicName) throws MisconfigurationException {
+            for (ConnectionType ct : ConnectionType.values()) {
+                if (ct.publicName.equals(requestedPublicName)) {
+                    return ct;
+                }
+            }
 
-            default:
-                throw MisconfigurationException.forMessage("No such connection type: '%s'", connectionType);
+            throw MisconfigurationException.forMessage("No such connection type: '%s'", requestedPublicName);
         }
+
+
+        protected abstract Connection newConnection(String config, Properties properties)
+                throws MisconfigurationException, SQLException;
     }
 
 }
diff --git a/src/test/java/com/github/dyna4jdbc/ConnectionFactoryTest.java b/src/test/java/com/github/dyna4jdbc/ConnectionFactoryTest.java
@@ -38,9 +38,9 @@ public void testConnectionFactorySplitsConfigurationCorrectly() throws SQLExcept
 
         ConnectionFactory mockConnectionFactory = new ConnectionFactory() {
             @Override
-            protected Connection newConnection(String connectionType, String config, Properties properties) throws Exception {
+            protected Connection newConnection(String connectionTypeName, String config, Properties properties) throws Exception {
 
-                assertEquals(connectionType, "foo");
+                assertEquals(connectionTypeName, "foo");
 
                 assertEquals(config, "bar:baz");
 
@@ -61,9 +61,9 @@ public void testConnectionFactoryPassesNullWhenColonIsPresent() throws SQLExcept
 
         ConnectionFactory mockConnectionFactory = new ConnectionFactory() {
             @Override
-            protected Connection newConnection(String connectionType, String config, Properties properties) throws Exception {
+            protected Connection newConnection(String connectionTypeName, String config, Properties properties) throws Exception {
 
-                assertEquals(connectionType, "foo");
+                assertEquals(connectionTypeName, "foo");
 
                 assertEquals(config, null);
 
@@ -84,9 +84,9 @@ public void testConnectionFactoryPassesEmptyStringWhenColonIsPresent() throws SQ
 
         ConnectionFactory mockConnectionFactory = new ConnectionFactory() {
             @Override
-            protected Connection newConnection(String connectionType, String config, Properties properties) throws Exception {
+            protected Connection newConnection(String connectionTypeName, String config, Properties properties) throws Exception {
 
-                assertEquals(connectionType, "foo");
+                assertEquals(connectionTypeName, "foo");
 
                 assertEquals(config, "");
 
@@ -107,9 +107,9 @@ public void testConnectionFactoryConvertsToLowerCase() throws SQLException {
 
         ConnectionFactory mockConnectionFactory = new ConnectionFactory() {
             @Override
-            protected Connection newConnection(String connectionType, String config, Properties properties) throws Exception {
+            protected Connection newConnection(String connectionTypeName, String config, Properties properties) throws Exception {
 
-                assertEquals(connectionType, "foobar");
+                assertEquals(connectionTypeName, "foobar");
 
                 assertEquals(config, "");