From b1eec2993fb3a3f246fcf2d6bde2d25a056d019d Mon Sep 17 00:00:00 2001 From: Rsl1122 Date: Fri, 18 Jan 2019 17:11:40 +0200 Subject: [PATCH] Moved db tasks and patches to new package --- .../src/main/java/com/djrapitops/plan/db/H2DB.java | 2 +- .../src/main/java/com/djrapitops/plan/db/SQLDB.java | 6 +++--- .../main/java/com/djrapitops/plan/db/SQLiteDB.java | 2 +- .../patches/BadAFKThresholdValuePatch.java | 2 +- .../databases/sql => db}/patches/DiskUsagePatch.java | 2 +- .../sql => db}/patches/GeoInfoLastUsedPatch.java | 2 +- .../sql => db}/patches/GeoInfoOptimizationPatch.java | 2 +- .../databases/sql => db}/patches/IPAnonPatch.java | 2 +- .../databases/sql => db}/patches/IPHashPatch.java | 2 +- .../sql => db}/patches/KillsOptimizationPatch.java | 2 +- .../sql => db}/patches/KillsServerIDPatch.java | 2 +- .../sql => db}/patches/NicknameLastSeenPatch.java | 2 +- .../patches/NicknamesOptimizationPatch.java | 2 +- .../database/databases/sql => db}/patches/Patch.java | 2 +- .../sql => db}/patches/PingOptimizationPatch.java | 2 +- .../sql => db}/patches/SessionAFKTimePatch.java | 2 +- .../patches/SessionsOptimizationPatch.java | 2 +- .../patches/TransferTableRemovalPatch.java | 2 +- .../patches/UserInfoOptimizationPatch.java | 2 +- .../databases/sql => db}/patches/Version10Patch.java | 2 +- .../sql => db}/patches/VersionTableRemovalPatch.java | 2 +- .../patches/WorldTimesOptimizationPatch.java | 2 +- .../sql => db}/patches/WorldTimesSeverIDPatch.java | 2 +- .../sql => db}/patches/WorldsOptimizationPatch.java | 2 +- .../sql => db}/patches/WorldsServerIDPatch.java | 2 +- .../databases/sql => db/tasks}/CreateIndexTask.java | 2 +- .../databases/sql => db/tasks}/KeepAliveTask.java | 2 +- .../databases/sql => db/tasks}/PatchTask.java | 4 ++-- .../database/databases/sql/tables/GeoInfoTable.java | 11 ++++++----- .../database/databases/sql/tables/KillsTable.java | 9 ++++++--- .../databases/sql/tables/NicknamesTable.java | 9 ++++++--- .../database/databases/sql/tables/PingTable.java | 3 ++- .../database/databases/sql/tables/SessionsTable.java | 9 ++++++--- .../database/databases/sql/tables/UserInfoTable.java | 6 ++++-- .../database/databases/sql/tables/WorldTable.java | 9 ++++++--- .../databases/sql/tables/WorldTimesTable.java | 12 ++++++++---- .../java/com/djrapitops/plan/db/CommonDBTest.java | 4 ++-- .../djrapitops/plan/db/DBPatchH2RegressionTest.java | 2 +- .../plan/db/DBPatchMySQLRegressionTest.java | 2 +- .../djrapitops/plan/db/DBPatchRegressionTest.java | 2 +- .../plan/db/DBPatchSQLiteRegressionTest.java | 2 +- 41 files changed, 81 insertions(+), 61 deletions(-) rename Plan/common/src/main/java/com/djrapitops/plan/{system/database/databases/sql => db}/patches/BadAFKThresholdValuePatch.java (97%) rename Plan/common/src/main/java/com/djrapitops/plan/{system/database/databases/sql => db}/patches/DiskUsagePatch.java (94%) rename Plan/common/src/main/java/com/djrapitops/plan/{system/database/databases/sql => db}/patches/GeoInfoLastUsedPatch.java (95%) rename Plan/common/src/main/java/com/djrapitops/plan/{system/database/databases/sql => db}/patches/GeoInfoOptimizationPatch.java (97%) rename Plan/common/src/main/java/com/djrapitops/plan/{system/database/databases/sql => db}/patches/IPAnonPatch.java (98%) rename Plan/common/src/main/java/com/djrapitops/plan/{system/database/databases/sql => db}/patches/IPHashPatch.java (94%) rename Plan/common/src/main/java/com/djrapitops/plan/{system/database/databases/sql => db}/patches/KillsOptimizationPatch.java (97%) rename Plan/common/src/main/java/com/djrapitops/plan/{system/database/databases/sql => db}/patches/KillsServerIDPatch.java (97%) rename Plan/common/src/main/java/com/djrapitops/plan/{system/database/databases/sql => db}/patches/NicknameLastSeenPatch.java (98%) rename Plan/common/src/main/java/com/djrapitops/plan/{system/database/databases/sql => db}/patches/NicknamesOptimizationPatch.java (97%) rename Plan/common/src/main/java/com/djrapitops/plan/{system/database/databases/sql => db}/patches/Patch.java (99%) rename Plan/common/src/main/java/com/djrapitops/plan/{system/database/databases/sql => db}/patches/PingOptimizationPatch.java (97%) rename Plan/common/src/main/java/com/djrapitops/plan/{system/database/databases/sql => db}/patches/SessionAFKTimePatch.java (95%) rename Plan/common/src/main/java/com/djrapitops/plan/{system/database/databases/sql => db}/patches/SessionsOptimizationPatch.java (97%) rename Plan/common/src/main/java/com/djrapitops/plan/{system/database/databases/sql => db}/patches/TransferTableRemovalPatch.java (94%) rename Plan/common/src/main/java/com/djrapitops/plan/{system/database/databases/sql => db}/patches/UserInfoOptimizationPatch.java (97%) rename Plan/common/src/main/java/com/djrapitops/plan/{system/database/databases/sql => db}/patches/Version10Patch.java (98%) rename Plan/common/src/main/java/com/djrapitops/plan/{system/database/databases/sql => db}/patches/VersionTableRemovalPatch.java (94%) rename Plan/common/src/main/java/com/djrapitops/plan/{system/database/databases/sql => db}/patches/WorldTimesOptimizationPatch.java (97%) rename Plan/common/src/main/java/com/djrapitops/plan/{system/database/databases/sql => db}/patches/WorldTimesSeverIDPatch.java (97%) rename Plan/common/src/main/java/com/djrapitops/plan/{system/database/databases/sql => db}/patches/WorldsOptimizationPatch.java (97%) rename Plan/common/src/main/java/com/djrapitops/plan/{system/database/databases/sql => db}/patches/WorldsServerIDPatch.java (99%) rename Plan/common/src/main/java/com/djrapitops/plan/{system/database/databases/sql => db/tasks}/CreateIndexTask.java (98%) rename Plan/common/src/main/java/com/djrapitops/plan/{system/database/databases/sql => db/tasks}/KeepAliveTask.java (97%) rename Plan/common/src/main/java/com/djrapitops/plan/{system/database/databases/sql => db/tasks}/PatchTask.java (95%) diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/H2DB.java b/Plan/common/src/main/java/com/djrapitops/plan/db/H2DB.java index a8489e873..0f688edcc 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/db/H2DB.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/db/H2DB.java @@ -18,7 +18,7 @@ package com.djrapitops.plan.db; import com.djrapitops.plan.api.exceptions.database.DBInitException; import com.djrapitops.plan.data.store.containers.NetworkContainer; -import com.djrapitops.plan.system.database.databases.sql.KeepAliveTask; +import com.djrapitops.plan.db.tasks.KeepAliveTask; import com.djrapitops.plan.system.file.PlanFiles; import com.djrapitops.plan.system.info.server.ServerInfo; import com.djrapitops.plan.system.locale.Locale; 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 22ab2a544..3e3364632 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 @@ -19,11 +19,11 @@ package com.djrapitops.plan.db; import com.djrapitops.plan.api.exceptions.database.DBInitException; import com.djrapitops.plan.api.exceptions.database.DBOpException; import com.djrapitops.plan.data.store.containers.NetworkContainer; +import com.djrapitops.plan.db.patches.*; +import com.djrapitops.plan.db.tasks.CreateIndexTask; +import com.djrapitops.plan.db.tasks.PatchTask; import com.djrapitops.plan.system.database.databases.operation.*; -import com.djrapitops.plan.system.database.databases.sql.CreateIndexTask; -import com.djrapitops.plan.system.database.databases.sql.PatchTask; import com.djrapitops.plan.system.database.databases.sql.operation.*; -import com.djrapitops.plan.system.database.databases.sql.patches.*; import com.djrapitops.plan.system.database.databases.sql.processing.ExecStatement; import com.djrapitops.plan.system.database.databases.sql.processing.QueryStatement; import com.djrapitops.plan.system.database.databases.sql.tables.*; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/SQLiteDB.java b/Plan/common/src/main/java/com/djrapitops/plan/db/SQLiteDB.java index 3d186032f..bbd659d36 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/db/SQLiteDB.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/db/SQLiteDB.java @@ -18,7 +18,7 @@ package com.djrapitops.plan.db; import com.djrapitops.plan.api.exceptions.database.DBInitException; import com.djrapitops.plan.data.store.containers.NetworkContainer; -import com.djrapitops.plan.system.database.databases.sql.KeepAliveTask; +import com.djrapitops.plan.db.tasks.KeepAliveTask; import com.djrapitops.plan.system.file.PlanFiles; import com.djrapitops.plan.system.info.server.ServerInfo; import com.djrapitops.plan.system.locale.Locale; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/BadAFKThresholdValuePatch.java b/Plan/common/src/main/java/com/djrapitops/plan/db/patches/BadAFKThresholdValuePatch.java similarity index 97% rename from Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/BadAFKThresholdValuePatch.java rename to Plan/common/src/main/java/com/djrapitops/plan/db/patches/BadAFKThresholdValuePatch.java index e2ef484b1..9ab7c28de 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/BadAFKThresholdValuePatch.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/db/patches/BadAFKThresholdValuePatch.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.system.database.databases.sql.patches; +package com.djrapitops.plan.db.patches; import com.djrapitops.plan.db.SQLDB; import com.djrapitops.plan.system.database.databases.sql.processing.QueryAllStatement; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/DiskUsagePatch.java b/Plan/common/src/main/java/com/djrapitops/plan/db/patches/DiskUsagePatch.java similarity index 94% rename from Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/DiskUsagePatch.java rename to Plan/common/src/main/java/com/djrapitops/plan/db/patches/DiskUsagePatch.java index 5ba63692b..6e2a48b27 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/DiskUsagePatch.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/db/patches/DiskUsagePatch.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.system.database.databases.sql.patches; +package com.djrapitops.plan.db.patches; import com.djrapitops.plan.db.SQLDB; import com.djrapitops.plan.system.database.databases.sql.tables.TPSTable; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/GeoInfoLastUsedPatch.java b/Plan/common/src/main/java/com/djrapitops/plan/db/patches/GeoInfoLastUsedPatch.java similarity index 95% rename from Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/GeoInfoLastUsedPatch.java rename to Plan/common/src/main/java/com/djrapitops/plan/db/patches/GeoInfoLastUsedPatch.java index 2f41f3f13..b9905f049 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/GeoInfoLastUsedPatch.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/db/patches/GeoInfoLastUsedPatch.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.system.database.databases.sql.patches; +package com.djrapitops.plan.db.patches; import com.djrapitops.plan.db.SQLDB; import com.djrapitops.plan.system.database.databases.sql.tables.GeoInfoTable; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/GeoInfoOptimizationPatch.java b/Plan/common/src/main/java/com/djrapitops/plan/db/patches/GeoInfoOptimizationPatch.java similarity index 97% rename from Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/GeoInfoOptimizationPatch.java rename to Plan/common/src/main/java/com/djrapitops/plan/db/patches/GeoInfoOptimizationPatch.java index 957832ca2..baed7fb36 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/GeoInfoOptimizationPatch.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/db/patches/GeoInfoOptimizationPatch.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.system.database.databases.sql.patches; +package com.djrapitops.plan.db.patches; import com.djrapitops.plan.api.exceptions.database.DBOpException; import com.djrapitops.plan.db.SQLDB; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/IPAnonPatch.java b/Plan/common/src/main/java/com/djrapitops/plan/db/patches/IPAnonPatch.java similarity index 98% rename from Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/IPAnonPatch.java rename to Plan/common/src/main/java/com/djrapitops/plan/db/patches/IPAnonPatch.java index 4aefd9a4a..89cfea518 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/IPAnonPatch.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/db/patches/IPAnonPatch.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.system.database.databases.sql.patches; +package com.djrapitops.plan.db.patches; import com.djrapitops.plan.api.exceptions.database.DBInitException; import com.djrapitops.plan.api.exceptions.database.DBOpException; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/IPHashPatch.java b/Plan/common/src/main/java/com/djrapitops/plan/db/patches/IPHashPatch.java similarity index 94% rename from Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/IPHashPatch.java rename to Plan/common/src/main/java/com/djrapitops/plan/db/patches/IPHashPatch.java index da79f4cb0..fca10fc1a 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/IPHashPatch.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/db/patches/IPHashPatch.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.system.database.databases.sql.patches; +package com.djrapitops.plan.db.patches; import com.djrapitops.plan.db.SQLDB; import com.djrapitops.plan.system.database.databases.sql.tables.GeoInfoTable; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/KillsOptimizationPatch.java b/Plan/common/src/main/java/com/djrapitops/plan/db/patches/KillsOptimizationPatch.java similarity index 97% rename from Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/KillsOptimizationPatch.java rename to Plan/common/src/main/java/com/djrapitops/plan/db/patches/KillsOptimizationPatch.java index 13435795a..c9f1b9913 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/KillsOptimizationPatch.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/db/patches/KillsOptimizationPatch.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.system.database.databases.sql.patches; +package com.djrapitops.plan.db.patches; import com.djrapitops.plan.api.exceptions.database.DBOpException; import com.djrapitops.plan.db.SQLDB; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/KillsServerIDPatch.java b/Plan/common/src/main/java/com/djrapitops/plan/db/patches/KillsServerIDPatch.java similarity index 97% rename from Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/KillsServerIDPatch.java rename to Plan/common/src/main/java/com/djrapitops/plan/db/patches/KillsServerIDPatch.java index c8f396532..d7a3b7ab5 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/KillsServerIDPatch.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/db/patches/KillsServerIDPatch.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.system.database.databases.sql.patches; +package com.djrapitops.plan.db.patches; import com.djrapitops.plan.db.SQLDB; import com.djrapitops.plan.system.database.databases.sql.processing.ExecStatement; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/NicknameLastSeenPatch.java b/Plan/common/src/main/java/com/djrapitops/plan/db/patches/NicknameLastSeenPatch.java similarity index 98% rename from Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/NicknameLastSeenPatch.java rename to Plan/common/src/main/java/com/djrapitops/plan/db/patches/NicknameLastSeenPatch.java index ca8926d2a..efcefb244 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/NicknameLastSeenPatch.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/db/patches/NicknameLastSeenPatch.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.system.database.databases.sql.patches; +package com.djrapitops.plan.db.patches; import com.djrapitops.plan.data.store.objects.Nickname; import com.djrapitops.plan.db.SQLDB; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/NicknamesOptimizationPatch.java b/Plan/common/src/main/java/com/djrapitops/plan/db/patches/NicknamesOptimizationPatch.java similarity index 97% rename from Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/NicknamesOptimizationPatch.java rename to Plan/common/src/main/java/com/djrapitops/plan/db/patches/NicknamesOptimizationPatch.java index 080ee5fd4..55d932b1d 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/NicknamesOptimizationPatch.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/db/patches/NicknamesOptimizationPatch.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.system.database.databases.sql.patches; +package com.djrapitops.plan.db.patches; import com.djrapitops.plan.api.exceptions.database.DBOpException; import com.djrapitops.plan.db.SQLDB; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/Patch.java b/Plan/common/src/main/java/com/djrapitops/plan/db/patches/Patch.java similarity index 99% rename from Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/Patch.java rename to Plan/common/src/main/java/com/djrapitops/plan/db/patches/Patch.java index c0bbcc777..9d6edbbed 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/Patch.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/db/patches/Patch.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.system.database.databases.sql.patches; +package com.djrapitops.plan.db.patches; import com.djrapitops.plan.api.exceptions.database.DBOpException; import com.djrapitops.plan.db.DBType; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/PingOptimizationPatch.java b/Plan/common/src/main/java/com/djrapitops/plan/db/patches/PingOptimizationPatch.java similarity index 97% rename from Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/PingOptimizationPatch.java rename to Plan/common/src/main/java/com/djrapitops/plan/db/patches/PingOptimizationPatch.java index 94435b831..e6590504c 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/PingOptimizationPatch.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/db/patches/PingOptimizationPatch.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.system.database.databases.sql.patches; +package com.djrapitops.plan.db.patches; import com.djrapitops.plan.api.exceptions.database.DBOpException; import com.djrapitops.plan.db.SQLDB; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/SessionAFKTimePatch.java b/Plan/common/src/main/java/com/djrapitops/plan/db/patches/SessionAFKTimePatch.java similarity index 95% rename from Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/SessionAFKTimePatch.java rename to Plan/common/src/main/java/com/djrapitops/plan/db/patches/SessionAFKTimePatch.java index 6295c30d3..efa870857 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/SessionAFKTimePatch.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/db/patches/SessionAFKTimePatch.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.system.database.databases.sql.patches; +package com.djrapitops.plan.db.patches; import com.djrapitops.plan.db.SQLDB; import com.djrapitops.plan.system.database.databases.sql.tables.SessionsTable; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/SessionsOptimizationPatch.java b/Plan/common/src/main/java/com/djrapitops/plan/db/patches/SessionsOptimizationPatch.java similarity index 97% rename from Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/SessionsOptimizationPatch.java rename to Plan/common/src/main/java/com/djrapitops/plan/db/patches/SessionsOptimizationPatch.java index db0712a39..1b7ef5eae 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/SessionsOptimizationPatch.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/db/patches/SessionsOptimizationPatch.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.system.database.databases.sql.patches; +package com.djrapitops.plan.db.patches; import com.djrapitops.plan.api.exceptions.database.DBOpException; import com.djrapitops.plan.db.SQLDB; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/TransferTableRemovalPatch.java b/Plan/common/src/main/java/com/djrapitops/plan/db/patches/TransferTableRemovalPatch.java similarity index 94% rename from Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/TransferTableRemovalPatch.java rename to Plan/common/src/main/java/com/djrapitops/plan/db/patches/TransferTableRemovalPatch.java index 1014d7a5a..2c038c077 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/TransferTableRemovalPatch.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/db/patches/TransferTableRemovalPatch.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.system.database.databases.sql.patches; +package com.djrapitops.plan.db.patches; import com.djrapitops.plan.db.SQLDB; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/UserInfoOptimizationPatch.java b/Plan/common/src/main/java/com/djrapitops/plan/db/patches/UserInfoOptimizationPatch.java similarity index 97% rename from Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/UserInfoOptimizationPatch.java rename to Plan/common/src/main/java/com/djrapitops/plan/db/patches/UserInfoOptimizationPatch.java index cb86baa15..60688060d 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/UserInfoOptimizationPatch.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/db/patches/UserInfoOptimizationPatch.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.system.database.databases.sql.patches; +package com.djrapitops.plan.db.patches; import com.djrapitops.plan.api.exceptions.database.DBOpException; import com.djrapitops.plan.db.SQLDB; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/Version10Patch.java b/Plan/common/src/main/java/com/djrapitops/plan/db/patches/Version10Patch.java similarity index 98% rename from Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/Version10Patch.java rename to Plan/common/src/main/java/com/djrapitops/plan/db/patches/Version10Patch.java index b1b4fe0b8..8c6f5415f 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/Version10Patch.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/db/patches/Version10Patch.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.system.database.databases.sql.patches; +package com.djrapitops.plan.db.patches; import com.djrapitops.plan.api.exceptions.database.DBInitException; import com.djrapitops.plan.api.exceptions.database.DBOpException; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/VersionTableRemovalPatch.java b/Plan/common/src/main/java/com/djrapitops/plan/db/patches/VersionTableRemovalPatch.java similarity index 94% rename from Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/VersionTableRemovalPatch.java rename to Plan/common/src/main/java/com/djrapitops/plan/db/patches/VersionTableRemovalPatch.java index 8c5d0750e..e48cb9dca 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/VersionTableRemovalPatch.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/db/patches/VersionTableRemovalPatch.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.system.database.databases.sql.patches; +package com.djrapitops.plan.db.patches; import com.djrapitops.plan.db.SQLDB; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/WorldTimesOptimizationPatch.java b/Plan/common/src/main/java/com/djrapitops/plan/db/patches/WorldTimesOptimizationPatch.java similarity index 97% rename from Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/WorldTimesOptimizationPatch.java rename to Plan/common/src/main/java/com/djrapitops/plan/db/patches/WorldTimesOptimizationPatch.java index 69cb1723e..47da20b41 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/WorldTimesOptimizationPatch.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/db/patches/WorldTimesOptimizationPatch.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.system.database.databases.sql.patches; +package com.djrapitops.plan.db.patches; import com.djrapitops.plan.api.exceptions.database.DBOpException; import com.djrapitops.plan.db.SQLDB; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/WorldTimesSeverIDPatch.java b/Plan/common/src/main/java/com/djrapitops/plan/db/patches/WorldTimesSeverIDPatch.java similarity index 97% rename from Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/WorldTimesSeverIDPatch.java rename to Plan/common/src/main/java/com/djrapitops/plan/db/patches/WorldTimesSeverIDPatch.java index a89aa73d9..84a893b0f 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/WorldTimesSeverIDPatch.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/db/patches/WorldTimesSeverIDPatch.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.system.database.databases.sql.patches; +package com.djrapitops.plan.db.patches; import com.djrapitops.plan.db.SQLDB; import com.djrapitops.plan.system.database.databases.sql.processing.ExecStatement; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/WorldsOptimizationPatch.java b/Plan/common/src/main/java/com/djrapitops/plan/db/patches/WorldsOptimizationPatch.java similarity index 97% rename from Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/WorldsOptimizationPatch.java rename to Plan/common/src/main/java/com/djrapitops/plan/db/patches/WorldsOptimizationPatch.java index c81929714..e2ae790de 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/WorldsOptimizationPatch.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/db/patches/WorldsOptimizationPatch.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.system.database.databases.sql.patches; +package com.djrapitops.plan.db.patches; import com.djrapitops.plan.api.exceptions.database.DBOpException; import com.djrapitops.plan.db.SQLDB; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/WorldsServerIDPatch.java b/Plan/common/src/main/java/com/djrapitops/plan/db/patches/WorldsServerIDPatch.java similarity index 99% rename from Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/WorldsServerIDPatch.java rename to Plan/common/src/main/java/com/djrapitops/plan/db/patches/WorldsServerIDPatch.java index 364aca35c..5b1b03bee 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/WorldsServerIDPatch.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/db/patches/WorldsServerIDPatch.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.system.database.databases.sql.patches; +package com.djrapitops.plan.db.patches; import com.djrapitops.plan.db.SQLDB; import com.djrapitops.plan.system.database.databases.sql.processing.ExecStatement; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/CreateIndexTask.java b/Plan/common/src/main/java/com/djrapitops/plan/db/tasks/CreateIndexTask.java similarity index 98% rename from Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/CreateIndexTask.java rename to Plan/common/src/main/java/com/djrapitops/plan/db/tasks/CreateIndexTask.java index 128edfc44..bcee068ee 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/CreateIndexTask.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/db/tasks/CreateIndexTask.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.system.database.databases.sql; +package com.djrapitops.plan.db.tasks; import com.djrapitops.plan.db.DBType; import com.djrapitops.plan.db.SQLDB; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/KeepAliveTask.java b/Plan/common/src/main/java/com/djrapitops/plan/db/tasks/KeepAliveTask.java similarity index 97% rename from Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/KeepAliveTask.java rename to Plan/common/src/main/java/com/djrapitops/plan/db/tasks/KeepAliveTask.java index 14e334eb4..d7da6e779 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/KeepAliveTask.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/db/tasks/KeepAliveTask.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.system.database.databases.sql; +package com.djrapitops.plan.db.tasks; import com.djrapitops.plan.utilities.MiscUtils; import com.djrapitops.plugin.logging.L; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/PatchTask.java b/Plan/common/src/main/java/com/djrapitops/plan/db/tasks/PatchTask.java similarity index 95% rename from Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/PatchTask.java rename to Plan/common/src/main/java/com/djrapitops/plan/db/tasks/PatchTask.java index 09552649d..697dadfcb 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/PatchTask.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/db/tasks/PatchTask.java @@ -14,9 +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.system.database.databases.sql; +package com.djrapitops.plan.db.tasks; -import com.djrapitops.plan.system.database.databases.sql.patches.Patch; +import com.djrapitops.plan.db.patches.Patch; import com.djrapitops.plan.system.locale.Locale; import com.djrapitops.plan.system.locale.lang.PluginLang; import com.djrapitops.plugin.logging.L; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/GeoInfoTable.java b/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/GeoInfoTable.java index 5517b8014..118db416f 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/GeoInfoTable.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/GeoInfoTable.java @@ -19,6 +19,7 @@ package com.djrapitops.plan.system.database.databases.sql.tables; import com.djrapitops.plan.api.exceptions.database.DBInitException; import com.djrapitops.plan.data.container.GeoInfo; import com.djrapitops.plan.db.SQLDB; +import com.djrapitops.plan.db.patches.*; import com.djrapitops.plan.system.database.databases.sql.processing.ExecStatement; import com.djrapitops.plan.system.database.databases.sql.processing.QueryAllStatement; import com.djrapitops.plan.system.database.databases.sql.processing.QueryStatement; @@ -40,11 +41,11 @@ import java.util.*; * Table Name: plan_ips *

