Refactoring

src/main/java/Main.java

@@ -1,11 +1,4 @@
-import data.source.PersonSource;
-import data.target.CharacterTarget;
-import etl.*;
-import migration.ThesisMigration;
 import org.apache.log4j.Logger;
-import utils.*;
-
-import java.util.*;
 
 public class Main
 {
@@ -17,56 +10,4 @@ public class Main
         new ThesisMigration().executeMigrations();
         log.info("------------- Migration Finished -------------");
     }
-
-    private static List<PersonSource> testExtract()
-    {
-        final var dbInfo = new DatabaseInformation("localhost", "sourcedb1", "test", "test", 25003);
-        final var connection = new ConnectionHelper(DatabaseType.MARIADB, dbInfo).createConnection();
-
-        final DataStorer<PersonSource> personSourceDataStorer = (rs) -> {
-            final var persons = new ArrayList<PersonSource>();
-            while (rs.next())
-            {
-                persons.add(new PersonSource(
-                        rs.getInt("personId"),
-                        rs.getString("name"),
-                        rs.getBoolean("mortal"))
-                );
-            }
-            return persons;
-        };
-
-        final StatementPreparerExtractor statementPreparer = (preparedStatement) -> {
-        };
-
-        final var sql = "select * from person;";
-
-        return new Extractor<>(connection, personSourceDataStorer, statementPreparer, sql).doExtract();
-    }
-
-    private static List<CharacterTarget> testTransform(final List<PersonSource> persons)
-    {
-        final DataTransformer<PersonSource, CharacterTarget> personTransformer =
-                (personSource) -> new CharacterTarget(personSource.getPersonId(),
-                personSource.getName(),
-                personSource.isMortal());
-
-        return new Transformer<>(personTransformer, persons).doTransform();
-    }
-
-    private static void testLoad(final List<CharacterTarget> transformedData)
-    {
-        final var dbInfo = new DatabaseInformation("localhost", "targetdb", "test", "test", 25001);
-        final var connection = new ConnectionHelper(DatabaseType.POSTGRESQL, dbInfo).createConnection();
-
-        final StatementPreparerLoader<CharacterTarget> statementPreparerLoader =  (preparedStatement, data) -> {
-            preparedStatement.setInt(1, data.getPersonId());
-            preparedStatement.setString(2, data.getName());
-            preparedStatement.setBoolean(3, data.isMortal());
-        };
-
-        final var sql = "insert into person values (?, ?, ?)";
-
-        new Loader<>(connection, statementPreparerLoader, transformedData, sql).doLoad();
-    }
 }

src/main/java/ThesisMigration.java

@@ -1,10 +1,9 @@
-package migration;
-
+import migration.*;
 import org.apache.log4j.Logger;
 import utils.ConnectionHelper;
 import utils.DatabaseInformation;
 import utils.DatabaseType;
-import utils.ETL;
+import etl.ETL;
 
 import java.sql.Connection;
 import java.sql.SQLException;

src/main/java/etl/ETL.java

@@ -1,4 +1,4 @@
-package utils;
+package etl;
 
 import data.SourceDataset;
 import data.TargetDataset;

src/main/java/migration/AbilityMigration.java

@@ -3,6 +3,7 @@ package migration;
 import com.mysql.cj.exceptions.NumberOutOfRange;
 import data.source.AbilitiesSource;
 import data.target.AbilityTarget;
+import etl.ETL;
 import etl.Extractor;
 import etl.Loader;
 import etl.Transformer;

src/main/java/migration/ActiveQuestsMigration.java

@@ -3,6 +3,7 @@ package migration;
 import com.mysql.cj.exceptions.NumberOutOfRange;
 import data.source.ActiveQuestsSource;
 import data.target.ActiveQuestsTarget;
+import etl.ETL;
 import etl.Extractor;
 import etl.Loader;
 import etl.Transformer;

src/main/java/migration/CharacterInventoryMigration.java

@@ -2,6 +2,7 @@ package migration;
 
 import data.source.PersonInventorySource;
 import data.target.CharacterInventoryTarget;
+import etl.ETL;
 import etl.Extractor;
 import etl.Loader;
 import etl.Transformer;

src/main/java/migration/CharacterMigration.java

@@ -2,6 +2,7 @@ package migration;
 
 import data.source.PersonSource;
 import data.target.CharacterTarget;
+import etl.ETL;
 import etl.Extractor;
 import etl.Loader;
 import etl.Transformer;

src/main/java/migration/GameobjectMigration.java

@@ -2,6 +2,7 @@ package migration;
 
 import data.source.GameobjectSource;
 import data.target.GameobjectTarget;
+import etl.ETL;
 import etl.Extractor;
 import etl.Loader;
 import etl.Transformer;

src/main/java/migration/InventoryMigration.java

@@ -2,6 +2,7 @@ package migration;
 
 import data.source.InventorySource;
 import data.target.InventoryTarget;
+import etl.ETL;
 import etl.Extractor;
 import etl.Loader;
 import etl.Transformer;

src/main/java/migration/ModMigration.java

@@ -2,6 +2,7 @@ package migration;
 
 import data.source.ModSource;
 import data.target.ModTarget;
+import etl.ETL;
 import etl.Extractor;
 import etl.Loader;
 import etl.Transformer;

src/main/java/migration/PlayerAbilitiesMigration.java

@@ -2,6 +2,7 @@ package migration;
 
 import data.source.PlayerAbilitiesSource;
 import data.target.PlayerAbilitiesTarget;
+import etl.ETL;
 import etl.Extractor;
 import etl.Loader;
 import etl.Transformer;
@@ -51,7 +52,6 @@ public class PlayerAbilitiesMigration extends ETL<PlayerAbilitiesSource, PlayerA
     @Override
     protected void load(final List<PlayerAbilitiesTarget> transformedData)
     {
-
         final StatementPreparerLoader<PlayerAbilitiesTarget> statementPreparerLoader =  (preparedStatement, data) -> {
             preparedStatement.setInt(1, data.getPlayerId());
             preparedStatement.setInt(2, data.getAbilityId());

src/main/java/migration/PlayerMigration.java

@@ -3,7 +3,7 @@ package migration;
 import data.SourceDataset;
 import data.target.PlayerTarget;
 import etl.Loader;
-import utils.ETL;
+import etl.ETL;
 import utils.StatementPreparerLoader;
 
 import java.sql.Connection;

src/main/java/migration/QuestMigration.java

@@ -1,8 +1,8 @@
 package migration;
 
-import com.mysql.cj.jdbc.Clob;
 import data.source.QuestSource;
 import data.target.QuestTarget;
+import etl.ETL;
 import etl.Extractor;
 import etl.Loader;
 import etl.Transformer;

src/main/java/migration/RelationshipMigration.java

@@ -3,6 +3,7 @@ package migration;
 import com.mysql.cj.exceptions.NumberOutOfRange;
 import data.source.RelationshipsSource;
 import data.target.RelationshipTarget;
+import etl.ETL;
 import etl.Extractor;
 import etl.Loader;
 import etl.Transformer;