From 012b61c21da40ae8c13ef5f65ee83fd3fca73693 Mon Sep 17 00:00:00 2001 From: Aurora Lahtela <24460436+AuroraLS3@users.noreply.github.com> Date: Sat, 21 Oct 2023 18:18:31 +0300 Subject: [PATCH] Reorganize some packages - webserver.resolver.json - database.sql.tables - database.transactions --- .../plan/delivery/web/ResolverSvc.java | 4 ++-- .../resolver/json/RootJSONResolver.java | 7 ++++-- .../{ => metadata}/LocaleJSONResolver.java | 2 +- .../{ => metadata}/MetadataJSONResolver.java | 2 +- .../NetworkMetadataJSONResolver.java | 2 +- .../ServerIdentityJSONResolver.java | 2 +- .../StorePreferencesJSONResolver.java | 2 +- .../{ => metadata}/VersionJSONResolver.java | 2 +- .../{ => metadata}/WhoAmIJSONResolver.java | 2 +- .../{ => plugins}/ExtensionJSONResolver.java | 3 ++- .../json/{ => query}/FiltersJSONResolver.java | 2 +- .../json/{ => query}/QueryJSONResolver.java | 2 +- .../WebGroupDeleteJSONResolver.java | 4 ++-- .../{ => webgroup}/WebGroupJSONResolver.java | 2 +- .../WebGroupPermissionJSONResolver.java | 2 +- .../WebGroupSaveJSONResolver.java | 4 ++-- .../WebPermissionJSONResolver.java | 2 +- .../ExtensionAggregateBooleansQuery.java | 2 +- .../ExtensionAggregateDoublesQuery.java | 2 +- .../ExtensionAggregateGroupsQuery.java | 2 +- .../ExtensionAggregateNumbersQuery.java | 2 +- .../ExtensionAggregatePercentagesQuery.java | 2 +- .../queries/ExtensionInformationQueries.java | 4 ++-- .../queries/ExtensionPlayerDataQuery.java | 5 ++++- .../queries/ExtensionPlayerGroupsQuery.java | 2 +- .../queries/ExtensionPlayerTablesQuery.java | 8 +++---- .../ExtensionQueryResultTableDataQuery.java | 3 ++- .../queries/ExtensionServerDataQuery.java | 2 +- .../ExtensionServerTableDataQuery.java | 4 +++- .../queries/ExtensionServerTablesQuery.java | 2 +- .../queries/ExtensionUserIdsInGroupQuery.java | 4 ++-- .../HasExtensionDataForPluginQuery.java | 2 +- .../transactions/StoreIconTransaction.java | 2 +- .../transactions/StorePluginTransaction.java | 2 +- .../StoreTabInformationTransaction.java | 4 ++-- .../providers/StoreProviderTransaction.java | 6 ++--- .../StoreTableProviderTransaction.java | 6 ++--- .../RemoveInvalidResultsTransaction.java | 2 +- ...edConditionalPlayerResultsTransaction.java | 2 +- ...edConditionalServerResultsTransaction.java | 8 +++---- .../StorePlayerBooleanResultTransaction.java | 4 ++-- .../StorePlayerDoubleResultTransaction.java | 8 +++---- .../StorePlayerGroupsResultTransaction.java | 4 ++-- .../StorePlayerNumberResultTransaction.java | 4 ++-- .../StorePlayerStringResultTransaction.java | 4 ++-- .../StorePlayerTableResultTransaction.java | 6 ++--- .../StoreServerBooleanResultTransaction.java | 4 ++-- .../StoreServerDoubleResultTransaction.java | 4 ++-- .../StoreServerNumberResultTransaction.java | 4 ++-- .../StoreServerStringResultTransaction.java | 4 ++-- .../StoreServerTableResultTransaction.java | 6 ++--- .../database/queries/LargeStoreQueries.java | 1 + .../filters/PluginBooleanGroupFilter.java | 6 ++++- .../filter/filters/PluginGroupsFilter.java | 6 ++--- .../queries/objects/WebUserQueries.java | 4 +++- .../{ => extension}/ExtensionGroupsTable.java | 2 +- .../{ => extension}/ExtensionIconTable.java | 2 +- .../ExtensionPlayerTableValueTable.java | 2 +- .../ExtensionPlayerValueTable.java | 2 +- .../{ => extension}/ExtensionPluginTable.java | 2 +- .../ExtensionProviderTable.java | 2 +- .../ExtensionServerTableValueTable.java | 2 +- .../ExtensionServerValueTable.java | 2 +- .../{ => extension}/ExtensionTabTable.java | 2 +- .../ExtensionTableProviderTable.java | 2 +- .../tables/{ => webuser}/SecurityTable.java | 2 +- .../tables/{ => webuser}/WebGroupTable.java | 2 +- .../WebGroupToPermissionTable.java | 2 +- .../{ => webuser}/WebPermissionTable.java | 2 +- .../WebUserPreferencesTable.java | 2 +- .../commands/ChangeUserUUIDTransaction.java | 6 ++++- .../commands/RemoveEverythingTransaction.java | 2 ++ .../commands/RemovePlayerTransaction.java | 3 +++ .../commands/RemoveWebUserTransaction.java | 2 +- .../commands/StoreWebUserTransaction.java | 6 ++--- .../init/CreateTablesTransaction.java | 2 ++ .../init/RemoveOldExtensionsTransaction.java | 2 +- .../ComponentColumnToExtensionDataPatch.java | 22 +++++++++---------- .../ExtensionShowInPlayersTablePatch.java | 2 +- ...ExtensionTableProviderFormattersPatch.java | 2 +- .../ExtensionTableProviderValuesForPatch.java | 6 ++--- .../ExtensionTableRowValueLengthPatch.java | 4 ++-- .../LegacyPermissionLevelGroupsPatch.java | 4 ++-- .../LinkUsersToPlayersSecurityTablePatch.java | 2 +- .../patches/LinkedToSecurityTablePatch.java | 2 +- .../patches/LitebansTableHeaderPatch.java | 6 ++--- .../patches/PlayerTableRowPatch.java | 4 ++-- .../patches/SecurityTableGroupPatch.java | 4 ++-- .../patches/SecurityTableIdPatch.java | 2 +- .../patches/ServerTableRowPatch.java | 4 ++-- .../patches/UpdateWebPermissionsPatch.java | 2 +- .../WebGroupAddMissingAdminGroupPatch.java | 2 +- .../patches/WebGroupDefaultGroupsPatch.java | 2 +- .../DeleteWebGroupTransaction.java | 10 +++++---- ...sionToGroupsWithPermissionTransaction.java | 6 +++-- ...StoreMissingWebPermissionsTransaction.java | 6 +++-- .../StoreWebGroupTransaction.java | 9 +++++--- .../StoreWebUserPreferencesTransaction.java | 6 +++-- .../delivery/webserver/AccessControlTest.java | 2 +- .../AccessControlVisibilityTest.java | 2 +- .../database/DBPatchRegressionTest.java | 2 ++ .../database/queries/DatabaseBackupTest.java | 2 +- .../database/queries/WebUserQueriesTest.java | 2 +- 103 files changed, 202 insertions(+), 161 deletions(-) rename Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/{ => metadata}/LocaleJSONResolver.java (99%) rename Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/{ => metadata}/MetadataJSONResolver.java (98%) rename Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/{ => metadata}/NetworkMetadataJSONResolver.java (97%) rename Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/{ => metadata}/ServerIdentityJSONResolver.java (98%) rename Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/{ => metadata}/VersionJSONResolver.java (97%) rename Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/{ => metadata}/WhoAmIJSONResolver.java (98%) rename Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/{ => plugins}/ExtensionJSONResolver.java (97%) rename Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/{ => query}/FiltersJSONResolver.java (98%) rename Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/{ => query}/QueryJSONResolver.java (99%) rename Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/{ => webgroup}/WebGroupDeleteJSONResolver.java (96%) rename Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/{ => webgroup}/WebGroupJSONResolver.java (97%) rename Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/{ => webgroup}/WebGroupPermissionJSONResolver.java (98%) rename Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/{ => webgroup}/WebGroupSaveJSONResolver.java (96%) rename Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/{ => webgroup}/WebPermissionJSONResolver.java (97%) rename Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/{ => extension}/ExtensionGroupsTable.java (96%) rename Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/{ => extension}/ExtensionIconTable.java (97%) rename Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/{ => extension}/ExtensionPlayerTableValueTable.java (97%) rename Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/{ => extension}/ExtensionPlayerValueTable.java (97%) rename Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/{ => extension}/ExtensionPluginTable.java (97%) rename Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/{ => extension}/ExtensionProviderTable.java (98%) rename Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/{ => extension}/ExtensionServerTableValueTable.java (97%) rename Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/{ => extension}/ExtensionServerValueTable.java (97%) rename Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/{ => extension}/ExtensionTabTable.java (97%) rename Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/{ => extension}/ExtensionTableProviderTable.java (98%) rename Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/{ => webuser}/SecurityTable.java (97%) rename Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/{ => webuser}/WebGroupTable.java (96%) rename Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/{ => webuser}/WebGroupToPermissionTable.java (96%) rename Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/{ => webuser}/WebPermissionTable.java (96%) rename Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/{ => webuser}/WebUserPreferencesTable.java (97%) rename Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/{ => webuser}/DeleteWebGroupTransaction.java (89%) rename Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/{ => webuser}/GrantWebPermissionToGroupsWithPermissionTransaction.java (90%) rename Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/{ => webuser}/StoreMissingWebPermissionsTransaction.java (87%) rename Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/{ => webuser}/StoreWebGroupTransaction.java (88%) rename Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/{ => webuser}/StoreWebUserPreferencesTransaction.java (87%) diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/web/ResolverSvc.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/web/ResolverSvc.java index 262a1c5f6..233a3c203 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/web/ResolverSvc.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/web/ResolverSvc.java @@ -20,8 +20,8 @@ import com.djrapitops.plan.delivery.web.resolver.Resolver; import com.djrapitops.plan.settings.config.PlanConfig; import com.djrapitops.plan.settings.config.paths.PluginSettings; import com.djrapitops.plan.storage.database.DBSystem; -import com.djrapitops.plan.storage.database.transactions.GrantWebPermissionToGroupsWithPermissionTransaction; -import com.djrapitops.plan.storage.database.transactions.StoreMissingWebPermissionsTransaction; +import com.djrapitops.plan.storage.database.transactions.webuser.GrantWebPermissionToGroupsWithPermissionTransaction; +import com.djrapitops.plan.storage.database.transactions.webuser.StoreMissingWebPermissionsTransaction; import com.djrapitops.plan.utilities.dev.Untrusted; import net.playeranalytics.plugin.server.PluginLogger; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/RootJSONResolver.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/RootJSONResolver.java index 5ff2c5fd7..8e892eed8 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/RootJSONResolver.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/RootJSONResolver.java @@ -22,9 +22,12 @@ import com.djrapitops.plan.delivery.web.resolver.CompositeResolver; import com.djrapitops.plan.delivery.webserver.cache.AsyncJSONResolverService; import com.djrapitops.plan.delivery.webserver.cache.DataID; import com.djrapitops.plan.delivery.webserver.http.WebServer; -import com.djrapitops.plan.delivery.webserver.resolver.json.metadata.PreferencesJSONResolver; -import com.djrapitops.plan.delivery.webserver.resolver.json.metadata.StorePreferencesJSONResolver; +import com.djrapitops.plan.delivery.webserver.resolver.json.metadata.*; +import com.djrapitops.plan.delivery.webserver.resolver.json.plugins.ExtensionJSONResolver; import com.djrapitops.plan.delivery.webserver.resolver.json.plugins.PluginHistoryJSONResolver; +import com.djrapitops.plan.delivery.webserver.resolver.json.query.FiltersJSONResolver; +import com.djrapitops.plan.delivery.webserver.resolver.json.query.QueryJSONResolver; +import com.djrapitops.plan.delivery.webserver.resolver.json.webgroup.*; import com.djrapitops.plan.identification.Identifiers; import dagger.Lazy; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/LocaleJSONResolver.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/metadata/LocaleJSONResolver.java similarity index 99% rename from Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/LocaleJSONResolver.java rename to Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/metadata/LocaleJSONResolver.java index c9d9b4e9b..8b8085170 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/LocaleJSONResolver.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/metadata/LocaleJSONResolver.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.delivery.webserver.resolver.json; +package com.djrapitops.plan.delivery.webserver.resolver.json.metadata; import com.djrapitops.plan.delivery.web.resolver.MimeType; import com.djrapitops.plan.delivery.web.resolver.NoAuthResolver; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/MetadataJSONResolver.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/metadata/MetadataJSONResolver.java similarity index 98% rename from Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/MetadataJSONResolver.java rename to Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/metadata/MetadataJSONResolver.java index 8df432a84..bcb62e84a 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/MetadataJSONResolver.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/metadata/MetadataJSONResolver.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.delivery.webserver.resolver.json; +package com.djrapitops.plan.delivery.webserver.resolver.json.metadata; import com.djrapitops.plan.delivery.rendering.html.Contributors; import com.djrapitops.plan.delivery.web.resolver.NoAuthResolver; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/NetworkMetadataJSONResolver.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/metadata/NetworkMetadataJSONResolver.java similarity index 97% rename from Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/NetworkMetadataJSONResolver.java rename to Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/metadata/NetworkMetadataJSONResolver.java index 18fa5e8d4..06b8f5591 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/NetworkMetadataJSONResolver.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/metadata/NetworkMetadataJSONResolver.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.delivery.webserver.resolver.json; +package com.djrapitops.plan.delivery.webserver.resolver.json.metadata; import com.djrapitops.plan.delivery.domain.datatransfer.ServerDto; import com.djrapitops.plan.delivery.web.resolver.NoAuthResolver; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/ServerIdentityJSONResolver.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/metadata/ServerIdentityJSONResolver.java similarity index 98% rename from Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/ServerIdentityJSONResolver.java rename to Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/metadata/ServerIdentityJSONResolver.java index 4b8dbdcdd..0f4010fd3 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/ServerIdentityJSONResolver.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/metadata/ServerIdentityJSONResolver.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.delivery.webserver.resolver.json; +package com.djrapitops.plan.delivery.webserver.resolver.json.metadata; import com.djrapitops.plan.delivery.domain.auth.WebPermission; import com.djrapitops.plan.delivery.domain.datatransfer.ServerDto; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/metadata/StorePreferencesJSONResolver.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/metadata/StorePreferencesJSONResolver.java index 40fafba2d..711ce3308 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/metadata/StorePreferencesJSONResolver.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/metadata/StorePreferencesJSONResolver.java @@ -23,7 +23,7 @@ import com.djrapitops.plan.delivery.web.resolver.exception.BadRequestException; import com.djrapitops.plan.delivery.web.resolver.request.Request; import com.djrapitops.plan.delivery.web.resolver.request.WebUser; import com.djrapitops.plan.storage.database.DBSystem; -import com.djrapitops.plan.storage.database.transactions.StoreWebUserPreferencesTransaction; +import com.djrapitops.plan.storage.database.transactions.webuser.StoreWebUserPreferencesTransaction; import com.djrapitops.plan.utilities.dev.Untrusted; import com.google.gson.Gson; import com.google.gson.JsonSyntaxException; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/VersionJSONResolver.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/metadata/VersionJSONResolver.java similarity index 97% rename from Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/VersionJSONResolver.java rename to Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/metadata/VersionJSONResolver.java index f6a6357c3..b49adc3b6 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/VersionJSONResolver.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/metadata/VersionJSONResolver.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.delivery.webserver.resolver.json; +package com.djrapitops.plan.delivery.webserver.resolver.json.metadata; import com.djrapitops.plan.delivery.web.resolver.MimeType; import com.djrapitops.plan.delivery.web.resolver.NoAuthResolver; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/WhoAmIJSONResolver.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/metadata/WhoAmIJSONResolver.java similarity index 98% rename from Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/WhoAmIJSONResolver.java rename to Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/metadata/WhoAmIJSONResolver.java index af6b357f9..40877f3e9 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/WhoAmIJSONResolver.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/metadata/WhoAmIJSONResolver.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.delivery.webserver.resolver.json; +package com.djrapitops.plan.delivery.webserver.resolver.json.metadata; import com.djrapitops.plan.delivery.web.resolver.MimeType; import com.djrapitops.plan.delivery.web.resolver.NoAuthResolver; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/ExtensionJSONResolver.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/plugins/ExtensionJSONResolver.java similarity index 97% rename from Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/ExtensionJSONResolver.java rename to Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/plugins/ExtensionJSONResolver.java index f76ac9ac9..717031cac 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/ExtensionJSONResolver.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/plugins/ExtensionJSONResolver.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.delivery.webserver.resolver.json; +package com.djrapitops.plan.delivery.webserver.resolver.json.plugins; import com.djrapitops.plan.delivery.domain.auth.WebPermission; import com.djrapitops.plan.delivery.domain.datatransfer.extension.ExtensionDataDto; @@ -28,6 +28,7 @@ import com.djrapitops.plan.delivery.web.resolver.request.WebUser; import com.djrapitops.plan.delivery.webserver.cache.AsyncJSONResolverService; import com.djrapitops.plan.delivery.webserver.cache.DataID; import com.djrapitops.plan.delivery.webserver.cache.JSONStorage; +import com.djrapitops.plan.delivery.webserver.resolver.json.JSONResolver; import com.djrapitops.plan.extension.implementation.results.ExtensionData; import com.djrapitops.plan.extension.implementation.storage.queries.ExtensionServerDataQuery; import com.djrapitops.plan.identification.Identifiers; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/FiltersJSONResolver.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/query/FiltersJSONResolver.java similarity index 98% rename from Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/FiltersJSONResolver.java rename to Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/query/FiltersJSONResolver.java index 78d5f205e..9de6d87a6 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/FiltersJSONResolver.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/query/FiltersJSONResolver.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.delivery.webserver.resolver.json; +package com.djrapitops.plan.delivery.webserver.resolver.json.query; import com.djrapitops.plan.delivery.domain.DateObj; import com.djrapitops.plan.delivery.domain.auth.WebPermission; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/QueryJSONResolver.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/query/QueryJSONResolver.java similarity index 99% rename from Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/QueryJSONResolver.java rename to Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/query/QueryJSONResolver.java index f8d117484..c46c1d03d 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/QueryJSONResolver.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/query/QueryJSONResolver.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.delivery.webserver.resolver.json; +package com.djrapitops.plan.delivery.webserver.resolver.json.query; import com.djrapitops.plan.delivery.domain.DateMap; import com.djrapitops.plan.delivery.domain.auth.WebPermission; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/WebGroupDeleteJSONResolver.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/webgroup/WebGroupDeleteJSONResolver.java similarity index 96% rename from Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/WebGroupDeleteJSONResolver.java rename to Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/webgroup/WebGroupDeleteJSONResolver.java index c174f2d66..c6c6384ca 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/WebGroupDeleteJSONResolver.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/webgroup/WebGroupDeleteJSONResolver.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.delivery.webserver.resolver.json; +package com.djrapitops.plan.delivery.webserver.resolver.json.webgroup; import com.djrapitops.plan.delivery.domain.auth.WebPermission; import com.djrapitops.plan.delivery.web.resolver.MimeType; @@ -24,7 +24,7 @@ import com.djrapitops.plan.delivery.web.resolver.exception.BadRequestException; import com.djrapitops.plan.delivery.web.resolver.request.Request; import com.djrapitops.plan.delivery.webserver.auth.ActiveCookieStore; import com.djrapitops.plan.storage.database.DBSystem; -import com.djrapitops.plan.storage.database.transactions.DeleteWebGroupTransaction; +import com.djrapitops.plan.storage.database.transactions.webuser.DeleteWebGroupTransaction; import com.djrapitops.plan.utilities.dev.Untrusted; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/WebGroupJSONResolver.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/webgroup/WebGroupJSONResolver.java similarity index 97% rename from Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/WebGroupJSONResolver.java rename to Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/webgroup/WebGroupJSONResolver.java index 5d6e933d5..b4cb93700 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/WebGroupJSONResolver.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/webgroup/WebGroupJSONResolver.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.delivery.webserver.resolver.json; +package com.djrapitops.plan.delivery.webserver.resolver.json.webgroup; import com.djrapitops.plan.delivery.domain.auth.Group; import com.djrapitops.plan.delivery.domain.auth.GroupList; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/WebGroupPermissionJSONResolver.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/webgroup/WebGroupPermissionJSONResolver.java similarity index 98% rename from Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/WebGroupPermissionJSONResolver.java rename to Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/webgroup/WebGroupPermissionJSONResolver.java index 84f91108d..b4248952b 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/WebGroupPermissionJSONResolver.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/webgroup/WebGroupPermissionJSONResolver.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.delivery.webserver.resolver.json; +package com.djrapitops.plan.delivery.webserver.resolver.json.webgroup; import com.djrapitops.plan.delivery.domain.auth.WebPermission; import com.djrapitops.plan.delivery.domain.auth.WebPermissionList; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/WebGroupSaveJSONResolver.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/webgroup/WebGroupSaveJSONResolver.java similarity index 96% rename from Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/WebGroupSaveJSONResolver.java rename to Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/webgroup/WebGroupSaveJSONResolver.java index a196acb8c..a35621acc 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/WebGroupSaveJSONResolver.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/webgroup/WebGroupSaveJSONResolver.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.delivery.webserver.resolver.json; +package com.djrapitops.plan.delivery.webserver.resolver.json.webgroup; import com.djrapitops.plan.delivery.domain.auth.GroupList; import com.djrapitops.plan.delivery.domain.auth.WebPermission; @@ -25,7 +25,7 @@ import com.djrapitops.plan.delivery.web.resolver.exception.BadRequestException; import com.djrapitops.plan.delivery.web.resolver.request.Request; import com.djrapitops.plan.delivery.webserver.auth.ActiveCookieStore; import com.djrapitops.plan.storage.database.DBSystem; -import com.djrapitops.plan.storage.database.transactions.StoreWebGroupTransaction; +import com.djrapitops.plan.storage.database.transactions.webuser.StoreWebGroupTransaction; import com.google.gson.Gson; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/WebPermissionJSONResolver.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/webgroup/WebPermissionJSONResolver.java similarity index 97% rename from Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/WebPermissionJSONResolver.java rename to Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/webgroup/WebPermissionJSONResolver.java index 2aa83de10..f2b20d796 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/WebPermissionJSONResolver.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/webgroup/WebPermissionJSONResolver.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.delivery.webserver.resolver.json; +package com.djrapitops.plan.delivery.webserver.resolver.json.webgroup; import com.djrapitops.plan.delivery.domain.auth.WebPermission; import com.djrapitops.plan.delivery.domain.auth.WebPermissionList; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregateBooleansQuery.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregateBooleansQuery.java index fcf63bebc..2564dec18 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregateBooleansQuery.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregateBooleansQuery.java @@ -29,7 +29,7 @@ import com.djrapitops.plan.identification.ServerUUID; import com.djrapitops.plan.storage.database.SQLDB; import com.djrapitops.plan.storage.database.queries.Query; import com.djrapitops.plan.storage.database.queries.QueryStatement; -import com.djrapitops.plan.storage.database.sql.tables.*; +import com.djrapitops.plan.storage.database.sql.tables.extension.*; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregateDoublesQuery.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregateDoublesQuery.java index 49ad717e7..8b7668899 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregateDoublesQuery.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregateDoublesQuery.java @@ -29,7 +29,7 @@ import com.djrapitops.plan.identification.ServerUUID; import com.djrapitops.plan.storage.database.SQLDB; import com.djrapitops.plan.storage.database.queries.Query; import com.djrapitops.plan.storage.database.queries.QueryStatement; -import com.djrapitops.plan.storage.database.sql.tables.*; +import com.djrapitops.plan.storage.database.sql.tables.extension.*; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregateGroupsQuery.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregateGroupsQuery.java index dd32bfe50..58646a2a7 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregateGroupsQuery.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregateGroupsQuery.java @@ -27,7 +27,7 @@ import com.djrapitops.plan.identification.ServerUUID; import com.djrapitops.plan.storage.database.SQLDB; import com.djrapitops.plan.storage.database.queries.Query; import com.djrapitops.plan.storage.database.queries.QueryStatement; -import com.djrapitops.plan.storage.database.sql.tables.*; +import com.djrapitops.plan.storage.database.sql.tables.extension.*; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregateNumbersQuery.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregateNumbersQuery.java index ec30e3136..92543c4ca 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregateNumbersQuery.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregateNumbersQuery.java @@ -30,7 +30,7 @@ import com.djrapitops.plan.identification.ServerUUID; import com.djrapitops.plan.storage.database.SQLDB; import com.djrapitops.plan.storage.database.queries.Query; import com.djrapitops.plan.storage.database.queries.QueryStatement; -import com.djrapitops.plan.storage.database.sql.tables.*; +import com.djrapitops.plan.storage.database.sql.tables.extension.*; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregatePercentagesQuery.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregatePercentagesQuery.java index 430c5ca39..2292e2811 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregatePercentagesQuery.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregatePercentagesQuery.java @@ -29,7 +29,7 @@ import com.djrapitops.plan.identification.ServerUUID; import com.djrapitops.plan.storage.database.SQLDB; import com.djrapitops.plan.storage.database.queries.Query; import com.djrapitops.plan.storage.database.queries.QueryStatement; -import com.djrapitops.plan.storage.database.sql.tables.*; +import com.djrapitops.plan.storage.database.sql.tables.extension.*; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionInformationQueries.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionInformationQueries.java index dc6b36a15..f1160ea67 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionInformationQueries.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionInformationQueries.java @@ -24,8 +24,8 @@ import com.djrapitops.plan.identification.ServerUUID; import com.djrapitops.plan.storage.database.queries.Query; import com.djrapitops.plan.storage.database.queries.QueryAllStatement; import com.djrapitops.plan.storage.database.queries.QueryStatement; -import com.djrapitops.plan.storage.database.sql.tables.ExtensionIconTable; -import com.djrapitops.plan.storage.database.sql.tables.ExtensionPluginTable; +import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionIconTable; +import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionPluginTable; import com.djrapitops.plan.utilities.java.Lists; import java.sql.PreparedStatement; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionPlayerDataQuery.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionPlayerDataQuery.java index b267b0515..c89df47e5 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionPlayerDataQuery.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionPlayerDataQuery.java @@ -27,7 +27,10 @@ import com.djrapitops.plan.identification.ServerUUID; import com.djrapitops.plan.storage.database.SQLDB; import com.djrapitops.plan.storage.database.queries.Query; import com.djrapitops.plan.storage.database.queries.QueryStatement; -import com.djrapitops.plan.storage.database.sql.tables.*; +import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionIconTable; +import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionPlayerValueTable; +import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionProviderTable; +import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionTabTable; import com.djrapitops.plan.utilities.java.Lists; import java.sql.PreparedStatement; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionPlayerGroupsQuery.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionPlayerGroupsQuery.java index 94b82b309..6ee560ed7 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionPlayerGroupsQuery.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionPlayerGroupsQuery.java @@ -28,7 +28,7 @@ import com.djrapitops.plan.extension.implementation.results.ExtensionTabData; import com.djrapitops.plan.storage.database.SQLDB; import com.djrapitops.plan.storage.database.queries.Query; import com.djrapitops.plan.storage.database.queries.QueryStatement; -import com.djrapitops.plan.storage.database.sql.tables.*; +import com.djrapitops.plan.storage.database.sql.tables.extension.*; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionPlayerTablesQuery.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionPlayerTablesQuery.java index bd3c96a63..876b1c88e 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionPlayerTablesQuery.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionPlayerTablesQuery.java @@ -27,10 +27,10 @@ import com.djrapitops.plan.extension.table.TableColumnFormat; import com.djrapitops.plan.storage.database.SQLDB; import com.djrapitops.plan.storage.database.queries.Query; import com.djrapitops.plan.storage.database.queries.QueryStatement; -import com.djrapitops.plan.storage.database.sql.tables.ExtensionIconTable; -import com.djrapitops.plan.storage.database.sql.tables.ExtensionPlayerTableValueTable; -import com.djrapitops.plan.storage.database.sql.tables.ExtensionTabTable; -import com.djrapitops.plan.storage.database.sql.tables.ExtensionTableProviderTable; +import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionIconTable; +import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionPlayerTableValueTable; +import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionTabTable; +import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionTableProviderTable; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionQueryResultTableDataQuery.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionQueryResultTableDataQuery.java index 5171354a2..a157ffc4d 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionQueryResultTableDataQuery.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionQueryResultTableDataQuery.java @@ -26,7 +26,8 @@ import com.djrapitops.plan.storage.database.SQLDB; import com.djrapitops.plan.storage.database.queries.Query; import com.djrapitops.plan.storage.database.queries.QueryStatement; import com.djrapitops.plan.storage.database.sql.building.Sql; -import com.djrapitops.plan.storage.database.sql.tables.*; +import com.djrapitops.plan.storage.database.sql.tables.UsersTable; +import com.djrapitops.plan.storage.database.sql.tables.extension.*; import org.apache.commons.text.TextStringBuilder; import java.sql.PreparedStatement; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionServerDataQuery.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionServerDataQuery.java index 548d1f7dd..cbd5263f7 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionServerDataQuery.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionServerDataQuery.java @@ -27,7 +27,7 @@ import com.djrapitops.plan.identification.ServerUUID; import com.djrapitops.plan.storage.database.SQLDB; import com.djrapitops.plan.storage.database.queries.Query; import com.djrapitops.plan.storage.database.queries.QueryStatement; -import com.djrapitops.plan.storage.database.sql.tables.*; +import com.djrapitops.plan.storage.database.sql.tables.extension.*; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionServerTableDataQuery.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionServerTableDataQuery.java index 48d4c8585..0751c3dee 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionServerTableDataQuery.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionServerTableDataQuery.java @@ -25,7 +25,9 @@ import com.djrapitops.plan.identification.ServerUUID; import com.djrapitops.plan.storage.database.SQLDB; import com.djrapitops.plan.storage.database.queries.Query; import com.djrapitops.plan.storage.database.queries.QueryStatement; -import com.djrapitops.plan.storage.database.sql.tables.*; +import com.djrapitops.plan.storage.database.sql.tables.SessionsTable; +import com.djrapitops.plan.storage.database.sql.tables.UsersTable; +import com.djrapitops.plan.storage.database.sql.tables.extension.*; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionServerTablesQuery.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionServerTablesQuery.java index efe53ca47..3390fc326 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionServerTablesQuery.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionServerTablesQuery.java @@ -28,7 +28,7 @@ import com.djrapitops.plan.identification.ServerUUID; import com.djrapitops.plan.storage.database.SQLDB; import com.djrapitops.plan.storage.database.queries.Query; import com.djrapitops.plan.storage.database.queries.QueryStatement; -import com.djrapitops.plan.storage.database.sql.tables.*; +import com.djrapitops.plan.storage.database.sql.tables.extension.*; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionUserIdsInGroupQuery.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionUserIdsInGroupQuery.java index e88b21c15..2cb2698f9 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionUserIdsInGroupQuery.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionUserIdsInGroupQuery.java @@ -18,9 +18,9 @@ package com.djrapitops.plan.extension.implementation.storage.queries; import com.djrapitops.plan.identification.ServerUUID; import com.djrapitops.plan.storage.database.queries.QueryStatement; -import com.djrapitops.plan.storage.database.sql.tables.ExtensionGroupsTable; -import com.djrapitops.plan.storage.database.sql.tables.ExtensionProviderTable; import com.djrapitops.plan.storage.database.sql.tables.UsersTable; +import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionGroupsTable; +import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionProviderTable; import com.djrapitops.plan.utilities.dev.Untrusted; import java.sql.PreparedStatement; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/HasExtensionDataForPluginQuery.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/HasExtensionDataForPluginQuery.java index 2c9d66a0d..c679caad7 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/HasExtensionDataForPluginQuery.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/HasExtensionDataForPluginQuery.java @@ -18,7 +18,7 @@ package com.djrapitops.plan.extension.implementation.storage.queries; import com.djrapitops.plan.identification.ServerUUID; import com.djrapitops.plan.storage.database.queries.HasMoreThanZeroQueryStatement; -import com.djrapitops.plan.storage.database.sql.tables.ExtensionPluginTable; +import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionPluginTable; import java.sql.PreparedStatement; import java.sql.SQLException; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/StoreIconTransaction.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/StoreIconTransaction.java index b915c99f7..028302d94 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/StoreIconTransaction.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/StoreIconTransaction.java @@ -20,7 +20,7 @@ import com.djrapitops.plan.extension.icon.Icon; import com.djrapitops.plan.extension.icon.IconAccessor; import com.djrapitops.plan.storage.database.queries.Query; import com.djrapitops.plan.storage.database.queries.QueryStatement; -import com.djrapitops.plan.storage.database.sql.tables.ExtensionIconTable; +import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionIconTable; import com.djrapitops.plan.storage.database.transactions.ExecStatement; import com.djrapitops.plan.storage.database.transactions.ThrowawayTransaction; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/StorePluginTransaction.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/StorePluginTransaction.java index 97ca81f2d..662f0b2d3 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/StorePluginTransaction.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/StorePluginTransaction.java @@ -19,7 +19,7 @@ package com.djrapitops.plan.extension.implementation.storage.transactions; import com.djrapitops.plan.extension.icon.Icon; import com.djrapitops.plan.extension.icon.IconAccessor; import com.djrapitops.plan.identification.ServerUUID; -import com.djrapitops.plan.storage.database.sql.tables.ExtensionPluginTable; +import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionPluginTable; import com.djrapitops.plan.storage.database.transactions.ExecStatement; import com.djrapitops.plan.storage.database.transactions.Executable; import com.djrapitops.plan.storage.database.transactions.ThrowawayTransaction; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/StoreTabInformationTransaction.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/StoreTabInformationTransaction.java index cbf7248d8..24e270e1a 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/StoreTabInformationTransaction.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/StoreTabInformationTransaction.java @@ -19,8 +19,8 @@ package com.djrapitops.plan.extension.implementation.storage.transactions; import com.djrapitops.plan.extension.icon.IconAccessor; import com.djrapitops.plan.extension.implementation.TabInformation; import com.djrapitops.plan.identification.ServerUUID; -import com.djrapitops.plan.storage.database.sql.tables.ExtensionPluginTable; -import com.djrapitops.plan.storage.database.sql.tables.ExtensionTabTable; +import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionPluginTable; +import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionTabTable; import com.djrapitops.plan.storage.database.transactions.ExecStatement; import com.djrapitops.plan.storage.database.transactions.Executable; import com.djrapitops.plan.storage.database.transactions.ThrowawayTransaction; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/providers/StoreProviderTransaction.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/providers/StoreProviderTransaction.java index 7e3e728b7..4ff030a2a 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/providers/StoreProviderTransaction.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/providers/StoreProviderTransaction.java @@ -23,8 +23,8 @@ import com.djrapitops.plan.extension.implementation.providers.DataProvider; import com.djrapitops.plan.extension.implementation.providers.Parameters; import com.djrapitops.plan.identification.ServerUUID; import com.djrapitops.plan.storage.database.sql.building.Sql; -import com.djrapitops.plan.storage.database.sql.tables.ExtensionPluginTable; -import com.djrapitops.plan.storage.database.sql.tables.ExtensionTabTable; +import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionPluginTable; +import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionTabTable; import com.djrapitops.plan.storage.database.transactions.ExecStatement; import com.djrapitops.plan.storage.database.transactions.Executable; import com.djrapitops.plan.storage.database.transactions.ThrowawayTransaction; @@ -34,7 +34,7 @@ import java.sql.SQLException; import static com.djrapitops.plan.storage.database.sql.building.Sql.AND; import static com.djrapitops.plan.storage.database.sql.building.Sql.WHERE; -import static com.djrapitops.plan.storage.database.sql.tables.ExtensionProviderTable.*; +import static com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionProviderTable.*; /** * Transaction to store information about a simple {@link DataProvider}. diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/providers/StoreTableProviderTransaction.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/providers/StoreTableProviderTransaction.java index 8b9a1991b..b2fe184bb 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/providers/StoreTableProviderTransaction.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/providers/StoreTableProviderTransaction.java @@ -24,8 +24,8 @@ import com.djrapitops.plan.extension.implementation.providers.Parameters; import com.djrapitops.plan.extension.table.Table; import com.djrapitops.plan.extension.table.TableColumnFormat; import com.djrapitops.plan.identification.ServerUUID; -import com.djrapitops.plan.storage.database.sql.tables.ExtensionPluginTable; -import com.djrapitops.plan.storage.database.sql.tables.ExtensionTabTable; +import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionPluginTable; +import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionTabTable; import com.djrapitops.plan.storage.database.transactions.ExecStatement; import com.djrapitops.plan.storage.database.transactions.Executable; import com.djrapitops.plan.storage.database.transactions.ThrowawayTransaction; @@ -36,7 +36,7 @@ import java.sql.Types; import static com.djrapitops.plan.storage.database.sql.building.Sql.AND; import static com.djrapitops.plan.storage.database.sql.building.Sql.WHERE; -import static com.djrapitops.plan.storage.database.sql.tables.ExtensionTableProviderTable.*; +import static com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionTableProviderTable.*; /** * Transaction to store information about a Table. diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/RemoveInvalidResultsTransaction.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/RemoveInvalidResultsTransaction.java index 5b9a9744b..f681524bd 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/RemoveInvalidResultsTransaction.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/RemoveInvalidResultsTransaction.java @@ -17,7 +17,7 @@ package com.djrapitops.plan.extension.implementation.storage.transactions.results; import com.djrapitops.plan.identification.ServerUUID; -import com.djrapitops.plan.storage.database.sql.tables.*; +import com.djrapitops.plan.storage.database.sql.tables.extension.*; import com.djrapitops.plan.storage.database.transactions.ExecStatement; import com.djrapitops.plan.storage.database.transactions.Executable; import com.djrapitops.plan.storage.database.transactions.ThrowawayTransaction; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/RemoveUnsatisfiedConditionalPlayerResultsTransaction.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/RemoveUnsatisfiedConditionalPlayerResultsTransaction.java index 38bfc2593..559e62a6c 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/RemoveUnsatisfiedConditionalPlayerResultsTransaction.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/RemoveUnsatisfiedConditionalPlayerResultsTransaction.java @@ -17,7 +17,7 @@ package com.djrapitops.plan.extension.implementation.storage.transactions.results; import com.djrapitops.plan.storage.database.DBType; -import com.djrapitops.plan.storage.database.sql.tables.*; +import com.djrapitops.plan.storage.database.sql.tables.extension.*; import com.djrapitops.plan.storage.database.transactions.ExecStatement; import com.djrapitops.plan.storage.database.transactions.Executable; import com.djrapitops.plan.storage.database.transactions.ThrowawayTransaction; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/RemoveUnsatisfiedConditionalServerResultsTransaction.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/RemoveUnsatisfiedConditionalServerResultsTransaction.java index 16d48b664..d33d10a39 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/RemoveUnsatisfiedConditionalServerResultsTransaction.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/RemoveUnsatisfiedConditionalServerResultsTransaction.java @@ -17,10 +17,10 @@ package com.djrapitops.plan.extension.implementation.storage.transactions.results; import com.djrapitops.plan.storage.database.DBType; -import com.djrapitops.plan.storage.database.sql.tables.ExtensionProviderTable; -import com.djrapitops.plan.storage.database.sql.tables.ExtensionServerTableValueTable; -import com.djrapitops.plan.storage.database.sql.tables.ExtensionServerValueTable; -import com.djrapitops.plan.storage.database.sql.tables.ExtensionTableProviderTable; +import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionProviderTable; +import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionServerTableValueTable; +import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionServerValueTable; +import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionTableProviderTable; import com.djrapitops.plan.storage.database.transactions.ExecStatement; import com.djrapitops.plan.storage.database.transactions.Executable; import com.djrapitops.plan.storage.database.transactions.ThrowawayTransaction; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/StorePlayerBooleanResultTransaction.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/StorePlayerBooleanResultTransaction.java index 462be295f..6bb4826f6 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/StorePlayerBooleanResultTransaction.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/StorePlayerBooleanResultTransaction.java @@ -19,7 +19,7 @@ package com.djrapitops.plan.extension.implementation.storage.transactions.result import com.djrapitops.plan.extension.implementation.ProviderInformation; import com.djrapitops.plan.extension.implementation.providers.Parameters; import com.djrapitops.plan.identification.ServerUUID; -import com.djrapitops.plan.storage.database.sql.tables.ExtensionProviderTable; +import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionProviderTable; import com.djrapitops.plan.storage.database.transactions.ExecStatement; import com.djrapitops.plan.storage.database.transactions.Executable; import com.djrapitops.plan.storage.database.transactions.ThrowawayTransaction; @@ -30,7 +30,7 @@ import java.util.UUID; import static com.djrapitops.plan.storage.database.sql.building.Sql.AND; import static com.djrapitops.plan.storage.database.sql.building.Sql.WHERE; -import static com.djrapitops.plan.storage.database.sql.tables.ExtensionPlayerValueTable.*; +import static com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionPlayerValueTable.*; /** * Transaction to store method result of a boolean. diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/StorePlayerDoubleResultTransaction.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/StorePlayerDoubleResultTransaction.java index b6d5a00ff..d577f6d65 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/StorePlayerDoubleResultTransaction.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/StorePlayerDoubleResultTransaction.java @@ -19,7 +19,7 @@ package com.djrapitops.plan.extension.implementation.storage.transactions.result import com.djrapitops.plan.extension.implementation.ProviderInformation; import com.djrapitops.plan.extension.implementation.providers.Parameters; import com.djrapitops.plan.identification.ServerUUID; -import com.djrapitops.plan.storage.database.sql.tables.ExtensionProviderTable; +import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionProviderTable; import com.djrapitops.plan.storage.database.transactions.ExecStatement; import com.djrapitops.plan.storage.database.transactions.Executable; import com.djrapitops.plan.storage.database.transactions.ThrowawayTransaction; @@ -30,9 +30,9 @@ import java.util.UUID; import static com.djrapitops.plan.storage.database.sql.building.Sql.AND; import static com.djrapitops.plan.storage.database.sql.building.Sql.WHERE; -import static com.djrapitops.plan.storage.database.sql.tables.ExtensionPlayerValueTable.*; -import static com.djrapitops.plan.storage.database.sql.tables.ExtensionServerValueTable.DOUBLE_VALUE; -import static com.djrapitops.plan.storage.database.sql.tables.ExtensionServerValueTable.PERCENTAGE_VALUE; +import static com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionPlayerValueTable.*; +import static com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionServerValueTable.DOUBLE_VALUE; +import static com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionServerValueTable.PERCENTAGE_VALUE; /** * Transaction to store method result of. diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/StorePlayerGroupsResultTransaction.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/StorePlayerGroupsResultTransaction.java index 2c17232ba..11fa80f88 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/StorePlayerGroupsResultTransaction.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/StorePlayerGroupsResultTransaction.java @@ -19,8 +19,8 @@ package com.djrapitops.plan.extension.implementation.storage.transactions.result import com.djrapitops.plan.extension.implementation.ProviderInformation; import com.djrapitops.plan.extension.implementation.providers.Parameters; import com.djrapitops.plan.identification.ServerUUID; -import com.djrapitops.plan.storage.database.sql.tables.ExtensionGroupsTable; -import com.djrapitops.plan.storage.database.sql.tables.ExtensionProviderTable; +import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionGroupsTable; +import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionProviderTable; import com.djrapitops.plan.storage.database.transactions.ExecStatement; import com.djrapitops.plan.storage.database.transactions.Executable; import com.djrapitops.plan.storage.database.transactions.ThrowawayTransaction; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/StorePlayerNumberResultTransaction.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/StorePlayerNumberResultTransaction.java index 7e7d9f1c9..243ce2b6a 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/StorePlayerNumberResultTransaction.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/StorePlayerNumberResultTransaction.java @@ -19,7 +19,7 @@ package com.djrapitops.plan.extension.implementation.storage.transactions.result import com.djrapitops.plan.extension.implementation.ProviderInformation; import com.djrapitops.plan.extension.implementation.providers.Parameters; import com.djrapitops.plan.identification.ServerUUID; -import com.djrapitops.plan.storage.database.sql.tables.ExtensionProviderTable; +import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionProviderTable; import com.djrapitops.plan.storage.database.transactions.ExecStatement; import com.djrapitops.plan.storage.database.transactions.Executable; import com.djrapitops.plan.storage.database.transactions.ThrowawayTransaction; @@ -30,7 +30,7 @@ import java.util.UUID; import static com.djrapitops.plan.storage.database.sql.building.Sql.AND; import static com.djrapitops.plan.storage.database.sql.building.Sql.WHERE; -import static com.djrapitops.plan.storage.database.sql.tables.ExtensionPlayerValueTable.*; +import static com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionPlayerValueTable.*; /** * Transaction to store method result of a long. diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/StorePlayerStringResultTransaction.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/StorePlayerStringResultTransaction.java index b05f43a21..2f9e8f4ff 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/StorePlayerStringResultTransaction.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/StorePlayerStringResultTransaction.java @@ -21,7 +21,7 @@ import com.djrapitops.plan.extension.implementation.builder.ComponentDataValue; import com.djrapitops.plan.extension.implementation.builder.StringDataValue; import com.djrapitops.plan.extension.implementation.providers.Parameters; import com.djrapitops.plan.identification.ServerUUID; -import com.djrapitops.plan.storage.database.sql.tables.ExtensionProviderTable; +import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionProviderTable; import com.djrapitops.plan.storage.database.transactions.ExecStatement; import com.djrapitops.plan.storage.database.transactions.Executable; import com.djrapitops.plan.storage.database.transactions.ThrowawayTransaction; @@ -33,7 +33,7 @@ import java.util.UUID; import static com.djrapitops.plan.storage.database.sql.building.Sql.AND; import static com.djrapitops.plan.storage.database.sql.building.Sql.WHERE; -import static com.djrapitops.plan.storage.database.sql.tables.ExtensionPlayerValueTable.*; +import static com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionPlayerValueTable.*; /** * Transaction to store method result of a String. diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/StorePlayerTableResultTransaction.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/StorePlayerTableResultTransaction.java index a0c1c25f6..c4bcf15e4 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/StorePlayerTableResultTransaction.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/StorePlayerTableResultTransaction.java @@ -23,8 +23,8 @@ import com.djrapitops.plan.extension.table.Table; import com.djrapitops.plan.identification.ServerUUID; import com.djrapitops.plan.storage.database.queries.Query; import com.djrapitops.plan.storage.database.queries.QueryStatement; -import com.djrapitops.plan.storage.database.sql.tables.ExtensionPluginTable; -import com.djrapitops.plan.storage.database.sql.tables.ExtensionTableProviderTable; +import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionPluginTable; +import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionTableProviderTable; import com.djrapitops.plan.storage.database.transactions.ExecBatchStatement; import com.djrapitops.plan.storage.database.transactions.ExecStatement; import com.djrapitops.plan.storage.database.transactions.Executable; @@ -39,7 +39,7 @@ import java.util.List; import java.util.UUID; import static com.djrapitops.plan.storage.database.sql.building.Sql.*; -import static com.djrapitops.plan.storage.database.sql.tables.ExtensionPlayerTableValueTable.*; +import static com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionPlayerTableValueTable.*; /** * Transaction to store method result of a Table. diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/StoreServerBooleanResultTransaction.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/StoreServerBooleanResultTransaction.java index 99edd2fd3..4e0b25a88 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/StoreServerBooleanResultTransaction.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/StoreServerBooleanResultTransaction.java @@ -19,7 +19,7 @@ package com.djrapitops.plan.extension.implementation.storage.transactions.result import com.djrapitops.plan.extension.implementation.ProviderInformation; import com.djrapitops.plan.extension.implementation.providers.Parameters; import com.djrapitops.plan.identification.ServerUUID; -import com.djrapitops.plan.storage.database.sql.tables.ExtensionProviderTable; +import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionProviderTable; import com.djrapitops.plan.storage.database.transactions.ExecStatement; import com.djrapitops.plan.storage.database.transactions.Executable; import com.djrapitops.plan.storage.database.transactions.ThrowawayTransaction; @@ -28,7 +28,7 @@ import java.sql.PreparedStatement; import java.sql.SQLException; import static com.djrapitops.plan.storage.database.sql.building.Sql.WHERE; -import static com.djrapitops.plan.storage.database.sql.tables.ExtensionServerValueTable.*; +import static com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionServerValueTable.*; /** * Transaction to store method result of a boolean. diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/StoreServerDoubleResultTransaction.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/StoreServerDoubleResultTransaction.java index 27dd7a6d2..148453018 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/StoreServerDoubleResultTransaction.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/StoreServerDoubleResultTransaction.java @@ -19,7 +19,7 @@ package com.djrapitops.plan.extension.implementation.storage.transactions.result import com.djrapitops.plan.extension.implementation.ProviderInformation; import com.djrapitops.plan.extension.implementation.providers.Parameters; import com.djrapitops.plan.identification.ServerUUID; -import com.djrapitops.plan.storage.database.sql.tables.ExtensionProviderTable; +import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionProviderTable; import com.djrapitops.plan.storage.database.transactions.ExecStatement; import com.djrapitops.plan.storage.database.transactions.Executable; import com.djrapitops.plan.storage.database.transactions.ThrowawayTransaction; @@ -28,7 +28,7 @@ import java.sql.PreparedStatement; import java.sql.SQLException; import static com.djrapitops.plan.storage.database.sql.building.Sql.WHERE; -import static com.djrapitops.plan.storage.database.sql.tables.ExtensionServerValueTable.*; +import static com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionServerValueTable.*; /** * Transaction to store method result of a double. diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/StoreServerNumberResultTransaction.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/StoreServerNumberResultTransaction.java index b77c4dd88..222e52a90 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/StoreServerNumberResultTransaction.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/StoreServerNumberResultTransaction.java @@ -19,7 +19,7 @@ package com.djrapitops.plan.extension.implementation.storage.transactions.result import com.djrapitops.plan.extension.implementation.ProviderInformation; import com.djrapitops.plan.extension.implementation.providers.Parameters; import com.djrapitops.plan.identification.ServerUUID; -import com.djrapitops.plan.storage.database.sql.tables.ExtensionProviderTable; +import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionProviderTable; import com.djrapitops.plan.storage.database.transactions.ExecStatement; import com.djrapitops.plan.storage.database.transactions.Executable; import com.djrapitops.plan.storage.database.transactions.ThrowawayTransaction; @@ -28,7 +28,7 @@ import java.sql.PreparedStatement; import java.sql.SQLException; import static com.djrapitops.plan.storage.database.sql.building.Sql.WHERE; -import static com.djrapitops.plan.storage.database.sql.tables.ExtensionServerValueTable.*; +import static com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionServerValueTable.*; /** * Transaction to store method result of a long. diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/StoreServerStringResultTransaction.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/StoreServerStringResultTransaction.java index 700519752..8a6e5b1d1 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/StoreServerStringResultTransaction.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/StoreServerStringResultTransaction.java @@ -21,7 +21,7 @@ import com.djrapitops.plan.extension.implementation.builder.ComponentDataValue; import com.djrapitops.plan.extension.implementation.builder.StringDataValue; import com.djrapitops.plan.extension.implementation.providers.Parameters; import com.djrapitops.plan.identification.ServerUUID; -import com.djrapitops.plan.storage.database.sql.tables.ExtensionProviderTable; +import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionProviderTable; import com.djrapitops.plan.storage.database.transactions.ExecStatement; import com.djrapitops.plan.storage.database.transactions.Executable; import com.djrapitops.plan.storage.database.transactions.ThrowawayTransaction; @@ -31,7 +31,7 @@ import java.sql.PreparedStatement; import java.sql.SQLException; import static com.djrapitops.plan.storage.database.sql.building.Sql.WHERE; -import static com.djrapitops.plan.storage.database.sql.tables.ExtensionServerValueTable.*; +import static com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionServerValueTable.*; /** * Transaction to store Extension String data for a server. diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/StoreServerTableResultTransaction.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/StoreServerTableResultTransaction.java index 644274fbd..24f4ac22a 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/StoreServerTableResultTransaction.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/StoreServerTableResultTransaction.java @@ -23,8 +23,8 @@ import com.djrapitops.plan.extension.table.Table; import com.djrapitops.plan.identification.ServerUUID; import com.djrapitops.plan.storage.database.queries.Query; import com.djrapitops.plan.storage.database.queries.QueryStatement; -import com.djrapitops.plan.storage.database.sql.tables.ExtensionPluginTable; -import com.djrapitops.plan.storage.database.sql.tables.ExtensionTableProviderTable; +import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionPluginTable; +import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionTableProviderTable; import com.djrapitops.plan.storage.database.transactions.ExecBatchStatement; import com.djrapitops.plan.storage.database.transactions.ExecStatement; import com.djrapitops.plan.storage.database.transactions.Executable; @@ -38,7 +38,7 @@ import java.sql.Types; import java.util.List; import static com.djrapitops.plan.storage.database.sql.building.Sql.*; -import static com.djrapitops.plan.storage.database.sql.tables.ExtensionServerTableValueTable.*; +import static com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionServerTableValueTable.*; /** * Transaction to store method result of a Table. diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/LargeStoreQueries.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/LargeStoreQueries.java index a5a9c89a2..7fe0abad5 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/LargeStoreQueries.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/LargeStoreQueries.java @@ -27,6 +27,7 @@ import com.djrapitops.plan.identification.ServerUUID; import com.djrapitops.plan.storage.database.queries.objects.JoinAddressQueries; import com.djrapitops.plan.storage.database.queries.objects.WorldTimesQueries; import com.djrapitops.plan.storage.database.sql.tables.*; +import com.djrapitops.plan.storage.database.sql.tables.webuser.*; import com.djrapitops.plan.storage.database.transactions.ExecBatchStatement; import com.djrapitops.plan.storage.database.transactions.Executable; import org.apache.commons.lang3.StringUtils; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/filters/PluginBooleanGroupFilter.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/filters/PluginBooleanGroupFilter.java index 04db305e9..d0de089ef 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/filters/PluginBooleanGroupFilter.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/filters/PluginBooleanGroupFilter.java @@ -25,7 +25,11 @@ import com.djrapitops.plan.storage.database.queries.Query; import com.djrapitops.plan.storage.database.queries.QueryAllStatement; import com.djrapitops.plan.storage.database.queries.QueryStatement; import com.djrapitops.plan.storage.database.queries.objects.ServerQueries; -import com.djrapitops.plan.storage.database.sql.tables.*; +import com.djrapitops.plan.storage.database.sql.tables.ServerTable; +import com.djrapitops.plan.storage.database.sql.tables.UsersTable; +import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionPlayerValueTable; +import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionPluginTable; +import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionProviderTable; import com.djrapitops.plan.utilities.dev.Untrusted; import org.apache.commons.lang3.StringUtils; import org.intellij.lang.annotations.Language; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/filters/PluginGroupsFilter.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/filters/PluginGroupsFilter.java index 31d91346a..33cfe698d 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/filters/PluginGroupsFilter.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/filters/PluginGroupsFilter.java @@ -24,10 +24,10 @@ import com.djrapitops.plan.identification.ServerInfo; import com.djrapitops.plan.identification.ServerUUID; import com.djrapitops.plan.storage.database.DBSystem; import com.djrapitops.plan.storage.database.queries.QueryAllStatement; -import com.djrapitops.plan.storage.database.sql.tables.ExtensionGroupsTable; -import com.djrapitops.plan.storage.database.sql.tables.ExtensionPluginTable; -import com.djrapitops.plan.storage.database.sql.tables.ExtensionProviderTable; import com.djrapitops.plan.storage.database.sql.tables.ServerTable; +import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionGroupsTable; +import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionPluginTable; +import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionProviderTable; import com.djrapitops.plan.utilities.dev.Untrusted; import com.djrapitops.plan.utilities.java.Maps; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/WebUserQueries.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/WebUserQueries.java index 4fc51d3b2..c4ef1951b 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/WebUserQueries.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/WebUserQueries.java @@ -22,7 +22,9 @@ import com.djrapitops.plan.delivery.web.resolver.request.WebUser; import com.djrapitops.plan.storage.database.queries.Query; import com.djrapitops.plan.storage.database.queries.QueryAllStatement; import com.djrapitops.plan.storage.database.sql.building.Sql; -import com.djrapitops.plan.storage.database.sql.tables.*; +import com.djrapitops.plan.storage.database.sql.tables.CookieTable; +import com.djrapitops.plan.storage.database.sql.tables.UsersTable; +import com.djrapitops.plan.storage.database.sql.tables.webuser.*; import com.djrapitops.plan.utilities.dev.Untrusted; import com.djrapitops.plan.utilities.java.Lists; import com.google.gson.Gson; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/ExtensionGroupsTable.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/extension/ExtensionGroupsTable.java similarity index 96% rename from Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/ExtensionGroupsTable.java rename to Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/extension/ExtensionGroupsTable.java index 82ba3a660..0c2fed8f7 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/ExtensionGroupsTable.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/extension/ExtensionGroupsTable.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.storage.database.sql.tables; +package com.djrapitops.plan.storage.database.sql.tables.extension; import com.djrapitops.plan.storage.database.DBType; import com.djrapitops.plan.storage.database.sql.building.CreateTableBuilder; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/ExtensionIconTable.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/extension/ExtensionIconTable.java similarity index 97% rename from Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/ExtensionIconTable.java rename to Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/extension/ExtensionIconTable.java index 6834812ad..6b302a549 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/ExtensionIconTable.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/extension/ExtensionIconTable.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.storage.database.sql.tables; +package com.djrapitops.plan.storage.database.sql.tables.extension; import com.djrapitops.plan.extension.icon.Color; import com.djrapitops.plan.extension.icon.Family; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/ExtensionPlayerTableValueTable.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/extension/ExtensionPlayerTableValueTable.java similarity index 97% rename from Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/ExtensionPlayerTableValueTable.java rename to Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/extension/ExtensionPlayerTableValueTable.java index 0fc7a6aa2..82c8f8fd5 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/ExtensionPlayerTableValueTable.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/extension/ExtensionPlayerTableValueTable.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.storage.database.sql.tables; +package com.djrapitops.plan.storage.database.sql.tables.extension; import com.djrapitops.plan.storage.database.DBType; import com.djrapitops.plan.storage.database.sql.building.CreateTableBuilder; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/ExtensionPlayerValueTable.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/extension/ExtensionPlayerValueTable.java similarity index 97% rename from Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/ExtensionPlayerValueTable.java rename to Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/extension/ExtensionPlayerValueTable.java index 9488c7695..cd700f9c8 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/ExtensionPlayerValueTable.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/extension/ExtensionPlayerValueTable.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.storage.database.sql.tables; +package com.djrapitops.plan.storage.database.sql.tables.extension; import com.djrapitops.plan.extension.implementation.builder.ComponentDataValue; import com.djrapitops.plan.extension.implementation.builder.StringDataValue; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/ExtensionPluginTable.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/extension/ExtensionPluginTable.java similarity index 97% rename from Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/ExtensionPluginTable.java rename to Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/extension/ExtensionPluginTable.java index c888e60c8..eff41475b 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/ExtensionPluginTable.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/extension/ExtensionPluginTable.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.storage.database.sql.tables; +package com.djrapitops.plan.storage.database.sql.tables.extension; import com.djrapitops.plan.identification.ServerUUID; import com.djrapitops.plan.storage.database.DBType; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/ExtensionProviderTable.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/extension/ExtensionProviderTable.java similarity index 98% rename from Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/ExtensionProviderTable.java rename to Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/extension/ExtensionProviderTable.java index 2d84e6953..ebe476c9d 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/ExtensionProviderTable.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/extension/ExtensionProviderTable.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.storage.database.sql.tables; +package com.djrapitops.plan.storage.database.sql.tables.extension; import com.djrapitops.plan.identification.ServerUUID; import com.djrapitops.plan.storage.database.DBType; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/ExtensionServerTableValueTable.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/extension/ExtensionServerTableValueTable.java similarity index 97% rename from Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/ExtensionServerTableValueTable.java rename to Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/extension/ExtensionServerTableValueTable.java index 881ad774b..580e320b3 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/ExtensionServerTableValueTable.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/extension/ExtensionServerTableValueTable.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.storage.database.sql.tables; +package com.djrapitops.plan.storage.database.sql.tables.extension; import com.djrapitops.plan.storage.database.DBType; import com.djrapitops.plan.storage.database.sql.building.CreateTableBuilder; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/ExtensionServerValueTable.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/extension/ExtensionServerValueTable.java similarity index 97% rename from Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/ExtensionServerValueTable.java rename to Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/extension/ExtensionServerValueTable.java index cceedbfb0..27218520d 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/ExtensionServerValueTable.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/extension/ExtensionServerValueTable.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.storage.database.sql.tables; +package com.djrapitops.plan.storage.database.sql.tables.extension; import com.djrapitops.plan.extension.implementation.builder.ComponentDataValue; import com.djrapitops.plan.extension.implementation.builder.StringDataValue; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/ExtensionTabTable.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/extension/ExtensionTabTable.java similarity index 97% rename from Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/ExtensionTabTable.java rename to Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/extension/ExtensionTabTable.java index 77cb9bc39..6429cfa15 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/ExtensionTabTable.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/extension/ExtensionTabTable.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.storage.database.sql.tables; +package com.djrapitops.plan.storage.database.sql.tables.extension; import com.djrapitops.plan.extension.ElementOrder; import com.djrapitops.plan.identification.ServerUUID; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/ExtensionTableProviderTable.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/extension/ExtensionTableProviderTable.java similarity index 98% rename from Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/ExtensionTableProviderTable.java rename to Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/extension/ExtensionTableProviderTable.java index 4d68824f2..a7b9484c0 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/ExtensionTableProviderTable.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/extension/ExtensionTableProviderTable.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.storage.database.sql.tables; +package com.djrapitops.plan.storage.database.sql.tables.extension; import com.djrapitops.plan.extension.icon.Color; import com.djrapitops.plan.identification.ServerUUID; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/SecurityTable.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/webuser/SecurityTable.java similarity index 97% rename from Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/SecurityTable.java rename to Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/webuser/SecurityTable.java index adb731308..cf3680635 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/SecurityTable.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/webuser/SecurityTable.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.storage.database.sql.tables; +package com.djrapitops.plan.storage.database.sql.tables.webuser; import com.djrapitops.plan.storage.database.DBType; import com.djrapitops.plan.storage.database.sql.building.CreateTableBuilder; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/WebGroupTable.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/webuser/WebGroupTable.java similarity index 96% rename from Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/WebGroupTable.java rename to Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/webuser/WebGroupTable.java index 9bc0225eb..08f4de33d 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/WebGroupTable.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/webuser/WebGroupTable.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.storage.database.sql.tables; +package com.djrapitops.plan.storage.database.sql.tables.webuser; import com.djrapitops.plan.storage.database.DBType; import com.djrapitops.plan.storage.database.sql.building.CreateTableBuilder; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/WebGroupToPermissionTable.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/webuser/WebGroupToPermissionTable.java similarity index 96% rename from Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/WebGroupToPermissionTable.java rename to Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/webuser/WebGroupToPermissionTable.java index bd10d3ccf..d5451ba57 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/WebGroupToPermissionTable.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/webuser/WebGroupToPermissionTable.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.storage.database.sql.tables; +package com.djrapitops.plan.storage.database.sql.tables.webuser; import com.djrapitops.plan.storage.database.DBType; import com.djrapitops.plan.storage.database.sql.building.CreateTableBuilder; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/WebPermissionTable.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/webuser/WebPermissionTable.java similarity index 96% rename from Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/WebPermissionTable.java rename to Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/webuser/WebPermissionTable.java index eda690336..02173c304 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/WebPermissionTable.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/webuser/WebPermissionTable.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.storage.database.sql.tables; +package com.djrapitops.plan.storage.database.sql.tables.webuser; import com.djrapitops.plan.storage.database.DBType; import com.djrapitops.plan.storage.database.sql.building.CreateTableBuilder; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/WebUserPreferencesTable.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/webuser/WebUserPreferencesTable.java similarity index 97% rename from Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/WebUserPreferencesTable.java rename to Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/webuser/WebUserPreferencesTable.java index 06389ff35..fd6f8eb90 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/WebUserPreferencesTable.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/webuser/WebUserPreferencesTable.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.storage.database.sql.tables; +package com.djrapitops.plan.storage.database.sql.tables.webuser; import com.djrapitops.plan.storage.database.DBType; import com.djrapitops.plan.storage.database.sql.building.CreateTableBuilder; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/commands/ChangeUserUUIDTransaction.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/commands/ChangeUserUUIDTransaction.java index d85f05a44..cecc46490 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/commands/ChangeUserUUIDTransaction.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/commands/ChangeUserUUIDTransaction.java @@ -16,7 +16,11 @@ */ package com.djrapitops.plan.storage.database.transactions.commands; -import com.djrapitops.plan.storage.database.sql.tables.*; +import com.djrapitops.plan.storage.database.sql.tables.KillsTable; +import com.djrapitops.plan.storage.database.sql.tables.NicknamesTable; +import com.djrapitops.plan.storage.database.sql.tables.UsersTable; +import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionGroupsTable; +import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionPlayerTableValueTable; import com.djrapitops.plan.storage.database.transactions.ExecStatement; import com.djrapitops.plan.storage.database.transactions.Executable; import com.djrapitops.plan.storage.database.transactions.Transaction; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/commands/RemoveEverythingTransaction.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/commands/RemoveEverythingTransaction.java index 63097eee2..27cf6f549 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/commands/RemoveEverythingTransaction.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/commands/RemoveEverythingTransaction.java @@ -17,6 +17,8 @@ package com.djrapitops.plan.storage.database.transactions.commands; import com.djrapitops.plan.storage.database.sql.tables.*; +import com.djrapitops.plan.storage.database.sql.tables.extension.*; +import com.djrapitops.plan.storage.database.sql.tables.webuser.*; import com.djrapitops.plan.storage.database.transactions.events.StoreJoinAddressTransaction; import com.djrapitops.plan.storage.database.transactions.patches.Patch; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/commands/RemovePlayerTransaction.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/commands/RemovePlayerTransaction.java index 128eb0e96..ab1927b5b 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/commands/RemovePlayerTransaction.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/commands/RemovePlayerTransaction.java @@ -18,6 +18,9 @@ package com.djrapitops.plan.storage.database.transactions.commands; import com.djrapitops.plan.storage.database.queries.PlayerFetchQueries; import com.djrapitops.plan.storage.database.sql.tables.*; +import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionGroupsTable; +import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionPlayerTableValueTable; +import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionPlayerValueTable; import com.djrapitops.plan.storage.database.transactions.ExecStatement; import com.djrapitops.plan.storage.database.transactions.ThrowawayTransaction; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/commands/RemoveWebUserTransaction.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/commands/RemoveWebUserTransaction.java index c98454218..555c8f5ab 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/commands/RemoveWebUserTransaction.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/commands/RemoveWebUserTransaction.java @@ -17,7 +17,7 @@ package com.djrapitops.plan.storage.database.transactions.commands; import com.djrapitops.plan.delivery.webserver.auth.ActiveCookieStore; -import com.djrapitops.plan.storage.database.sql.tables.SecurityTable; +import com.djrapitops.plan.storage.database.sql.tables.webuser.SecurityTable; import com.djrapitops.plan.storage.database.transactions.ExecStatement; import com.djrapitops.plan.storage.database.transactions.Transaction; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/commands/StoreWebUserTransaction.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/commands/StoreWebUserTransaction.java index 6ffd0b067..f1d7a81da 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/commands/StoreWebUserTransaction.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/commands/StoreWebUserTransaction.java @@ -18,11 +18,11 @@ package com.djrapitops.plan.storage.database.transactions.commands; import com.djrapitops.plan.delivery.domain.auth.User; import com.djrapitops.plan.storage.database.queries.objects.WebUserQueries; -import com.djrapitops.plan.storage.database.sql.tables.SecurityTable; -import com.djrapitops.plan.storage.database.sql.tables.WebGroupTable; +import com.djrapitops.plan.storage.database.sql.tables.webuser.SecurityTable; +import com.djrapitops.plan.storage.database.sql.tables.webuser.WebGroupTable; import com.djrapitops.plan.storage.database.transactions.ExecStatement; -import com.djrapitops.plan.storage.database.transactions.StoreWebGroupTransaction; import com.djrapitops.plan.storage.database.transactions.Transaction; +import com.djrapitops.plan.storage.database.transactions.webuser.StoreWebGroupTransaction; import java.sql.PreparedStatement; import java.sql.SQLException; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/init/CreateTablesTransaction.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/init/CreateTablesTransaction.java index 5370436ac..6615cfe9a 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/init/CreateTablesTransaction.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/init/CreateTablesTransaction.java @@ -17,6 +17,8 @@ package com.djrapitops.plan.storage.database.transactions.init; import com.djrapitops.plan.storage.database.sql.tables.*; +import com.djrapitops.plan.storage.database.sql.tables.extension.*; +import com.djrapitops.plan.storage.database.sql.tables.webuser.*; import com.djrapitops.plan.storage.database.transactions.events.StoreJoinAddressTransaction; import com.djrapitops.plan.storage.database.transactions.patches.SecurityTableIdPatch; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/init/RemoveOldExtensionsTransaction.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/init/RemoveOldExtensionsTransaction.java index debc61c79..c952be354 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/init/RemoveOldExtensionsTransaction.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/init/RemoveOldExtensionsTransaction.java @@ -20,7 +20,7 @@ import com.djrapitops.plan.identification.ServerUUID; import com.djrapitops.plan.settings.config.ExtensionSettings; import com.djrapitops.plan.storage.database.queries.Query; import com.djrapitops.plan.storage.database.queries.QueryStatement; -import com.djrapitops.plan.storage.database.sql.tables.*; +import com.djrapitops.plan.storage.database.sql.tables.extension.*; import com.djrapitops.plan.storage.database.transactions.ExecStatement; import com.djrapitops.plan.storage.database.transactions.ThrowawayTransaction; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/ComponentColumnToExtensionDataPatch.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/ComponentColumnToExtensionDataPatch.java index 834985b5c..16f5b8cc5 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/ComponentColumnToExtensionDataPatch.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/ComponentColumnToExtensionDataPatch.java @@ -17,26 +17,26 @@ package com.djrapitops.plan.storage.database.transactions.patches; import com.djrapitops.plan.storage.database.sql.building.Sql; -import com.djrapitops.plan.storage.database.sql.tables.ExtensionPlayerValueTable; -import com.djrapitops.plan.storage.database.sql.tables.ExtensionServerValueTable; +import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionPlayerValueTable; +import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionServerValueTable; public class ComponentColumnToExtensionDataPatch extends Patch { - private static final String serverTable = ExtensionServerValueTable.TABLE_NAME; - private static final String serverColumn = ExtensionServerValueTable.COMPONENT_VALUE; - private static final String playerTable = ExtensionPlayerValueTable.TABLE_NAME; - private static final String playerColumn = ExtensionPlayerValueTable.COMPONENT_VALUE; - private static final int length = 500; + private static final String SERVER_TABLE = ExtensionServerValueTable.TABLE_NAME; + private static final String SERVER_COLUMN = ExtensionServerValueTable.COMPONENT_VALUE; + private static final String PLAYER_TABLE = ExtensionPlayerValueTable.TABLE_NAME; + private static final String PLAYER_COLUMN = ExtensionPlayerValueTable.COMPONENT_VALUE; + private static final int LENGTH = 500; @Override public boolean hasBeenApplied() { - return hasColumn(serverTable, serverColumn) - && hasColumn(playerTable, playerColumn); + return hasColumn(SERVER_TABLE, SERVER_COLUMN) + && hasColumn(PLAYER_TABLE, PLAYER_COLUMN); } @Override protected void applyPatch() { - addColumn(serverTable, serverColumn + " " + Sql.varchar(length)); - addColumn(playerTable, playerColumn + " " + Sql.varchar(length)); + addColumn(SERVER_TABLE, SERVER_COLUMN + " " + Sql.varchar(LENGTH)); + addColumn(PLAYER_TABLE, PLAYER_COLUMN + " " + Sql.varchar(LENGTH)); } } diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/ExtensionShowInPlayersTablePatch.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/ExtensionShowInPlayersTablePatch.java index d3fc5c14e..dacd43a5c 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/ExtensionShowInPlayersTablePatch.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/ExtensionShowInPlayersTablePatch.java @@ -17,7 +17,7 @@ package com.djrapitops.plan.storage.database.transactions.patches; import com.djrapitops.plan.storage.database.sql.building.Sql; -import com.djrapitops.plan.storage.database.sql.tables.ExtensionProviderTable; +import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionProviderTable; /** * Patch to add 'show_in_players_table' to 'plan_extension_providers' diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/ExtensionTableProviderFormattersPatch.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/ExtensionTableProviderFormattersPatch.java index 3538f15e8..5ec298c96 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/ExtensionTableProviderFormattersPatch.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/ExtensionTableProviderFormattersPatch.java @@ -18,7 +18,7 @@ package com.djrapitops.plan.storage.database.transactions.patches; import com.djrapitops.plan.storage.database.sql.building.Sql; -import static com.djrapitops.plan.storage.database.sql.tables.ExtensionTableProviderTable.*; +import static com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionTableProviderTable.*; /** * Adds format_1 to _5 fields to plan_extension_tables table. diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/ExtensionTableProviderValuesForPatch.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/ExtensionTableProviderValuesForPatch.java index a5553e016..22f6ebb6e 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/ExtensionTableProviderValuesForPatch.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/ExtensionTableProviderValuesForPatch.java @@ -17,11 +17,11 @@ package com.djrapitops.plan.storage.database.transactions.patches; import com.djrapitops.plan.storage.database.sql.building.Sql; -import com.djrapitops.plan.storage.database.sql.tables.ExtensionServerTableValueTable; -import com.djrapitops.plan.storage.database.sql.tables.ExtensionTableProviderTable; +import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionServerTableValueTable; +import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionTableProviderTable; import static com.djrapitops.plan.storage.database.sql.building.Sql.*; -import static com.djrapitops.plan.storage.database.sql.tables.ExtensionTableProviderTable.*; +import static com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionTableProviderTable.*; /** * Adds values_for field to plan_extension_tables diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/ExtensionTableRowValueLengthPatch.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/ExtensionTableRowValueLengthPatch.java index b89dd8e43..8670fb424 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/ExtensionTableRowValueLengthPatch.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/ExtensionTableRowValueLengthPatch.java @@ -18,8 +18,8 @@ package com.djrapitops.plan.storage.database.transactions.patches; import com.djrapitops.plan.storage.database.DBType; import com.djrapitops.plan.storage.database.sql.building.Sql; -import com.djrapitops.plan.storage.database.sql.tables.ExtensionPlayerTableValueTable; -import com.djrapitops.plan.storage.database.sql.tables.ExtensionServerTableValueTable; +import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionPlayerTableValueTable; +import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionServerTableValueTable; /** * Increases the length of Strings in extension tables to 250 to avoid cutoffs and exceptions. diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/LegacyPermissionLevelGroupsPatch.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/LegacyPermissionLevelGroupsPatch.java index 9f7e5bb36..2ae2b2fda 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/LegacyPermissionLevelGroupsPatch.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/LegacyPermissionLevelGroupsPatch.java @@ -18,8 +18,8 @@ package com.djrapitops.plan.storage.database.transactions.patches; import com.djrapitops.plan.delivery.domain.auth.WebPermission; import com.djrapitops.plan.storage.database.queries.objects.WebUserQueries; -import com.djrapitops.plan.storage.database.sql.tables.SecurityTable; -import com.djrapitops.plan.storage.database.transactions.StoreWebGroupTransaction; +import com.djrapitops.plan.storage.database.sql.tables.webuser.SecurityTable; +import com.djrapitops.plan.storage.database.transactions.webuser.StoreWebGroupTransaction; import java.util.Arrays; import java.util.Collections; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/LinkUsersToPlayersSecurityTablePatch.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/LinkUsersToPlayersSecurityTablePatch.java index 21cd30436..cf74586dc 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/LinkUsersToPlayersSecurityTablePatch.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/LinkUsersToPlayersSecurityTablePatch.java @@ -19,8 +19,8 @@ package com.djrapitops.plan.storage.database.transactions.patches; import com.djrapitops.plan.storage.database.queries.HasMoreThanZeroQueryStatement; import com.djrapitops.plan.storage.database.queries.QueryAllStatement; import com.djrapitops.plan.storage.database.sql.building.Sql; -import com.djrapitops.plan.storage.database.sql.tables.SecurityTable; import com.djrapitops.plan.storage.database.sql.tables.UsersTable; +import com.djrapitops.plan.storage.database.sql.tables.webuser.SecurityTable; import com.djrapitops.plan.storage.database.transactions.ExecBatchStatement; import java.sql.PreparedStatement; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/LinkedToSecurityTablePatch.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/LinkedToSecurityTablePatch.java index 937835966..120add9d2 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/LinkedToSecurityTablePatch.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/LinkedToSecurityTablePatch.java @@ -17,7 +17,7 @@ package com.djrapitops.plan.storage.database.transactions.patches; import com.djrapitops.plan.storage.database.sql.building.Sql; -import com.djrapitops.plan.storage.database.sql.tables.SecurityTable; +import com.djrapitops.plan.storage.database.sql.tables.webuser.SecurityTable; /** * Adds linked_to_uuid field to plan_security table that stores web users. diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/LitebansTableHeaderPatch.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/LitebansTableHeaderPatch.java index e5749b9dc..19f8fbee7 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/LitebansTableHeaderPatch.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/LitebansTableHeaderPatch.java @@ -17,9 +17,9 @@ package com.djrapitops.plan.storage.database.transactions.patches; import com.djrapitops.plan.storage.database.queries.QueryStatement; -import com.djrapitops.plan.storage.database.sql.tables.ExtensionPluginTable; -import com.djrapitops.plan.storage.database.sql.tables.ExtensionServerTableValueTable; -import com.djrapitops.plan.storage.database.sql.tables.ExtensionTableProviderTable; +import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionPluginTable; +import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionServerTableValueTable; +import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionTableProviderTable; import com.djrapitops.plan.storage.database.transactions.ExecBatchStatement; import java.sql.PreparedStatement; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/PlayerTableRowPatch.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/PlayerTableRowPatch.java index 595588720..4dcc530fc 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/PlayerTableRowPatch.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/PlayerTableRowPatch.java @@ -30,8 +30,8 @@ import java.util.List; import java.util.Map; import static com.djrapitops.plan.storage.database.sql.building.Sql.*; -import static com.djrapitops.plan.storage.database.sql.tables.ExtensionPlayerTableValueTable.ID; -import static com.djrapitops.plan.storage.database.sql.tables.ExtensionPlayerTableValueTable.*; +import static com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionPlayerTableValueTable.ID; +import static com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionPlayerTableValueTable.*; public class PlayerTableRowPatch extends Patch { diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/SecurityTableGroupPatch.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/SecurityTableGroupPatch.java index f0567e808..c71c3aa6f 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/SecurityTableGroupPatch.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/SecurityTableGroupPatch.java @@ -18,8 +18,8 @@ package com.djrapitops.plan.storage.database.transactions.patches; import com.djrapitops.plan.exceptions.database.DBOpException; import com.djrapitops.plan.storage.database.DBType; -import com.djrapitops.plan.storage.database.sql.tables.SecurityTable; -import com.djrapitops.plan.storage.database.sql.tables.WebGroupTable; +import com.djrapitops.plan.storage.database.sql.tables.webuser.SecurityTable; +import com.djrapitops.plan.storage.database.sql.tables.webuser.WebGroupTable; import static com.djrapitops.plan.storage.database.sql.building.Sql.*; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/SecurityTableIdPatch.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/SecurityTableIdPatch.java index 95d354270..167683d35 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/SecurityTableIdPatch.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/SecurityTableIdPatch.java @@ -18,7 +18,7 @@ package com.djrapitops.plan.storage.database.transactions.patches; import com.djrapitops.plan.exceptions.database.DBOpException; import com.djrapitops.plan.storage.database.sql.building.CreateTableBuilder; -import com.djrapitops.plan.storage.database.sql.tables.SecurityTable; +import com.djrapitops.plan.storage.database.sql.tables.webuser.SecurityTable; import static com.djrapitops.plan.storage.database.sql.building.Sql.*; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/ServerTableRowPatch.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/ServerTableRowPatch.java index bb3a697af..f0d74254e 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/ServerTableRowPatch.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/ServerTableRowPatch.java @@ -30,8 +30,8 @@ import java.util.List; import java.util.Map; import static com.djrapitops.plan.storage.database.sql.building.Sql.*; -import static com.djrapitops.plan.storage.database.sql.tables.ExtensionServerTableValueTable.ID; -import static com.djrapitops.plan.storage.database.sql.tables.ExtensionServerTableValueTable.*; +import static com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionServerTableValueTable.ID; +import static com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionServerTableValueTable.*; public class ServerTableRowPatch extends Patch { diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/UpdateWebPermissionsPatch.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/UpdateWebPermissionsPatch.java index 6b07c7494..c10192675 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/UpdateWebPermissionsPatch.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/UpdateWebPermissionsPatch.java @@ -18,7 +18,7 @@ package com.djrapitops.plan.storage.database.transactions.patches; import com.djrapitops.plan.delivery.domain.auth.WebPermission; import com.djrapitops.plan.storage.database.queries.objects.WebUserQueries; -import com.djrapitops.plan.storage.database.sql.tables.WebPermissionTable; +import com.djrapitops.plan.storage.database.sql.tables.webuser.WebPermissionTable; import com.djrapitops.plan.storage.database.transactions.ExecBatchStatement; import java.sql.PreparedStatement; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/WebGroupAddMissingAdminGroupPatch.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/WebGroupAddMissingAdminGroupPatch.java index 02577404d..e7e748785 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/WebGroupAddMissingAdminGroupPatch.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/WebGroupAddMissingAdminGroupPatch.java @@ -18,7 +18,7 @@ package com.djrapitops.plan.storage.database.transactions.patches; import com.djrapitops.plan.delivery.domain.auth.WebPermission; import com.djrapitops.plan.storage.database.queries.objects.WebUserQueries; -import com.djrapitops.plan.storage.database.transactions.StoreWebGroupTransaction; +import com.djrapitops.plan.storage.database.transactions.webuser.StoreWebGroupTransaction; import java.util.Arrays; import java.util.stream.Collectors; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/WebGroupDefaultGroupsPatch.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/WebGroupDefaultGroupsPatch.java index 6003383c1..ef0a3d9ab 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/WebGroupDefaultGroupsPatch.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/WebGroupDefaultGroupsPatch.java @@ -18,7 +18,7 @@ package com.djrapitops.plan.storage.database.transactions.patches; import com.djrapitops.plan.delivery.domain.auth.WebPermission; import com.djrapitops.plan.storage.database.queries.objects.WebUserQueries; -import com.djrapitops.plan.storage.database.transactions.StoreWebGroupTransaction; +import com.djrapitops.plan.storage.database.transactions.webuser.StoreWebGroupTransaction; import java.util.Arrays; import java.util.Collections; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/DeleteWebGroupTransaction.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/webuser/DeleteWebGroupTransaction.java similarity index 89% rename from Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/DeleteWebGroupTransaction.java rename to Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/webuser/DeleteWebGroupTransaction.java index 5c5ad948a..cf03c543b 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/DeleteWebGroupTransaction.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/webuser/DeleteWebGroupTransaction.java @@ -14,12 +14,14 @@ * You should have received a copy of the GNU Lesser General Public License * along with Plan. If not, see . */ -package com.djrapitops.plan.storage.database.transactions; +package com.djrapitops.plan.storage.database.transactions.webuser; import com.djrapitops.plan.exceptions.database.DBOpException; -import com.djrapitops.plan.storage.database.sql.tables.SecurityTable; -import com.djrapitops.plan.storage.database.sql.tables.WebGroupTable; -import com.djrapitops.plan.storage.database.sql.tables.WebGroupToPermissionTable; +import com.djrapitops.plan.storage.database.sql.tables.webuser.SecurityTable; +import com.djrapitops.plan.storage.database.sql.tables.webuser.WebGroupTable; +import com.djrapitops.plan.storage.database.sql.tables.webuser.WebGroupToPermissionTable; +import com.djrapitops.plan.storage.database.transactions.ExecStatement; +import com.djrapitops.plan.storage.database.transactions.Transaction; import com.djrapitops.plan.utilities.dev.Untrusted; import org.intellij.lang.annotations.Language; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/GrantWebPermissionToGroupsWithPermissionTransaction.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/webuser/GrantWebPermissionToGroupsWithPermissionTransaction.java similarity index 90% rename from Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/GrantWebPermissionToGroupsWithPermissionTransaction.java rename to Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/webuser/GrantWebPermissionToGroupsWithPermissionTransaction.java index a03dcf4e8..b32fda15b 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/GrantWebPermissionToGroupsWithPermissionTransaction.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/webuser/GrantWebPermissionToGroupsWithPermissionTransaction.java @@ -14,11 +14,13 @@ * You should have received a copy of the GNU Lesser General Public License * along with Plan. If not, see . */ -package com.djrapitops.plan.storage.database.transactions; +package com.djrapitops.plan.storage.database.transactions.webuser; import com.djrapitops.plan.exceptions.database.DBOpException; import com.djrapitops.plan.storage.database.queries.objects.WebUserQueries; -import com.djrapitops.plan.storage.database.sql.tables.WebGroupToPermissionTable; +import com.djrapitops.plan.storage.database.sql.tables.webuser.WebGroupToPermissionTable; +import com.djrapitops.plan.storage.database.transactions.ExecBatchStatement; +import com.djrapitops.plan.storage.database.transactions.Transaction; import org.intellij.lang.annotations.Language; import java.sql.PreparedStatement; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/StoreMissingWebPermissionsTransaction.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/webuser/StoreMissingWebPermissionsTransaction.java similarity index 87% rename from Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/StoreMissingWebPermissionsTransaction.java rename to Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/webuser/StoreMissingWebPermissionsTransaction.java index 002b6ba6e..ef1811bdd 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/StoreMissingWebPermissionsTransaction.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/webuser/StoreMissingWebPermissionsTransaction.java @@ -14,10 +14,12 @@ * You should have received a copy of the GNU Lesser General Public License * along with Plan. If not, see . */ -package com.djrapitops.plan.storage.database.transactions; +package com.djrapitops.plan.storage.database.transactions.webuser; import com.djrapitops.plan.storage.database.queries.objects.WebUserQueries; -import com.djrapitops.plan.storage.database.sql.tables.WebPermissionTable; +import com.djrapitops.plan.storage.database.sql.tables.webuser.WebPermissionTable; +import com.djrapitops.plan.storage.database.transactions.ExecBatchStatement; +import com.djrapitops.plan.storage.database.transactions.Transaction; import java.sql.PreparedStatement; import java.sql.SQLException; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/StoreWebGroupTransaction.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/webuser/StoreWebGroupTransaction.java similarity index 88% rename from Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/StoreWebGroupTransaction.java rename to Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/webuser/StoreWebGroupTransaction.java index d2188bc62..3444e1665 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/StoreWebGroupTransaction.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/webuser/StoreWebGroupTransaction.java @@ -14,11 +14,14 @@ * You should have received a copy of the GNU Lesser General Public License * along with Plan. If not, see . */ -package com.djrapitops.plan.storage.database.transactions; +package com.djrapitops.plan.storage.database.transactions.webuser; import com.djrapitops.plan.storage.database.queries.objects.WebUserQueries; -import com.djrapitops.plan.storage.database.sql.tables.WebGroupTable; -import com.djrapitops.plan.storage.database.sql.tables.WebGroupToPermissionTable; +import com.djrapitops.plan.storage.database.sql.tables.webuser.WebGroupTable; +import com.djrapitops.plan.storage.database.sql.tables.webuser.WebGroupToPermissionTable; +import com.djrapitops.plan.storage.database.transactions.ExecBatchStatement; +import com.djrapitops.plan.storage.database.transactions.ExecStatement; +import com.djrapitops.plan.storage.database.transactions.Transaction; import java.sql.PreparedStatement; import java.sql.SQLException; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/StoreWebUserPreferencesTransaction.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/webuser/StoreWebUserPreferencesTransaction.java similarity index 87% rename from Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/StoreWebUserPreferencesTransaction.java rename to Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/webuser/StoreWebUserPreferencesTransaction.java index 1468dcd72..fb4e7d3dc 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/StoreWebUserPreferencesTransaction.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/webuser/StoreWebUserPreferencesTransaction.java @@ -14,10 +14,12 @@ * You should have received a copy of the GNU Lesser General Public License * along with Plan. If not, see . */ -package com.djrapitops.plan.storage.database.transactions; +package com.djrapitops.plan.storage.database.transactions.webuser; import com.djrapitops.plan.delivery.web.resolver.request.WebUser; -import com.djrapitops.plan.storage.database.sql.tables.WebUserPreferencesTable; +import com.djrapitops.plan.storage.database.sql.tables.webuser.WebUserPreferencesTable; +import com.djrapitops.plan.storage.database.transactions.ExecStatement; +import com.djrapitops.plan.storage.database.transactions.Transaction; import com.djrapitops.plan.utilities.dev.Untrusted; import java.sql.PreparedStatement; diff --git a/Plan/common/src/test/java/com/djrapitops/plan/delivery/webserver/AccessControlTest.java b/Plan/common/src/test/java/com/djrapitops/plan/delivery/webserver/AccessControlTest.java index 60ab359a9..f210f5fe3 100644 --- a/Plan/common/src/test/java/com/djrapitops/plan/delivery/webserver/AccessControlTest.java +++ b/Plan/common/src/test/java/com/djrapitops/plan/delivery/webserver/AccessControlTest.java @@ -27,9 +27,9 @@ import com.djrapitops.plan.settings.config.paths.WebserverSettings; import com.djrapitops.plan.storage.database.Database; import com.djrapitops.plan.storage.database.queries.ExtensionsDatabaseTest; import com.djrapitops.plan.storage.database.transactions.StoreServerInformationTransaction; -import com.djrapitops.plan.storage.database.transactions.StoreWebGroupTransaction; import com.djrapitops.plan.storage.database.transactions.commands.StoreWebUserTransaction; import com.djrapitops.plan.storage.database.transactions.events.PlayerRegisterTransaction; +import com.djrapitops.plan.storage.database.transactions.webuser.StoreWebGroupTransaction; import com.djrapitops.plan.utilities.PassEncryptUtil; import org.apache.commons.compress.utils.IOUtils; import org.apache.commons.lang3.StringUtils; diff --git a/Plan/common/src/test/java/com/djrapitops/plan/delivery/webserver/AccessControlVisibilityTest.java b/Plan/common/src/test/java/com/djrapitops/plan/delivery/webserver/AccessControlVisibilityTest.java index 994d4891f..861fee81e 100644 --- a/Plan/common/src/test/java/com/djrapitops/plan/delivery/webserver/AccessControlVisibilityTest.java +++ b/Plan/common/src/test/java/com/djrapitops/plan/delivery/webserver/AccessControlVisibilityTest.java @@ -29,9 +29,9 @@ import com.djrapitops.plan.settings.config.paths.DisplaySettings; import com.djrapitops.plan.settings.config.paths.WebserverSettings; import com.djrapitops.plan.storage.database.Database; import com.djrapitops.plan.storage.database.transactions.StoreServerInformationTransaction; -import com.djrapitops.plan.storage.database.transactions.StoreWebGroupTransaction; import com.djrapitops.plan.storage.database.transactions.commands.StoreWebUserTransaction; import com.djrapitops.plan.storage.database.transactions.events.StoreServerPlayerTransaction; +import com.djrapitops.plan.storage.database.transactions.webuser.StoreWebGroupTransaction; import com.djrapitops.plan.utilities.PassEncryptUtil; import extension.FullSystemExtension; import extension.SeleniumExtension; diff --git a/Plan/common/src/test/java/com/djrapitops/plan/storage/database/DBPatchRegressionTest.java b/Plan/common/src/test/java/com/djrapitops/plan/storage/database/DBPatchRegressionTest.java index d704888f1..63e298551 100644 --- a/Plan/common/src/test/java/com/djrapitops/plan/storage/database/DBPatchRegressionTest.java +++ b/Plan/common/src/test/java/com/djrapitops/plan/storage/database/DBPatchRegressionTest.java @@ -17,6 +17,8 @@ package com.djrapitops.plan.storage.database; import com.djrapitops.plan.storage.database.sql.tables.*; +import com.djrapitops.plan.storage.database.sql.tables.extension.*; +import com.djrapitops.plan.storage.database.sql.tables.webuser.SecurityTable; import com.djrapitops.plan.storage.database.transactions.Transaction; import com.djrapitops.plan.storage.database.transactions.patches.Patch; import utilities.TestConstants; diff --git a/Plan/common/src/test/java/com/djrapitops/plan/storage/database/queries/DatabaseBackupTest.java b/Plan/common/src/test/java/com/djrapitops/plan/storage/database/queries/DatabaseBackupTest.java index 17fa5f87b..b9d7e7dd1 100644 --- a/Plan/common/src/test/java/com/djrapitops/plan/storage/database/queries/DatabaseBackupTest.java +++ b/Plan/common/src/test/java/com/djrapitops/plan/storage/database/queries/DatabaseBackupTest.java @@ -27,9 +27,9 @@ import com.djrapitops.plan.storage.database.DatabaseTestPreparer; import com.djrapitops.plan.storage.database.SQLiteDB; import com.djrapitops.plan.storage.database.queries.objects.*; import com.djrapitops.plan.storage.database.transactions.BackupCopyTransaction; -import com.djrapitops.plan.storage.database.transactions.StoreWebUserPreferencesTransaction; import com.djrapitops.plan.storage.database.transactions.commands.StoreWebUserTransaction; import com.djrapitops.plan.storage.database.transactions.events.*; +import com.djrapitops.plan.storage.database.transactions.webuser.StoreWebUserPreferencesTransaction; import com.djrapitops.plan.utilities.PassEncryptUtil; import com.google.common.util.concurrent.MoreExecutors; import com.google.gson.Gson; diff --git a/Plan/common/src/test/java/com/djrapitops/plan/storage/database/queries/WebUserQueriesTest.java b/Plan/common/src/test/java/com/djrapitops/plan/storage/database/queries/WebUserQueriesTest.java index a5ec1cfe5..a5b78c193 100644 --- a/Plan/common/src/test/java/com/djrapitops/plan/storage/database/queries/WebUserQueriesTest.java +++ b/Plan/common/src/test/java/com/djrapitops/plan/storage/database/queries/WebUserQueriesTest.java @@ -26,11 +26,11 @@ import com.djrapitops.plan.processing.Processing; import com.djrapitops.plan.settings.config.PlanConfig; import com.djrapitops.plan.storage.database.DatabaseTestPreparer; import com.djrapitops.plan.storage.database.queries.objects.WebUserQueries; -import com.djrapitops.plan.storage.database.transactions.*; import com.djrapitops.plan.storage.database.transactions.commands.RemoveEverythingTransaction; import com.djrapitops.plan.storage.database.transactions.commands.RemoveWebUserTransaction; import com.djrapitops.plan.storage.database.transactions.commands.StoreWebUserTransaction; import com.djrapitops.plan.storage.database.transactions.patches.WebGroupDefaultGroupsPatch; +import com.djrapitops.plan.storage.database.transactions.webuser.*; import com.djrapitops.plan.utilities.PassEncryptUtil; import com.google.gson.Gson; import org.junit.jupiter.api.DisplayName;