* Patches related to this table: - * {@link com.djrapitops.plan.system.database.databases.sql.patches.Version10Patch} - * {@link com.djrapitops.plan.system.database.databases.sql.patches.GeoInfoLastUsedPatch} - * {@link com.djrapitops.plan.system.database.databases.sql.patches.IPAnonPatch} - * {@link com.djrapitops.plan.system.database.databases.sql.patches.IPHashPatch} - * {@link com.djrapitops.plan.system.database.databases.sql.patches.GeoInfoOptimizationPatch} + * {@link Version10Patch} + * {@link GeoInfoLastUsedPatch} + * {@link IPAnonPatch} + * {@link IPHashPatch} + * {@link GeoInfoOptimizationPatch} * * @author Rsl1122 */ diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/KillsTable.java b/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/KillsTable.java index 1366648de..a556ef9f2 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/KillsTable.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/KillsTable.java @@ -22,6 +22,9 @@ import com.djrapitops.plan.data.container.PlayerKill; import com.djrapitops.plan.data.container.Session; import com.djrapitops.plan.data.store.keys.SessionKeys; import com.djrapitops.plan.db.SQLDB; +import com.djrapitops.plan.db.patches.KillsOptimizationPatch; +import com.djrapitops.plan.db.patches.KillsServerIDPatch; +import com.djrapitops.plan.db.patches.Version10Patch; import com.djrapitops.plan.system.database.databases.sql.processing.ExecStatement; import com.djrapitops.plan.system.database.databases.sql.processing.QueryAllStatement; import com.djrapitops.plan.system.database.databases.sql.processing.QueryStatement; @@ -41,9 +44,9 @@ import java.util.*; * Table Name: plan_kills *

