Moved the database code to Spring JDBC & introduced maven failsafe to separate unit from integration tests.

Author: matthewhillier

pom.xml

@@ -91,6 +91,24 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>integration-test</id>
+                        <goals>
+                            <goal>integration-test</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>verify</id>
+                        <goals>
+                            <goal>verify</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
@@ -113,6 +131,16 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-jdbc</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.tomcat</groupId>
+                    <artifactId>tomcat-jdbc</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-log4j</artifactId>

src/main/java/com/ffxivcensus/gatherer/Gatherer.java

@@ -76,7 +76,8 @@ public PlayerBeanDAO getDao() {
         return dao;
     }
 
-    public void setPlayerBeanDAO(@Autowired final PlayerBeanDAO playerBeanDAO) {
+    @Autowired
+    public void setPlayerBeanDAO(final PlayerBeanDAO playerBeanDAO) {
         this.dao = playerBeanDAO;
     }
 

src/main/java/com/ffxivcensus/gatherer/GathererController.java

@@ -3,15 +3,12 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-import javax.sql.DataSource;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.ffxivcensus.gatherer.config.ApplicationConfig;
-import com.ffxivcensus.gatherer.player.PlayerBeanDAO;
 import com.ffxivcensus.gatherer.player.PlayerBuilder;
 
 /**
@@ -29,7 +26,6 @@ public class GathererController {
     private static final Logger LOG = LoggerFactory.getLogger(GathererController.class);
     private final ApplicationConfig appConfig;
     private final GathererFactory gathererFactory;
-    private DataSource dataSource;
     /**
      * List of playable realms (used when splitting tables).
      */
@@ -47,11 +43,9 @@ public class GathererController {
      * 
      * @param config Configuration Bean
      */
-    public GathererController(@Autowired final ApplicationConfig config, @Autowired final GathererFactory gathererFactory,
-                              @Autowired DataSource dataSource) {
+    public GathererController(@Autowired final ApplicationConfig config, @Autowired final GathererFactory gathererFactory) {
         this.appConfig = config;
         this.gathererFactory = gathererFactory;
-        this.dataSource = dataSource;
     }
 
     /**
@@ -126,7 +120,6 @@ private void gatherRange() {
 
         while(nextID <= appConfig.getEndId()) {
             Gatherer worker = gathererFactory.createGatherer();
-            worker.setPlayerBeanDAO(new PlayerBeanDAO(appConfig, dataSource));
             worker.setPlayerId(nextID);
             executor.execute(worker);