diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/SQLDB.java b/Plan/common/src/main/java/com/djrapitops/plan/db/SQLDB.java index e471a8e94..8e5175022 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/db/SQLDB.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/db/SQLDB.java @@ -22,10 +22,10 @@ import com.djrapitops.plan.data.store.containers.NetworkContainer; import com.djrapitops.plan.db.access.ExecStatement; import com.djrapitops.plan.db.access.Query; import com.djrapitops.plan.db.access.QueryStatement; -import com.djrapitops.plan.db.access.transactions.CleanTransaction; -import com.djrapitops.plan.db.access.transactions.CreateIndexTransaction; -import com.djrapitops.plan.db.access.transactions.CreateTablesTransaction; import com.djrapitops.plan.db.access.transactions.Transaction; +import com.djrapitops.plan.db.access.transactions.init.CleanTransaction; +import com.djrapitops.plan.db.access.transactions.init.CreateIndexTransaction; +import com.djrapitops.plan.db.access.transactions.init.CreateTablesTransaction; import com.djrapitops.plan.db.patches.*; import com.djrapitops.plan.db.sql.tables.*; import com.djrapitops.plan.db.tasks.PatchTask; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/CleanTransaction.java b/Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/init/CleanTransaction.java similarity index 97% rename from Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/CleanTransaction.java rename to Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/init/CleanTransaction.java index ac498a442..2f7cc3adc 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/CleanTransaction.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/init/CleanTransaction.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with Plan. If not, see . */ -package com.djrapitops.plan.db.access.transactions; +package com.djrapitops.plan.db.access.transactions.init; import com.djrapitops.plan.data.store.objects.DateObj; import com.djrapitops.plan.db.access.ExecStatement; @@ -22,6 +22,7 @@ import com.djrapitops.plan.db.access.Executable; import com.djrapitops.plan.db.access.Query; import com.djrapitops.plan.db.access.QueryStatement; import com.djrapitops.plan.db.access.queries.OptionalFetchQueries; +import com.djrapitops.plan.db.access.transactions.Transaction; import com.djrapitops.plan.db.access.transactions.commands.RemovePlayerTransaction; import com.djrapitops.plan.db.sql.tables.PingTable; import com.djrapitops.plan.db.sql.tables.SessionsTable; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/CreateIndexTransaction.java b/Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/init/CreateIndexTransaction.java similarity index 96% rename from Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/CreateIndexTransaction.java rename to Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/init/CreateIndexTransaction.java index 71419ab81..76e608ca4 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/CreateIndexTransaction.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/init/CreateIndexTransaction.java @@ -14,10 +14,11 @@ * You should have received a copy of the GNU Lesser General Public License * along with Plan. If not, see . */ -package com.djrapitops.plan.db.access.transactions; +package com.djrapitops.plan.db.access.transactions.init; import com.djrapitops.plan.db.DBType; import com.djrapitops.plan.db.access.queries.schema.MySQLSchemaQueries; +import com.djrapitops.plan.db.access.transactions.Transaction; import com.djrapitops.plan.db.sql.tables.*; import org.apache.commons.text.TextStringBuilder; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/CreateTablesTransaction.java b/Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/init/CreateTablesTransaction.java similarity index 97% rename from Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/CreateTablesTransaction.java rename to Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/init/CreateTablesTransaction.java index ad81c14ba..6a79cb206 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/CreateTablesTransaction.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/init/CreateTablesTransaction.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with Plan. If not, see . */ -package com.djrapitops.plan.db.access.transactions; +package com.djrapitops.plan.db.access.transactions.init; import com.djrapitops.plan.db.DBType; import com.djrapitops.plan.db.sql.tables.*; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/OperationCriticalTransaction.java b/Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/init/OperationCriticalTransaction.java similarity index 88% rename from Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/OperationCriticalTransaction.java rename to Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/init/OperationCriticalTransaction.java index 2d12ee717..f6626f999 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/OperationCriticalTransaction.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/init/OperationCriticalTransaction.java @@ -14,7 +14,9 @@ * You should have received a copy of the GNU Lesser General Public License * along with Plan. If not, see . */ -package com.djrapitops.plan.db.access.transactions; +package com.djrapitops.plan.db.access.transactions.init; + +import com.djrapitops.plan.db.access.transactions.Transaction; /** * Transaction that is required to be executed before a database is operable. diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/patches/Patch.java b/Plan/common/src/main/java/com/djrapitops/plan/db/patches/Patch.java index 038742a9d..e0142fb28 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/db/patches/Patch.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/db/patches/Patch.java @@ -22,7 +22,7 @@ import com.djrapitops.plan.db.SQLDB; import com.djrapitops.plan.db.access.queries.schema.H2SchemaQueries; import com.djrapitops.plan.db.access.queries.schema.MySQLSchemaQueries; import com.djrapitops.plan.db.access.queries.schema.SQLiteSchemaQueries; -import com.djrapitops.plan.db.access.transactions.OperationCriticalTransaction; +import com.djrapitops.plan.db.access.transactions.init.OperationCriticalTransaction; import com.djrapitops.plan.db.sql.parsing.TableSqlParser; import com.djrapitops.plugin.utilities.Verify; diff --git a/Plan/common/src/test/java/com/djrapitops/plan/db/CommonDBTest.java b/Plan/common/src/test/java/com/djrapitops/plan/db/CommonDBTest.java index 374c00d97..7c233d14a 100644 --- a/Plan/common/src/test/java/com/djrapitops/plan/db/CommonDBTest.java +++ b/Plan/common/src/test/java/com/djrapitops/plan/db/CommonDBTest.java @@ -34,12 +34,17 @@ import com.djrapitops.plan.db.access.Query; import com.djrapitops.plan.db.access.queries.*; import com.djrapitops.plan.db.access.queries.containers.ContainerFetchQueries; import com.djrapitops.plan.db.access.queries.objects.*; -import com.djrapitops.plan.db.access.transactions.*; +import com.djrapitops.plan.db.access.transactions.BackupCopyTransaction; +import com.djrapitops.plan.db.access.transactions.StoreConfigTransaction; +import com.djrapitops.plan.db.access.transactions.Transaction; import com.djrapitops.plan.db.access.transactions.commands.RegisterWebUserTransaction; import com.djrapitops.plan.db.access.transactions.commands.RemoveEverythingTransaction; import com.djrapitops.plan.db.access.transactions.commands.RemovePlayerTransaction; import com.djrapitops.plan.db.access.transactions.commands.RemoveWebUserTransaction; import com.djrapitops.plan.db.access.transactions.events.*; +import com.djrapitops.plan.db.access.transactions.init.CleanTransaction; +import com.djrapitops.plan.db.access.transactions.init.CreateIndexTransaction; +import com.djrapitops.plan.db.access.transactions.init.CreateTablesTransaction; import com.djrapitops.plan.db.patches.Patch; import com.djrapitops.plan.db.sql.tables.ServerTable; import com.djrapitops.plan.db.sql.tables.SessionsTable; diff --git a/Plan/common/src/test/java/com/djrapitops/plan/db/DBPatchH2RegressionTest.java b/Plan/common/src/test/java/com/djrapitops/plan/db/DBPatchH2RegressionTest.java index c975d39d0..23c69a621 100644 --- a/Plan/common/src/test/java/com/djrapitops/plan/db/DBPatchH2RegressionTest.java +++ b/Plan/common/src/test/java/com/djrapitops/plan/db/DBPatchH2RegressionTest.java @@ -20,9 +20,9 @@ import com.djrapitops.plan.api.exceptions.database.DBInitException; import com.djrapitops.plan.data.store.containers.ServerContainer; import com.djrapitops.plan.data.store.keys.ServerKeys; import com.djrapitops.plan.db.access.queries.containers.ContainerFetchQueries; -import com.djrapitops.plan.db.access.transactions.CreateTablesTransaction; import com.djrapitops.plan.db.access.transactions.Transaction; import com.djrapitops.plan.db.access.transactions.commands.RemoveEverythingTransaction; +import com.djrapitops.plan.db.access.transactions.init.CreateTablesTransaction; import com.djrapitops.plan.db.patches.Patch; import com.djrapitops.plan.system.settings.config.PlanConfig; import com.djrapitops.plan.system.settings.paths.DatabaseSettings; diff --git a/Plan/common/src/test/java/com/djrapitops/plan/db/DBPatchMySQLRegressionTest.java b/Plan/common/src/test/java/com/djrapitops/plan/db/DBPatchMySQLRegressionTest.java index 52f46c985..a34777574 100644 --- a/Plan/common/src/test/java/com/djrapitops/plan/db/DBPatchMySQLRegressionTest.java +++ b/Plan/common/src/test/java/com/djrapitops/plan/db/DBPatchMySQLRegressionTest.java @@ -21,9 +21,9 @@ import com.djrapitops.plan.api.exceptions.database.DBInitException; import com.djrapitops.plan.data.store.containers.ServerContainer; import com.djrapitops.plan.data.store.keys.ServerKeys; import com.djrapitops.plan.db.access.queries.containers.ContainerFetchQueries; -import com.djrapitops.plan.db.access.transactions.CreateTablesTransaction; import com.djrapitops.plan.db.access.transactions.Transaction; import com.djrapitops.plan.db.access.transactions.commands.RemoveEverythingTransaction; +import com.djrapitops.plan.db.access.transactions.init.CreateTablesTransaction; import com.djrapitops.plan.db.patches.Patch; import com.djrapitops.plan.system.PlanSystem; import com.djrapitops.plan.system.settings.config.PlanConfig; diff --git a/Plan/common/src/test/java/com/djrapitops/plan/db/DBPatchSQLiteRegressionTest.java b/Plan/common/src/test/java/com/djrapitops/plan/db/DBPatchSQLiteRegressionTest.java index 727108e45..10a8c5a3a 100644 --- a/Plan/common/src/test/java/com/djrapitops/plan/db/DBPatchSQLiteRegressionTest.java +++ b/Plan/common/src/test/java/com/djrapitops/plan/db/DBPatchSQLiteRegressionTest.java @@ -20,9 +20,9 @@ import com.djrapitops.plan.api.exceptions.database.DBInitException; import com.djrapitops.plan.data.store.containers.ServerContainer; import com.djrapitops.plan.data.store.keys.ServerKeys; import com.djrapitops.plan.db.access.queries.containers.ContainerFetchQueries; -import com.djrapitops.plan.db.access.transactions.CreateTablesTransaction; import com.djrapitops.plan.db.access.transactions.Transaction; import com.djrapitops.plan.db.access.transactions.commands.RemoveEverythingTransaction; +import com.djrapitops.plan.db.access.transactions.init.CreateTablesTransaction; import com.djrapitops.plan.db.patches.Patch; import org.junit.After; import org.junit.Before;