* Patches related to this table: - * {@link com.djrapitops.plan.system.database.databases.sql.patches.Version10Patch} - * {@link com.djrapitops.plan.system.database.databases.sql.patches.KillsServerIDPatch} - * {@link com.djrapitops.plan.system.database.databases.sql.patches.KillsOptimizationPatch} + * {@link Version10Patch} + * {@link KillsServerIDPatch} + * {@link KillsOptimizationPatch} * * @author Rsl1122 */ diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/NicknamesTable.java b/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/NicknamesTable.java index 9827f776f..e00868ced 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/NicknamesTable.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/NicknamesTable.java @@ -19,6 +19,9 @@ package com.djrapitops.plan.system.database.databases.sql.tables; import com.djrapitops.plan.api.exceptions.database.DBInitException; import com.djrapitops.plan.data.store.objects.Nickname; import com.djrapitops.plan.db.SQLDB; +import com.djrapitops.plan.db.patches.NicknameLastSeenPatch; +import com.djrapitops.plan.db.patches.NicknamesOptimizationPatch; +import com.djrapitops.plan.db.patches.Version10Patch; import com.djrapitops.plan.system.database.databases.sql.processing.ExecStatement; import com.djrapitops.plan.system.database.databases.sql.processing.QueryAllStatement; import com.djrapitops.plan.system.database.databases.sql.processing.QueryStatement; @@ -38,9 +41,9 @@ import java.util.*; * Table Name: plan_nicknames *

