2 files changed, 10 insertions, 6 deletions
diff --git a/src/main/Analyzor.java b/src/main/Analyzor.java
index 2589e66..b2aad4d 100644
--- a/src/main/Analyzor.java
+++ b/src/main/Analyzor.java
@@ -2,6 +2,7 @@ package main;
 
 import database.BrandAnalyzerInserter;
 import database.BrandAnalyzerQueue;
+import database.ConnectionBuilder;
 import database.NamedPreparedStatement;
 import database.QueryUtils;
 import java.io.File;
@@ -53,12 +54,16 @@ public class Analyzor {
      * The persistent connection to the database.
      */
     private final Connection connection;
+    private final ConnectionBuilder connBuilder;
 
     /**
-     * @param connection An open connection to the database.
+     * @param connBuilder A builder for new database connections.
+     * @throws java.sql.SQLException On failure to set up a new connection.
      */
-    public Analyzor(Connection connection) {
-        this.connection = connection;
+    public Analyzor(ConnectionBuilder connBuilder) throws SQLException {
+        // instantiate a default connection
+        this.connection = connBuilder.create();
+        this.connBuilder = connBuilder;
     }
 
     /**
@@ -301,7 +306,7 @@ public class Analyzor {
         tweetResults = statement.executeQuery();
 
         BrandAnalyzerQueue analyzer = new BrandAnalyzerQueue(tweetResults);
-        BrandAnalyzerInserter inserter = new BrandAnalyzerInserter(connection, analyzer);
+        BrandAnalyzerInserter inserter = new BrandAnalyzerInserter(connBuilder.create(), analyzer);
 
         ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(3);
         // producer
diff --git a/src/main/FarmShell.java b/src/main/FarmShell.java
index 525d342..d624a71 100644
--- a/src/main/FarmShell.java
+++ b/src/main/FarmShell.java
@@ -32,8 +32,7 @@ public class FarmShell {
 
     private Analyzor getAnalyzor() throws SQLException {
         if (cached_analyzor == null) {
-            Connection dbCon = dbConnectionBuilder.create();
-            cached_analyzor = new Analyzor(dbCon);
+            cached_analyzor = new Analyzor(dbConnectionBuilder);
         }
         return cached_analyzor;
     }