* Patches related to this table: - * {@link com.djrapitops.plan.system.database.databases.sql.patches.Version10Patch} - * {@link com.djrapitops.plan.system.database.databases.sql.patches.NicknameLastSeenPatch} - * {@link com.djrapitops.plan.system.database.databases.sql.patches.NicknamesOptimizationPatch} + * {@link Version10Patch} + * {@link NicknameLastSeenPatch} + * {@link NicknamesOptimizationPatch} * * @author Rsl1122 */ diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/PingTable.java b/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/PingTable.java index 9b8d5d734..1ea0d0479 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/PingTable.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/PingTable.java @@ -19,6 +19,7 @@ package com.djrapitops.plan.system.database.databases.sql.tables; import com.djrapitops.plan.api.exceptions.database.DBInitException; import com.djrapitops.plan.data.container.Ping; import com.djrapitops.plan.db.SQLDB; +import com.djrapitops.plan.db.patches.PingOptimizationPatch; import com.djrapitops.plan.system.database.databases.sql.processing.ExecStatement; import com.djrapitops.plan.system.database.databases.sql.processing.QueryAllStatement; import com.djrapitops.plan.system.database.databases.sql.processing.QueryStatement; @@ -36,7 +37,7 @@ import java.util.*; * Table that represents plan_ping in the database. *

* Patches related to this table: - * {@link com.djrapitops.plan.system.database.databases.sql.patches.PingOptimizationPatch} + * {@link PingOptimizationPatch} * * @author Rsl1122 */ diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/SessionsTable.java b/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/SessionsTable.java index 78f61d077..665334d7d 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/SessionsTable.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/SessionsTable.java @@ -20,6 +20,9 @@ import com.djrapitops.plan.api.exceptions.database.DBInitException; import com.djrapitops.plan.data.container.Session; import com.djrapitops.plan.data.store.keys.SessionKeys; import com.djrapitops.plan.db.SQLDB; +import com.djrapitops.plan.db.patches.SessionAFKTimePatch; +import com.djrapitops.plan.db.patches.SessionsOptimizationPatch; +import com.djrapitops.plan.db.patches.Version10Patch; import com.djrapitops.plan.system.database.databases.sql.processing.ExecStatement; import com.djrapitops.plan.system.database.databases.sql.processing.QueryAllStatement; import com.djrapitops.plan.system.database.databases.sql.processing.QueryStatement; @@ -40,9 +43,9 @@ import java.util.stream.Collectors; * Table that represents plan_sessions. * * Patches related to this table: - * {@link com.djrapitops.plan.system.database.databases.sql.patches.Version10Patch} - * {@link com.djrapitops.plan.system.database.databases.sql.patches.SessionAFKTimePatch} - * {@link com.djrapitops.plan.system.database.databases.sql.patches.SessionsOptimizationPatch} + * {@link Version10Patch} + * {@link SessionAFKTimePatch} + * {@link SessionsOptimizationPatch} * * @author Rsl1122 */ diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/UserInfoTable.java b/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/UserInfoTable.java index 1bdbde935..79d3b923c 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/UserInfoTable.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/UserInfoTable.java @@ -19,6 +19,8 @@ package com.djrapitops.plan.system.database.databases.sql.tables; import com.djrapitops.plan.api.exceptions.database.DBInitException; import com.djrapitops.plan.data.container.UserInfo; import com.djrapitops.plan.db.SQLDB; +import com.djrapitops.plan.db.patches.UserInfoOptimizationPatch; +import com.djrapitops.plan.db.patches.Version10Patch; import com.djrapitops.plan.system.database.databases.sql.processing.ExecStatement; import com.djrapitops.plan.system.database.databases.sql.processing.QueryAllStatement; import com.djrapitops.plan.system.database.databases.sql.processing.QueryStatement; @@ -37,8 +39,8 @@ import java.util.*; * Table Name: plan_user_info *

* Patches related to this table: - * {@link com.djrapitops.plan.system.database.databases.sql.patches.Version10Patch} - * {@link com.djrapitops.plan.system.database.databases.sql.patches.UserInfoOptimizationPatch} + * {@link Version10Patch} + * {@link UserInfoOptimizationPatch} * * @author Rsl1122 */ diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/WorldTable.java b/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/WorldTable.java index 44cc4238c..20eb33481 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/WorldTable.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/WorldTable.java @@ -18,6 +18,9 @@ package com.djrapitops.plan.system.database.databases.sql.tables; import com.djrapitops.plan.api.exceptions.database.DBInitException; import com.djrapitops.plan.db.SQLDB; +import com.djrapitops.plan.db.patches.Version10Patch; +import com.djrapitops.plan.db.patches.WorldsOptimizationPatch; +import com.djrapitops.plan.db.patches.WorldsServerIDPatch; import com.djrapitops.plan.system.database.databases.sql.processing.ExecStatement; import com.djrapitops.plan.system.database.databases.sql.processing.QueryAllStatement; import com.djrapitops.plan.system.database.databases.sql.processing.QueryStatement; @@ -37,9 +40,9 @@ import java.util.*; * Used for storing id references to world names. *

* Patches related to this table: - * {@link com.djrapitops.plan.system.database.databases.sql.patches.Version10Patch} - * {@link com.djrapitops.plan.system.database.databases.sql.patches.WorldsServerIDPatch} - * {@link com.djrapitops.plan.system.database.databases.sql.patches.WorldsOptimizationPatch} + * {@link Version10Patch} + * {@link WorldsServerIDPatch} + * {@link WorldsOptimizationPatch} * * @author Rsl1122 / Database version 7 */ diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/WorldTimesTable.java b/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/WorldTimesTable.java index 4e04471c5..3c83fee6b 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/WorldTimesTable.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/WorldTimesTable.java @@ -22,6 +22,10 @@ import com.djrapitops.plan.data.store.keys.SessionKeys; import com.djrapitops.plan.data.time.GMTimes; import com.djrapitops.plan.data.time.WorldTimes; import com.djrapitops.plan.db.SQLDB; +import com.djrapitops.plan.db.patches.Version10Patch; +import com.djrapitops.plan.db.patches.WorldTimesOptimizationPatch; +import com.djrapitops.plan.db.patches.WorldTimesSeverIDPatch; +import com.djrapitops.plan.db.patches.WorldsServerIDPatch; import com.djrapitops.plan.system.database.databases.sql.processing.ExecStatement; import com.djrapitops.plan.system.database.databases.sql.processing.QueryAllStatement; import com.djrapitops.plan.system.database.databases.sql.processing.QueryStatement; @@ -44,10 +48,10 @@ import java.util.stream.Collectors; * For contained columns {@link Col} *

* Patches related to this table: - * {@link com.djrapitops.plan.system.database.databases.sql.patches.Version10Patch} - * {@link com.djrapitops.plan.system.database.databases.sql.patches.WorldTimesSeverIDPatch} - * {@link com.djrapitops.plan.system.database.databases.sql.patches.WorldsServerIDPatch} - * {@link com.djrapitops.plan.system.database.databases.sql.patches.WorldTimesOptimizationPatch} + * {@link Version10Patch} + * {@link WorldTimesSeverIDPatch} + * {@link WorldsServerIDPatch} + * {@link WorldTimesOptimizationPatch} * * @author Rsl1122 */ 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 1d3803865..a96e16db4 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 @@ -28,10 +28,10 @@ import com.djrapitops.plan.data.store.keys.*; import com.djrapitops.plan.data.store.objects.Nickname; import com.djrapitops.plan.data.time.GMTimes; import com.djrapitops.plan.data.time.WorldTimes; +import com.djrapitops.plan.db.patches.Patch; +import com.djrapitops.plan.db.tasks.CreateIndexTask; import com.djrapitops.plan.system.PlanSystem; import com.djrapitops.plan.system.database.DBSystem; -import com.djrapitops.plan.system.database.databases.sql.CreateIndexTask; -import com.djrapitops.plan.system.database.databases.sql.patches.Patch; import com.djrapitops.plan.system.database.databases.sql.tables.*; import com.djrapitops.plan.system.info.server.Server; import com.djrapitops.plan.system.settings.config.Config; 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 75171ab94..25c905b8f 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 @@ -19,7 +19,7 @@ package com.djrapitops.plan.db; 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.system.database.databases.sql.PatchTask; +import com.djrapitops.plan.db.tasks.PatchTask; import com.djrapitops.plan.system.locale.Locale; 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 312663a31..a8ea3b449 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 @@ -20,8 +20,8 @@ import com.djrapitops.plan.api.exceptions.EnableException; 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.tasks.PatchTask; import com.djrapitops.plan.system.PlanSystem; -import com.djrapitops.plan.system.database.databases.sql.PatchTask; import com.djrapitops.plan.system.locale.Locale; 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/DBPatchRegressionTest.java b/Plan/common/src/test/java/com/djrapitops/plan/db/DBPatchRegressionTest.java index 64d11e24e..785d13cb6 100644 --- a/Plan/common/src/test/java/com/djrapitops/plan/db/DBPatchRegressionTest.java +++ b/Plan/common/src/test/java/com/djrapitops/plan/db/DBPatchRegressionTest.java @@ -16,7 +16,7 @@ */ package com.djrapitops.plan.db; -import com.djrapitops.plan.system.database.databases.sql.patches.Patch; +import com.djrapitops.plan.db.patches.Patch; import utilities.TestConstants; import java.util.ArrayList; 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 31b48c115..64d3f5d47 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 @@ -19,7 +19,7 @@ package com.djrapitops.plan.db; 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.system.database.databases.sql.PatchTask; +import com.djrapitops.plan.db.tasks.PatchTask; import com.djrapitops.plan.system.locale.Locale; import com.djrapitops.plugin.logging.L; import com.djrapitops.plugin.logging.console.TestPluginLogger;