Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-09-27 22:17:32 +02:00
Code Issues Projects Releases Wiki Activity

Interface redesign package restructuring (#1146)

Browse Source 
* command.commands -> command.subcommands

* command -> commands

* commands -> system.commands

* system.locale -> system.settings.locale

* system.settings.changes -> system.settings.config.changes

* system.settings.paths -> system.settings.config.paths

* system.database -> system.storage.database

* db -> system.storage.database

* system.storage.database.access.queries -> system.storage.database.queries

* system.storage.database.access.transactions -> system.storage.database.transactions

* system.storage.database.access -> system.storage.database.operation

* Moved Query classes to system.storage.database.queries

* Moved Executable classes to system.storage.database.transactions

* system.storage.database.patches -> system.storage.database.transactions.patches

* system.file -> system.storage.file

* system.settings.upkeep

* system.storage.upkeep

* system.server.info -> system.identification

* system.importing -> system.gathering.importing

* system.listeners -> system.gathering.listeners

* system.gathering.timed

* Removed duplicate class

* data.container -> system.gathering.domain

* data.plugin.PluginsConfigSection -> system.settings.config.ExtensionSettings

* data.time -> system.gathering.domain

* system.afk -> system.gathering.afk

* system.cache -> system.gathering.cache

* system.status -> system.gathering.listeners

* system.export -> system.delivery.export

* system.webserver -> system.delivery.webserver

* system.json -> system.delivery.rendering.json

* utilities.html -> system.delivery.rendering.html

* system.delivery.rendering.html.graphs -> system.delivery.rendering.json.graphs

* system.delivery.rendering.html.pages -> system.delivery.rendering.pages

* system.delivery.upkeep

* utilities.file -> system.settings.upkeep

* data.store -> system.delivery.domain

* system.update -> system.version

* api.exceptions -> exceptions

* ShutdownHook -> system.gathering

* system.HtmlUtilities - > system.delivery.DeliveryUtilities

* PeriodicAnalysisTask -> PeriodicServerExportTask

* Deprecated APIv4 classes

* Removed ServerTaskSystem (Reduces headache)

* Moved & Fixed some tests
This commit is contained in:
Risto Lahtela 2019-08-30 12:36:38 +03:00 committed by Rsl1122
parent 6937d18994
commit 0650f3e338
664 changed files with 3404 additions and 3472 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Plan/bukkit/src/main/java/com/djrapitops/plan/BukkitServerShutdownSave.java
View File

@ -16,8 +16,9 @@
*/
package com.djrapitops.plan;
import com.djrapitops.plan.system.database.DBSystem;
import com.djrapitops.plan.system.locale.Locale;
import com.djrapitops.plan.system.gathering.ServerShutdownSave;
import com.djrapitops.plan.system.settings.locale.Locale;
import com.djrapitops.plan.system.storage.database.DBSystem;
import com.djrapitops.plan.utilities.java.Reflection;
import com.djrapitops.plugin.logging.console.PluginLogger;
import com.djrapitops.plugin.logging.error.ErrorHandler;

9
Plan/bukkit/src/main/java/com/djrapitops/plan/Plan.java
View File

@ -16,11 +16,12 @@
*/
package com.djrapitops.plan;
import com.djrapitops.plan.api.exceptions.EnableException;
import com.djrapitops.plan.command.PlanCommand;
import com.djrapitops.plan.exceptions.EnableException;
import com.djrapitops.plan.system.PlanSystem;
import com.djrapitops.plan.system.locale.Locale;
import com.djrapitops.plan.system.locale.lang.PluginLang;
import com.djrapitops.plan.system.commands.PlanCommand;
import com.djrapitops.plan.system.gathering.ServerShutdownSave;
import com.djrapitops.plan.system.settings.locale.Locale;
import com.djrapitops.plan.system.settings.locale.lang.PluginLang;
import com.djrapitops.plan.system.settings.theme.PlanColorScheme;
import com.djrapitops.plugin.BukkitPlugin;
import com.djrapitops.plugin.benchmarking.Benchmark;

3
Plan/bukkit/src/main/java/com/djrapitops/plan/PlanBukkitComponent.java
View File

@ -16,7 +16,6 @@
*/
package com.djrapitops.plan;
import com.djrapitops.plan.command.PlanCommand;
import com.djrapitops.plan.modules.APFModule;
import com.djrapitops.plan.modules.FilesModule;
import com.djrapitops.plan.modules.ServerSuperClassBindingModule;
@ -25,6 +24,8 @@ import com.djrapitops.plan.modules.bukkit.BukkitPlanModule;
import com.djrapitops.plan.modules.bukkit.BukkitServerPropertiesModule;
import com.djrapitops.plan.modules.bukkit.BukkitSuperClassBindingModule;
import com.djrapitops.plan.system.PlanSystem;
import com.djrapitops.plan.system.commands.PlanCommand;
import com.djrapitops.plan.system.gathering.ServerShutdownSave;
import dagger.BindsInstance;
import dagger.Component;

2
Plan/bukkit/src/main/java/com/djrapitops/plan/modules/bukkit/BukkitPlanModule.java
View File

@ -18,7 +18,7 @@ package com.djrapitops.plan.modules.bukkit;
import com.djrapitops.plan.Plan;
import com.djrapitops.plan.PlanPlugin;
import com.djrapitops.plan.command.PlanCommand;
import com.djrapitops.plan.system.commands.PlanCommand;
import com.djrapitops.plugin.command.CommandNode;
import dagger.Binds;
import dagger.Module;

4
Plan/bukkit/src/main/java/com/djrapitops/plan/modules/bukkit/BukkitServerPropertiesModule.java
View File

@ -17,8 +17,8 @@
package com.djrapitops.plan.modules.bukkit;
import com.djrapitops.plan.Plan;
import com.djrapitops.plan.system.info.server.properties.BukkitServerProperties;
import com.djrapitops.plan.system.info.server.properties.ServerProperties;
import com.djrapitops.plan.system.identification.properties.BukkitServerProperties;
import com.djrapitops.plan.system.identification.properties.ServerProperties;
import dagger.Module;
import dagger.Provides;

20
Plan/bukkit/src/main/java/com/djrapitops/plan/modules/bukkit/BukkitSuperClassBindingModule.java
View File

@ -17,19 +17,19 @@
package com.djrapitops.plan.modules.bukkit;
import com.djrapitops.plan.BukkitServerShutdownSave;
import com.djrapitops.plan.ServerShutdownSave;
import com.djrapitops.plan.system.database.BukkitDBSystem;
import com.djrapitops.plan.system.database.DBSystem;
import com.djrapitops.plan.system.importing.BukkitImportSystem;
import com.djrapitops.plan.system.importing.ImportSystem;
import com.djrapitops.plan.system.info.server.ServerInfo;
import com.djrapitops.plan.system.info.server.ServerServerInfo;
import com.djrapitops.plan.system.listeners.BukkitListenerSystem;
import com.djrapitops.plan.system.listeners.ListenerSystem;
import com.djrapitops.plan.system.TaskSystem;
import com.djrapitops.plan.system.gathering.ServerShutdownSave;
import com.djrapitops.plan.system.gathering.importing.BukkitImportSystem;
import com.djrapitops.plan.system.gathering.importing.ImportSystem;
import com.djrapitops.plan.system.gathering.listeners.BukkitListenerSystem;
import com.djrapitops.plan.system.gathering.listeners.ListenerSystem;
import com.djrapitops.plan.system.identification.ServerInfo;
import com.djrapitops.plan.system.identification.ServerServerInfo;
import com.djrapitops.plan.system.settings.BukkitConfigSystem;
import com.djrapitops.plan.system.settings.ConfigSystem;
import com.djrapitops.plan.system.storage.database.BukkitDBSystem;
import com.djrapitops.plan.system.storage.database.DBSystem;
import com.djrapitops.plan.system.tasks.BukkitTaskSystem;
import com.djrapitops.plan.system.tasks.TaskSystem;
import dagger.Binds;
import dagger.Module;

4
Plan/bukkit/src/main/java/com/djrapitops/plan/system/importing/BukkitImportSystem.java → Plan/bukkit/src/main/java/com/djrapitops/plan/system/gathering/importing/BukkitImportSystem.java
View File

@ -14,9 +14,9 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Plan. If not, see <https://www.gnu.org/licenses/>.
*/
package com.djrapitops.plan.system.importing;
package com.djrapitops.plan.system.gathering.importing;
import com.djrapitops.plan.system.importing.importers.OfflinePlayerImporter;
import com.djrapitops.plan.system.gathering.importing.importers.OfflinePlayerImporter;
import javax.inject.Inject;
import javax.inject.Singleton;

2
Plan/bukkit/src/main/java/com/djrapitops/plan/system/importing/data/BukkitUserImportRefiner.java → Plan/bukkit/src/main/java/com/djrapitops/plan/system/gathering/importing/data/BukkitUserImportRefiner.java
View File

@ -14,7 +14,7 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Plan. If not, see <https://www.gnu.org/licenses/>.
*/
package com.djrapitops.plan.system.importing.data;
package com.djrapitops.plan.system.gathering.importing.data;
import com.djrapitops.plan.Plan;
import com.djrapitops.plan.system.DebugChannels;

30
Plan/bukkit/src/main/java/com/djrapitops/plan/system/importing/importers/BukkitImporter.java → Plan/bukkit/src/main/java/com/djrapitops/plan/system/gathering/importing/importers/BukkitImporter.java
View File

@ -14,25 +14,21 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Plan. If not, see <https://www.gnu.org/licenses/>.
*/
package com.djrapitops.plan.system.importing.importers;
package com.djrapitops.plan.system.gathering.importing.importers;
import com.djrapitops.plan.Plan;
import com.djrapitops.plan.data.container.BaseUser;
import com.djrapitops.plan.data.container.GeoInfo;
import com.djrapitops.plan.data.container.Session;
import com.djrapitops.plan.data.container.UserInfo;
import com.djrapitops.plan.data.store.objects.Nickname;
import com.djrapitops.plan.data.time.WorldTimes;
import com.djrapitops.plan.db.Database;
import com.djrapitops.plan.db.access.queries.LargeStoreQueries;
import com.djrapitops.plan.db.access.queries.objects.UserIdentifierQueries;
import com.djrapitops.plan.db.access.transactions.Transaction;
import com.djrapitops.plan.system.cache.GeolocationCache;
import com.djrapitops.plan.system.database.DBSystem;
import com.djrapitops.plan.system.importing.data.BukkitUserImportRefiner;
import com.djrapitops.plan.system.importing.data.ServerImportData;
import com.djrapitops.plan.system.importing.data.UserImportData;
import com.djrapitops.plan.system.info.server.ServerInfo;
import com.djrapitops.plan.system.delivery.domain.Nickname;
import com.djrapitops.plan.system.gathering.cache.GeolocationCache;
import com.djrapitops.plan.system.gathering.domain.*;
import com.djrapitops.plan.system.gathering.importing.data.BukkitUserImportRefiner;
import com.djrapitops.plan.system.gathering.importing.data.ServerImportData;
import com.djrapitops.plan.system.gathering.importing.data.UserImportData;
import com.djrapitops.plan.system.identification.ServerInfo;
import com.djrapitops.plan.system.storage.database.DBSystem;
import com.djrapitops.plan.system.storage.database.Database;
import com.djrapitops.plan.system.storage.database.queries.LargeStoreQueries;
import com.djrapitops.plan.system.storage.database.queries.objects.UserIdentifierQueries;
import com.djrapitops.plan.system.storage.database.transactions.Transaction;
import com.djrapitops.plugin.utilities.Verify;
import java.util.*;

12
Plan/bukkit/src/main/java/com/djrapitops/plan/system/importing/importers/OfflinePlayerImporter.java → Plan/bukkit/src/main/java/com/djrapitops/plan/system/gathering/importing/importers/OfflinePlayerImporter.java
View File

@ -14,14 +14,14 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Plan. If not, see <https://www.gnu.org/licenses/>.
*/
package com.djrapitops.plan.system.importing.importers;
package com.djrapitops.plan.system.gathering.importing.importers;
import com.djrapitops.plan.Plan;
import com.djrapitops.plan.system.cache.GeolocationCache;
import com.djrapitops.plan.system.database.DBSystem;
import com.djrapitops.plan.system.importing.data.ServerImportData;
import com.djrapitops.plan.system.importing.data.UserImportData;
import com.djrapitops.plan.system.info.server.ServerInfo;
import com.djrapitops.plan.system.gathering.cache.GeolocationCache;
import com.djrapitops.plan.system.gathering.importing.data.ServerImportData;
import com.djrapitops.plan.system.gathering.importing.data.UserImportData;
import com.djrapitops.plan.system.identification.ServerInfo;
import com.djrapitops.plan.system.storage.database.DBSystem;
import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;

9
Plan/bukkit/src/main/java/com/djrapitops/plan/system/listeners/BukkitListenerSystem.java → Plan/bukkit/src/main/java/com/djrapitops/plan/system/gathering/listeners/BukkitListenerSystem.java
View File

@ -14,14 +14,13 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Plan. If not, see <https://www.gnu.org/licenses/>.
*/
package com.djrapitops.plan.system.listeners;
package com.djrapitops.plan.system.gathering.listeners;
import com.djrapitops.plan.Plan;
import com.djrapitops.plan.PlanPlugin;
import com.djrapitops.plan.api.events.PlanBukkitEnableEvent;
import com.djrapitops.plan.capability.CapabilityServiceImplementation;
import com.djrapitops.plan.system.listeners.bukkit.*;
import com.djrapitops.plan.system.status.Status;
import com.djrapitops.plan.system.gathering.listeners.bukkit.*;
import org.bukkit.Bukkit;
import org.bukkit.event.HandlerList;
@ -38,7 +37,7 @@ public class BukkitListenerSystem extends ListenerSystem {
private final WorldChangeListener worldChangeListener;
private final CommandListener commandListener;
private final DeathEventListener deathEventListener;
private final AFKListener afkListener;
private final BukkitAFKListener afkListener;
@Inject
public BukkitListenerSystem(Plan plugin,
@ -49,7 +48,7 @@ public class BukkitListenerSystem extends ListenerSystem {
WorldChangeListener worldChangeListener,
CommandListener commandListener,
DeathEventListener deathEventListener,
AFKListener afkListener
BukkitAFKListener afkListener
) {
this.plugin = plugin;
this.status = status;

10
Plan/bukkit/src/main/java/com/djrapitops/plan/system/listeners/bukkit/AFKListener.java → Plan/bukkit/src/main/java/com/djrapitops/plan/system/gathering/listeners/bukkit/BukkitAFKListener.java
View File

@ -14,9 +14,9 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Plan. If not, see <https://www.gnu.org/licenses/>.
*/
package com.djrapitops.plan.system.listeners.bukkit;
package com.djrapitops.plan.system.gathering.listeners.bukkit;
import com.djrapitops.plan.system.afk.AFKTracker;
import com.djrapitops.plan.system.gathering.afk.AFKTracker;
import com.djrapitops.plan.system.settings.Permissions;
import com.djrapitops.plan.system.settings.config.PlanConfig;
import com.djrapitops.plugin.logging.L;
@ -40,7 +40,7 @@ import java.util.UUID;
* @author Rsl1122
* @see PlayerOnlineListener
*/
public class AFKListener implements Listener {
public class BukkitAFKListener implements Listener {
// Static so that /reload does not cause afk tracking to fail.
static AFKTracker AFK_TRACKER;
@ -49,11 +49,11 @@ public class AFKListener implements Listener {
private final ErrorHandler errorHandler;
@Inject
public AFKListener(PlanConfig config, ErrorHandler errorHandler) {
public BukkitAFKListener(PlanConfig config, ErrorHandler errorHandler) {
this.errorHandler = errorHandler;
this.ignorePermissionInfo = new HashMap<>();
AFKListener.assignAFKTracker(config);
BukkitAFKListener.assignAFKTracker(config);
}
private static void assignAFKTracker(PlanConfig config) {

12
Plan/bukkit/src/main/java/com/djrapitops/plan/system/listeners/bukkit/ChatListener.java → Plan/bukkit/src/main/java/com/djrapitops/plan/system/gathering/listeners/bukkit/ChatListener.java
View File

@ -14,13 +14,13 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Plan. If not, see <https://www.gnu.org/licenses/>.
*/
package com.djrapitops.plan.system.listeners.bukkit;
package com.djrapitops.plan.system.gathering.listeners.bukkit;
import com.djrapitops.plan.data.store.objects.Nickname;
import com.djrapitops.plan.db.access.transactions.events.NicknameStoreTransaction;
import com.djrapitops.plan.system.cache.NicknameCache;
import com.djrapitops.plan.system.database.DBSystem;
import com.djrapitops.plan.system.info.server.ServerInfo;
import com.djrapitops.plan.system.delivery.domain.Nickname;
import com.djrapitops.plan.system.gathering.cache.NicknameCache;
import com.djrapitops.plan.system.identification.ServerInfo;
import com.djrapitops.plan.system.storage.database.DBSystem;
import com.djrapitops.plan.system.storage.database.transactions.events.NicknameStoreTransaction;
import com.djrapitops.plugin.logging.L;
import com.djrapitops.plugin.logging.error.ErrorHandler;
import org.bukkit.entity.Player;

10
Plan/bukkit/src/main/java/com/djrapitops/plan/system/listeners/bukkit/CommandListener.java → Plan/bukkit/src/main/java/com/djrapitops/plan/system/gathering/listeners/bukkit/CommandListener.java
View File

@ -14,15 +14,15 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Plan. If not, see <https://www.gnu.org/licenses/>.
*/
package com.djrapitops.plan.system.listeners.bukkit;
package com.djrapitops.plan.system.gathering.listeners.bukkit;
import com.djrapitops.plan.Plan;
import com.djrapitops.plan.db.access.transactions.events.CommandStoreTransaction;
import com.djrapitops.plan.system.database.DBSystem;
import com.djrapitops.plan.system.info.server.ServerInfo;
import com.djrapitops.plan.system.identification.ServerInfo;
import com.djrapitops.plan.system.settings.Permissions;
import com.djrapitops.plan.system.settings.config.PlanConfig;
import com.djrapitops.plan.system.settings.paths.DataGatheringSettings;
import com.djrapitops.plan.system.settings.config.paths.DataGatheringSettings;
import com.djrapitops.plan.system.storage.database.DBSystem;
import com.djrapitops.plan.system.storage.database.transactions.events.CommandStoreTransaction;
import com.djrapitops.plugin.logging.L;
import com.djrapitops.plugin.logging.error.ErrorHandler;
import org.bukkit.command.Command;

6
Plan/bukkit/src/main/java/com/djrapitops/plan/system/listeners/bukkit/DeathEventListener.java → Plan/bukkit/src/main/java/com/djrapitops/plan/system/gathering/listeners/bukkit/DeathEventListener.java
View File

@ -14,10 +14,10 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Plan. If not, see <https://www.gnu.org/licenses/>.
*/
package com.djrapitops.plan.system.listeners.bukkit;
package com.djrapitops.plan.system.gathering.listeners.bukkit;
import com.djrapitops.plan.data.container.Session;
import com.djrapitops.plan.system.cache.SessionCache;
import com.djrapitops.plan.system.gathering.cache.SessionCache;
import com.djrapitops.plan.system.gathering.domain.Session;
import com.djrapitops.plan.system.processing.Processing;
import com.djrapitops.plan.system.processing.processors.player.MobKillProcessor;
import com.djrapitops.plan.system.processing.processors.player.PlayerKillProcessor;

12
Plan/bukkit/src/main/java/com/djrapitops/plan/system/listeners/bukkit/GameModeChangeListener.java → Plan/bukkit/src/main/java/com/djrapitops/plan/system/gathering/listeners/bukkit/GameModeChangeListener.java
View File

@ -14,14 +14,14 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Plan. If not, see <https://www.gnu.org/licenses/>.
*/
package com.djrapitops.plan.system.listeners.bukkit;
package com.djrapitops.plan.system.gathering.listeners.bukkit;
import com.djrapitops.plan.data.container.Session;
import com.djrapitops.plan.db.access.transactions.events.WorldNameStoreTransaction;
import com.djrapitops.plan.system.cache.SessionCache;
import com.djrapitops.plan.system.database.DBSystem;
import com.djrapitops.plan.system.info.server.ServerInfo;
import com.djrapitops.plan.system.gathering.cache.SessionCache;
import com.djrapitops.plan.system.gathering.domain.Session;
import com.djrapitops.plan.system.identification.ServerInfo;
import com.djrapitops.plan.system.settings.config.WorldAliasSettings;
import com.djrapitops.plan.system.storage.database.DBSystem;
import com.djrapitops.plan.system.storage.database.transactions.events.WorldNameStoreTransaction;
import com.djrapitops.plugin.logging.L;
import com.djrapitops.plugin.logging.error.ErrorHandler;
import org.bukkit.entity.Player;

30
Plan/bukkit/src/main/java/com/djrapitops/plan/system/listeners/bukkit/PlayerOnlineListener.java → Plan/bukkit/src/main/java/com/djrapitops/plan/system/gathering/listeners/bukkit/PlayerOnlineListener.java
View File

@ -14,24 +14,24 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Plan. If not, see <https://www.gnu.org/licenses/>.
*/
package com.djrapitops.plan.system.listeners.bukkit;
package com.djrapitops.plan.system.gathering.listeners.bukkit;
import com.djrapitops.plan.data.container.Session;
import com.djrapitops.plan.data.store.objects.Nickname;
import com.djrapitops.plan.db.Database;
import com.djrapitops.plan.db.access.transactions.events.*;
import com.djrapitops.plan.extension.CallEvents;
import com.djrapitops.plan.extension.ExtensionServiceImplementation;
import com.djrapitops.plan.system.cache.GeolocationCache;
import com.djrapitops.plan.system.cache.NicknameCache;
import com.djrapitops.plan.system.cache.SessionCache;
import com.djrapitops.plan.system.database.DBSystem;
import com.djrapitops.plan.system.info.server.ServerInfo;
import com.djrapitops.plan.system.delivery.domain.Nickname;
import com.djrapitops.plan.system.gathering.cache.GeolocationCache;
import com.djrapitops.plan.system.gathering.cache.NicknameCache;
import com.djrapitops.plan.system.gathering.cache.SessionCache;
import com.djrapitops.plan.system.gathering.domain.Session;
import com.djrapitops.plan.system.gathering.listeners.Status;
import com.djrapitops.plan.system.identification.ServerInfo;
import com.djrapitops.plan.system.processing.Processing;
import com.djrapitops.plan.system.processing.processors.Processors;
import com.djrapitops.plan.system.settings.config.PlanConfig;
import com.djrapitops.plan.system.settings.paths.DataGatheringSettings;
import com.djrapitops.plan.system.status.Status;
import com.djrapitops.plan.system.settings.config.paths.DataGatheringSettings;
import com.djrapitops.plan.system.storage.database.DBSystem;
import com.djrapitops.plan.system.storage.database.Database;
import com.djrapitops.plan.system.storage.database.transactions.events.*;
import com.djrapitops.plugin.logging.L;
import com.djrapitops.plugin.logging.error.ErrorHandler;
import org.bukkit.entity.Player;
@ -122,7 +122,7 @@ public class PlayerOnlineListener implements Listener {
return;
}
UUID uuid = event.getPlayer().getUniqueId();
if (AFKListener.AFK_TRACKER.isAfk(uuid)) {
if (BukkitAFKListener.AFK_TRACKER.isAfk(uuid)) {
return;
}
@ -148,7 +148,7 @@ public class PlayerOnlineListener implements Listener {
UUID serverUUID = serverInfo.getServerUUID();
long time = System.currentTimeMillis();
AFKListener.AFK_TRACKER.performedAction(playerUUID, time);
BukkitAFKListener.AFK_TRACKER.performedAction(playerUUID, time);
String world = player.getWorld().getName();
String gm = player.getGameMode().name();
@ -203,7 +203,7 @@ public class PlayerOnlineListener implements Listener {
Player player = event.getPlayer();
UUID playerUUID = player.getUniqueId();
AFKListener.AFK_TRACKER.loggedOut(playerUUID, time);
BukkitAFKListener.AFK_TRACKER.loggedOut(playerUUID, time);
nicknameCache.removeDisplayName(playerUUID);

12
Plan/bukkit/src/main/java/com/djrapitops/plan/system/listeners/bukkit/WorldChangeListener.java → Plan/bukkit/src/main/java/com/djrapitops/plan/system/gathering/listeners/bukkit/WorldChangeListener.java
View File

@ -14,14 +14,14 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Plan. If not, see <https://www.gnu.org/licenses/>.
*/
package com.djrapitops.plan.system.listeners.bukkit;
package com.djrapitops.plan.system.gathering.listeners.bukkit;
import com.djrapitops.plan.data.container.Session;
import com.djrapitops.plan.db.access.transactions.events.WorldNameStoreTransaction;
import com.djrapitops.plan.system.cache.SessionCache;
import com.djrapitops.plan.system.database.DBSystem;
import com.djrapitops.plan.system.info.server.ServerInfo;
import com.djrapitops.plan.system.gathering.cache.SessionCache;
import com.djrapitops.plan.system.gathering.domain.Session;
import com.djrapitops.plan.system.identification.ServerInfo;
import com.djrapitops.plan.system.settings.config.WorldAliasSettings;
import com.djrapitops.plan.system.storage.database.DBSystem;
import com.djrapitops.plan.system.storage.database.transactions.events.WorldNameStoreTransaction;
import com.djrapitops.plugin.logging.L;
import com.djrapitops.plugin.logging.error.ErrorHandler;
import org.bukkit.entity.Player;

16
Plan/bukkit/src/main/java/com/djrapitops/plan/system/tasks/bukkit/PingCountTimerBukkit.java → Plan/bukkit/src/main/java/com/djrapitops/plan/system/gathering/timed/BukkitPingCounter.java
View File

@ -21,14 +21,14 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package com.djrapitops.plan.system.tasks.bukkit;
package com.djrapitops.plan.system.gathering.timed;
import com.djrapitops.plan.data.store.objects.DateObj;
import com.djrapitops.plan.db.access.transactions.events.PingStoreTransaction;
import com.djrapitops.plan.system.database.DBSystem;
import com.djrapitops.plan.system.info.server.ServerInfo;
import com.djrapitops.plan.system.delivery.domain.DateObj;
import com.djrapitops.plan.system.identification.ServerInfo;
import com.djrapitops.plan.system.settings.config.PlanConfig;
import com.djrapitops.plan.system.settings.paths.TimeSettings;
import com.djrapitops.plan.system.settings.config.paths.TimeSettings;
import com.djrapitops.plan.system.storage.database.DBSystem;
import com.djrapitops.plan.system.storage.database.transactions.events.PingStoreTransaction;
import com.djrapitops.plan.utilities.java.Reflection;
import com.djrapitops.plugin.api.TimeAmount;
import com.djrapitops.plugin.task.AbsRunnable;
@ -60,7 +60,7 @@ import java.util.logging.Logger;
* @author games647
*/
@Singleton
public class PingCountTimerBukkit extends AbsRunnable implements Listener {
public class BukkitPingCounter extends AbsRunnable implements Listener {
//the server is pinging the client every 40 Ticks (2 sec) - so check it then
//https://github.com/bergerkiller/CraftSource/blob/master/net.minecraft.server/PlayerConnection.java#L178
@ -112,7 +112,7 @@ public class PingCountTimerBukkit extends AbsRunnable implements Listener {
private final RunnableFactory runnableFactory;
@Inject
public PingCountTimerBukkit(
public BukkitPingCounter(
PlanConfig config,
DBSystem dbSystem,
ServerInfo serverInfo,

17
Plan/bukkit/src/main/java/com/djrapitops/plan/system/tasks/bukkit/BukkitTPSCountTimer.java → Plan/bukkit/src/main/java/com/djrapitops/plan/system/gathering/timed/BukkitTPSCounter.java
View File

@ -14,15 +14,14 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Plan. If not, see <https://www.gnu.org/licenses/>.
*/
package com.djrapitops.plan.system.tasks.bukkit;
package com.djrapitops.plan.system.gathering.timed;
import com.djrapitops.plan.Plan;
import com.djrapitops.plan.data.container.TPS;
import com.djrapitops.plan.data.container.builders.TPSBuilder;
import com.djrapitops.plan.system.database.DBSystem;
import com.djrapitops.plan.system.info.server.ServerInfo;
import com.djrapitops.plan.system.info.server.properties.ServerProperties;
import com.djrapitops.plan.system.tasks.TPSCountTimer;
import com.djrapitops.plan.system.gathering.domain.TPS;
import com.djrapitops.plan.system.gathering.domain.builders.TPSBuilder;
import com.djrapitops.plan.system.identification.ServerInfo;
import com.djrapitops.plan.system.identification.properties.ServerProperties;
import com.djrapitops.plan.system.storage.database.DBSystem;
import com.djrapitops.plugin.logging.console.PluginLogger;
import com.djrapitops.plugin.logging.error.ErrorHandler;
import org.bukkit.World;
@ -32,14 +31,14 @@ import javax.inject.Singleton;
import java.util.concurrent.TimeUnit;
@Singleton
public class BukkitTPSCountTimer extends TPSCountTimer {
public class BukkitTPSCounter extends TPSCounter {
protected final Plan plugin;
private ServerProperties serverProperties;
private long lastCheckNano;
@Inject
public BukkitTPSCountTimer(
public BukkitTPSCounter(
Plan plugin,
DBSystem dbSystem,
ServerInfo serverInfo,

14
Plan/bukkit/src/main/java/com/djrapitops/plan/system/tasks/bukkit/PaperTPSCountTimer.java → Plan/bukkit/src/main/java/com/djrapitops/plan/system/gathering/timed/PaperTPSCounter.java
View File

@ -14,23 +14,23 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Plan. If not, see <https://www.gnu.org/licenses/>.
*/
package com.djrapitops.plan.system.tasks.bukkit;
package com.djrapitops.plan.system.gathering.timed;
import com.djrapitops.plan.Plan;
import com.djrapitops.plan.data.container.TPS;
import com.djrapitops.plan.data.container.builders.TPSBuilder;
import com.djrapitops.plan.system.database.DBSystem;
import com.djrapitops.plan.system.info.server.ServerInfo;
import com.djrapitops.plan.system.gathering.domain.TPS;
import com.djrapitops.plan.system.gathering.domain.builders.TPSBuilder;
import com.djrapitops.plan.system.identification.ServerInfo;
import com.djrapitops.plan.system.storage.database.DBSystem;
import com.djrapitops.plugin.logging.console.PluginLogger;
import com.djrapitops.plugin.logging.error.ErrorHandler;
import org.bukkit.World;
import javax.inject.Inject;
public class PaperTPSCountTimer extends BukkitTPSCountTimer {
public class PaperTPSCounter extends BukkitTPSCounter {
@Inject
public PaperTPSCountTimer(
public PaperTPSCounter(
Plan plugin,
DBSystem dbSystem,
ServerInfo serverInfo,

2
Plan/bukkit/src/main/java/com/djrapitops/plan/system/info/server/properties/BukkitServerProperties.java → Plan/bukkit/src/main/java/com/djrapitops/plan/system/identification/properties/BukkitServerProperties.java
View File

@ -14,7 +14,7 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Plan. If not, see <https://www.gnu.org/licenses/>.
*/
package com.djrapitops.plan.system.info.server.properties;
package com.djrapitops.plan.system.identification.properties;
import org.bukkit.Server;

11
Plan/bukkit/src/main/java/com/djrapitops/plan/system/database/BukkitDBSystem.java → Plan/bukkit/src/main/java/com/djrapitops/plan/system/storage/database/BukkitDBSystem.java
View File

@ -14,15 +14,12 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Plan. If not, see <https://www.gnu.org/licenses/>.
*/
package com.djrapitops.plan.system.database;
package com.djrapitops.plan.system.storage.database;
import com.djrapitops.plan.api.exceptions.EnableException;
import com.djrapitops.plan.db.H2DB;
import com.djrapitops.plan.db.MySQLDB;
import com.djrapitops.plan.db.SQLiteDB;
import com.djrapitops.plan.system.locale.Locale;
import com.djrapitops.plan.exceptions.EnableException;
import com.djrapitops.plan.system.settings.config.PlanConfig;
import com.djrapitops.plan.system.settings.paths.DatabaseSettings;
import com.djrapitops.plan.system.settings.config.paths.DatabaseSettings;
import com.djrapitops.plan.system.settings.locale.Locale;
import com.djrapitops.plugin.benchmarking.Timings;
import com.djrapitops.plugin.logging.console.PluginLogger;
import com.djrapitops.plugin.logging.error.ErrorHandler;

113
Plan/bukkit/src/main/java/com/djrapitops/plan/system/tasks/BukkitTaskSystem.java
View File

@ -17,17 +17,21 @@
package com.djrapitops.plan.system.tasks;
import com.djrapitops.plan.Plan;
import com.djrapitops.plan.ShutdownHook;
import com.djrapitops.plan.db.tasks.DBCleanTask;
import com.djrapitops.plan.extension.ExtensionServerMethodCallerTask;
import com.djrapitops.plan.system.TaskSystem;
import com.djrapitops.plan.system.delivery.upkeep.PeriodicServerExportTask;
import com.djrapitops.plan.system.delivery.upkeep.PlayersPageRefreshTask;
import com.djrapitops.plan.system.gathering.ShutdownHook;
import com.djrapitops.plan.system.gathering.timed.BukkitPingCounter;
import com.djrapitops.plan.system.gathering.timed.BukkitTPSCounter;
import com.djrapitops.plan.system.gathering.timed.PaperTPSCounter;
import com.djrapitops.plan.system.settings.config.PlanConfig;
import com.djrapitops.plan.system.settings.paths.DataGatheringSettings;
import com.djrapitops.plan.system.settings.paths.TimeSettings;
import com.djrapitops.plan.system.tasks.bukkit.BukkitTPSCountTimer;
import com.djrapitops.plan.system.tasks.bukkit.PaperTPSCountTimer;
import com.djrapitops.plan.system.tasks.bukkit.PingCountTimerBukkit;
import com.djrapitops.plan.system.tasks.server.ConfigStoreTask;
import com.djrapitops.plan.system.tasks.server.PeriodicAnalysisTask;
import com.djrapitops.plan.system.settings.config.paths.DataGatheringSettings;
import com.djrapitops.plan.system.settings.config.paths.ExportSettings;
import com.djrapitops.plan.system.settings.config.paths.TimeSettings;
import com.djrapitops.plan.system.settings.upkeep.ConfigStoreTask;
import com.djrapitops.plan.system.storage.upkeep.DBCleanTask;
import com.djrapitops.plan.system.storage.upkeep.LogsFolderCleanTask;
import com.djrapitops.plugin.api.Check;
import com.djrapitops.plugin.api.TimeAmount;
import com.djrapitops.plugin.task.RunnableFactory;
@ -44,14 +48,19 @@ import java.util.concurrent.TimeUnit;
* @author Rsl1122
*/
@Singleton
public class BukkitTaskSystem extends ServerTaskSystem {
public class BukkitTaskSystem extends TaskSystem {
private final Plan plugin;
private final PlanConfig config;
private final ShutdownHook shutdownHook;
private final PingCountTimerBukkit pingCountTimer;
private final PeriodicServerExportTask periodicServerExportTask;
private final LogsFolderCleanTask logsFolderCleanTask;
private final PlayersPageRefreshTask playersPageRefreshTask;
private final BukkitPingCounter pingCounter;
private final ConfigStoreTask configStoreTask;
private final DBCleanTask dbCleanTask;
private final ExtensionServerMethodCallerTask extensionServerMethodCallerTask;
private BukkitTPSCounter tpsCounter;
@Inject
public BukkitTaskSystem(
@ -59,59 +68,85 @@ public class BukkitTaskSystem extends ServerTaskSystem {
PlanConfig config,
ShutdownHook shutdownHook,
RunnableFactory runnableFactory,
PaperTPSCountTimer paperTPSCountTimer,
BukkitTPSCountTimer bukkitTPSCountTimer,
PeriodicAnalysisTask periodicAnalysisTask,
PingCountTimerBukkit pingCountTimer,
PaperTPSCounter paperTPSCountTimer,
BukkitTPSCounter bukkitTPSCountTimer,
BukkitPingCounter pingCounter,
ExtensionServerMethodCallerTask extensionServerMethodCallerTask,
LogsFolderCleanTask logsFolderCleanTask,
PlayersPageRefreshTask playersPageRefreshTask,
ConfigStoreTask configStoreTask,
DBCleanTask dbCleanTask,
ExtensionServerMethodCallerTask extensionServerMethodCallerTask
PeriodicServerExportTask periodicServerExportTask,
PlayersPageRefreshTask playersPageRefreshTask
) {
super(
runnableFactory,
Check.isPaperAvailable() ? paperTPSCountTimer : bukkitTPSCountTimer,
config,
periodicAnalysisTask,
logsFolderCleanTask,
playersPageRefreshTask);
super(runnableFactory);
this.plugin = plugin;
this.config = config;
this.shutdownHook = shutdownHook;
this.pingCountTimer = pingCountTimer;
this.tpsCounter = Check.isPaperAvailable() ? paperTPSCountTimer : bukkitTPSCountTimer;
this.pingCounter = pingCounter;
this.extensionServerMethodCallerTask = extensionServerMethodCallerTask;
this.logsFolderCleanTask = logsFolderCleanTask;
this.configStoreTask = configStoreTask;
this.dbCleanTask = dbCleanTask;
this.extensionServerMethodCallerTask = extensionServerMethodCallerTask;
this.periodicServerExportTask = periodicServerExportTask;
this.playersPageRefreshTask = playersPageRefreshTask;
}
@Override
public void enable() {
super.enable();
try {
Long pingDelay = config.get(TimeSettings.PING_SERVER_ENABLE_DELAY);
if (pingDelay < TimeUnit.HOURS.toMillis(1L) && config.get(DataGatheringSettings.PING)) {
plugin.registerListener(pingCountTimer);
long startDelay = TimeAmount.toTicks(pingDelay, TimeUnit.MILLISECONDS);
registerTask(pingCountTimer).runTaskTimer(startDelay, 40L);
}
} catch (ExceptionInInitializerError | NoClassDefFoundError ignore) {
// Running CraftBukkit
}
registerTPSCounter();
registerPingCounter();
registerExtensionDataGatheringTask();
registerUpkeepTasks();
shutdownHook.register();
}
private void registerUpkeepTasks() {
// +40 ticks / 2 seconds so that update check task runs first.
long storeDelay = TimeAmount.toTicks(config.get(TimeSettings.CONFIG_UPDATE_INTERVAL), TimeUnit.MILLISECONDS) + 40;
registerTask(configStoreTask).runTaskLaterAsynchronously(storeDelay);
registerTask(logsFolderCleanTask).runTaskLaterAsynchronously(TimeAmount.toTicks(30L, TimeUnit.SECONDS));
registerTask(dbCleanTask).runTaskTimerAsynchronously(
TimeAmount.toTicks(20, TimeUnit.SECONDS),
TimeAmount.toTicks(config.get(TimeSettings.CLEAN_DATABASE_PERIOD), TimeUnit.MILLISECONDS)
);
if (config.get(ExportSettings.SERVER_PAGE)) {
registerTask(periodicServerExportTask).runTaskTimerAsynchronously(TimeAmount.toTicks(30L, TimeUnit.SECONDS), TimeAmount.toTicks(20L, TimeUnit.MINUTES));
}
registerTask(playersPageRefreshTask)
.runTaskTimerAsynchronously(TimeAmount.toTicks(5L, TimeUnit.MINUTES), TimeAmount.toTicks(5L, TimeUnit.MINUTES));
}
private void registerTPSCounter() {
registerTask(tpsCounter).runTaskTimer(1000, TimeAmount.toTicks(1L, TimeUnit.SECONDS));
}
private void registerPingCounter() {
try {
Long pingDelay = config.get(TimeSettings.PING_SERVER_ENABLE_DELAY);
if (pingDelay < TimeUnit.HOURS.toMillis(1L) && config.get(DataGatheringSettings.PING)) {
plugin.registerListener(pingCounter);
long startDelay = TimeAmount.toTicks(pingDelay, TimeUnit.MILLISECONDS);
registerTask(pingCounter).runTaskTimer(startDelay, 40L);
}
} catch (ExceptionInInitializerError | NoClassDefFoundError ignore) {
// Running CraftBukkit
}
}
private void registerExtensionDataGatheringTask() {
long extensionRefreshPeriod = TimeAmount.toTicks(config.get(TimeSettings.EXTENSION_DATA_REFRESH_PERIOD), TimeUnit.MILLISECONDS);
registerTask(extensionServerMethodCallerTask).runTaskTimerAsynchronously(
TimeAmount.toTicks(30, TimeUnit.SECONDS), extensionRefreshPeriod
);
shutdownHook.register();
}
@Override

12
Plan/bukkit/src/test/java/com/djrapitops/plan/BukkitSystemTest.java
View File

@ -16,15 +16,15 @@
*/
package com.djrapitops.plan;
import com.djrapitops.plan.api.exceptions.EnableException;
import com.djrapitops.plan.db.Database;
import com.djrapitops.plan.db.access.queries.objects.ServerQueries;
import com.djrapitops.plan.exceptions.EnableException;
import com.djrapitops.plan.system.PlanSystem;
import com.djrapitops.plan.system.info.server.Server;
import com.djrapitops.plan.system.identification.Server;
import com.djrapitops.plan.system.settings.ConfigSettingKeyTest;
import com.djrapitops.plan.system.settings.config.PlanConfig;
import com.djrapitops.plan.system.settings.paths.WebserverSettings;
import com.djrapitops.plan.system.settings.paths.key.Setting;
import com.djrapitops.plan.system.settings.config.paths.WebserverSettings;
import com.djrapitops.plan.system.settings.config.paths.key.Setting;
import com.djrapitops.plan.system.storage.database.Database;
import com.djrapitops.plan.system.storage.database.queries.objects.ServerQueries;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;

14
Plan/bukkit/src/test/java/com/djrapitops/plan/system/listeners/AFKListenerTest.java → Plan/bukkit/src/test/java/com/djrapitops/plan/system/gathering/listeners/BukkitAFKListenerTest.java
View File

@ -14,11 +14,11 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Plan. If not, see <https://www.gnu.org/licenses/>.
*/
package com.djrapitops.plan.system.listeners;
package com.djrapitops.plan.system.gathering.listeners;
import com.djrapitops.plan.system.listeners.bukkit.AFKListener;
import com.djrapitops.plan.system.gathering.listeners.bukkit.BukkitAFKListener;
import com.djrapitops.plan.system.settings.config.PlanConfig;
import com.djrapitops.plan.system.settings.paths.TimeSettings;
import com.djrapitops.plan.system.settings.config.paths.TimeSettings;
import com.djrapitops.plugin.logging.console.TestPluginLogger;
import com.djrapitops.plugin.logging.error.ConsoleErrorLogger;
import org.bukkit.entity.Player;
@ -37,21 +37,21 @@ import java.util.concurrent.TimeUnit;
import static org.mockito.Mockito.*;
/**
* Test for {@link AFKListener}
* Test for {@link BukkitAFKListener}
*
* @author Rsl1122
*/
@RunWith(JUnitPlatform.class)
@ExtendWith(MockitoExtension.class)
public class AFKListenerTest {
public class BukkitAFKListenerTest {
private static AFKListener underTest;
private static BukkitAFKListener underTest;
@BeforeAll
static void setUp() {
PlanConfig config = Mockito.mock(PlanConfig.class);
when(config.get(TimeSettings.AFK_THRESHOLD)).thenReturn(TimeUnit.MINUTES.toMillis(3));
underTest = new AFKListener(config, new ConsoleErrorLogger(new TestPluginLogger()));
underTest = new BukkitAFKListener(config, new ConsoleErrorLogger(new TestPluginLogger()));
}
@Test

4
Plan/bungeecord/src/main/java/com/djrapitops/plan/BStatsBungee.java
View File

@ -16,8 +16,8 @@
*/
package com.djrapitops.plan;
import com.djrapitops.plan.db.Database;
import com.djrapitops.plan.db.access.queries.objects.ServerQueries;
import com.djrapitops.plan.system.storage.database.Database;
import com.djrapitops.plan.system.storage.database.queries.objects.ServerQueries;
import org.bstats.bungeecord.Metrics;
import java.util.function.Supplier;

8
Plan/bungeecord/src/main/java/com/djrapitops/plan/PlanBungee.java
View File

@ -16,11 +16,11 @@
*/
package com.djrapitops.plan;
import com.djrapitops.plan.api.exceptions.EnableException;
import com.djrapitops.plan.command.PlanProxyCommand;
import com.djrapitops.plan.exceptions.EnableException;
import com.djrapitops.plan.system.PlanSystem;
import com.djrapitops.plan.system.locale.Locale;
import com.djrapitops.plan.system.locale.lang.PluginLang;
import com.djrapitops.plan.system.commands.PlanProxyCommand;
import com.djrapitops.plan.system.settings.locale.Locale;
import com.djrapitops.plan.system.settings.locale.lang.PluginLang;
import com.djrapitops.plan.system.settings.theme.PlanColorScheme;
import com.djrapitops.plugin.BungeePlugin;
import com.djrapitops.plugin.command.ColorScheme;

2
Plan/bungeecord/src/main/java/com/djrapitops/plan/PlanBungeeComponent.java
View File

@ -16,7 +16,7 @@
*/
package com.djrapitops.plan;
import com.djrapitops.plan.command.PlanProxyCommand;
import com.djrapitops.plan.system.commands.PlanProxyCommand;
import com.djrapitops.plan.modules.APFModule;
import com.djrapitops.plan.modules.FilesModule;
import com.djrapitops.plan.modules.ProxySuperClassBindingModule;

2
Plan/bungeecord/src/main/java/com/djrapitops/plan/modules/bungee/BungeePlanModule.java
View File

@ -18,7 +18,7 @@ package com.djrapitops.plan.modules.bungee;
import com.djrapitops.plan.PlanBungee;
import com.djrapitops.plan.PlanPlugin;
import com.djrapitops.plan.command.PlanProxyCommand;
import com.djrapitops.plan.system.commands.PlanProxyCommand;
import com.djrapitops.plugin.command.CommandNode;
import dagger.Binds;
import dagger.Module;

4
Plan/bungeecord/src/main/java/com/djrapitops/plan/modules/bungee/BungeeServerPropertiesModule.java
View File

@ -17,8 +17,8 @@
package com.djrapitops.plan.modules.bungee;
import com.djrapitops.plan.PlanBungee;
import com.djrapitops.plan.system.info.server.properties.BungeeServerProperties;
import com.djrapitops.plan.system.info.server.properties.ServerProperties;
import com.djrapitops.plan.system.identification.properties.BungeeServerProperties;
import com.djrapitops.plan.system.identification.properties.ServerProperties;
import com.djrapitops.plan.system.settings.config.PlanConfig;
import dagger.Module;
import dagger.Provides;

10
Plan/bungeecord/src/main/java/com/djrapitops/plan/modules/bungee/BungeeSuperClassBindingModule.java
View File

@ -16,12 +16,12 @@
*/
package com.djrapitops.plan.modules.bungee;
import com.djrapitops.plan.system.info.server.BungeeServerInfo;
import com.djrapitops.plan.system.info.server.ServerInfo;
import com.djrapitops.plan.system.listeners.BungeeListenerSystem;
import com.djrapitops.plan.system.listeners.ListenerSystem;
import com.djrapitops.plan.system.TaskSystem;
import com.djrapitops.plan.system.gathering.listeners.BungeeListenerSystem;
import com.djrapitops.plan.system.gathering.listeners.ListenerSystem;
import com.djrapitops.plan.system.identification.BungeeServerInfo;
import com.djrapitops.plan.system.identification.ServerInfo;
import com.djrapitops.plan.system.tasks.BungeeTaskSystem;
import com.djrapitops.plan.system.tasks.TaskSystem;
import dagger.Binds;
import dagger.Module;

4
Plan/bungeecord/src/main/java/com/djrapitops/plan/system/listeners/BungeeListenerSystem.java → Plan/bungeecord/src/main/java/com/djrapitops/plan/system/gathering/listeners/BungeeListenerSystem.java
View File

@ -14,13 +14,13 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Plan. If not, see <https://www.gnu.org/licenses/>.
*/
package com.djrapitops.plan.system.listeners;
package com.djrapitops.plan.system.gathering.listeners;
import com.djrapitops.plan.PlanBungee;
import com.djrapitops.plan.PlanPlugin;
import com.djrapitops.plan.api.events.PlanBungeeEnableEvent;
import com.djrapitops.plan.capability.CapabilityServiceImplementation;
import com.djrapitops.plan.system.listeners.bungee.PlayerOnlineListener;
import com.djrapitops.plan.system.gathering.listeners.bungee.PlayerOnlineListener;
import javax.inject.Inject;

26
Plan/bungeecord/src/main/java/com/djrapitops/plan/system/listeners/bungee/PlayerOnlineListener.java → Plan/bungeecord/src/main/java/com/djrapitops/plan/system/gathering/listeners/bungee/PlayerOnlineListener.java
View File

@ -14,25 +14,25 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Plan. If not, see <https://www.gnu.org/licenses/>.
*/
package com.djrapitops.plan.system.listeners.bungee;
package com.djrapitops.plan.system.gathering.listeners.bungee;
import com.djrapitops.plan.data.container.Session;
import com.djrapitops.plan.data.store.keys.SessionKeys;
import com.djrapitops.plan.db.Database;
import com.djrapitops.plan.db.access.transactions.events.GeoInfoStoreTransaction;
import com.djrapitops.plan.db.access.transactions.events.PlayerRegisterTransaction;
import com.djrapitops.plan.extension.CallEvents;
import com.djrapitops.plan.extension.ExtensionServiceImplementation;
import com.djrapitops.plan.system.cache.GeolocationCache;
import com.djrapitops.plan.system.cache.SessionCache;
import com.djrapitops.plan.system.database.DBSystem;
import com.djrapitops.plan.system.info.server.ServerInfo;
import com.djrapitops.plan.system.delivery.domain.keys.SessionKeys;
import com.djrapitops.plan.system.delivery.webserver.cache.PageId;
import com.djrapitops.plan.system.delivery.webserver.cache.ResponseCache;
import com.djrapitops.plan.system.gathering.cache.GeolocationCache;
import com.djrapitops.plan.system.gathering.cache.SessionCache;
import com.djrapitops.plan.system.gathering.domain.Session;
import com.djrapitops.plan.system.identification.ServerInfo;
import com.djrapitops.plan.system.processing.Processing;
import com.djrapitops.plan.system.processing.processors.Processors;
import com.djrapitops.plan.system.settings.config.PlanConfig;
import com.djrapitops.plan.system.settings.paths.DataGatheringSettings;
import com.djrapitops.plan.system.webserver.cache.PageId;
import com.djrapitops.plan.system.webserver.cache.ResponseCache;
import com.djrapitops.plan.system.settings.config.paths.DataGatheringSettings;
import com.djrapitops.plan.system.storage.database.DBSystem;
import com.djrapitops.plan.system.storage.database.Database;
import com.djrapitops.plan.system.storage.database.transactions.events.GeoInfoStoreTransaction;
import com.djrapitops.plan.system.storage.database.transactions.events.PlayerRegisterTransaction;
import com.djrapitops.plugin.logging.L;
import com.djrapitops.plugin.logging.error.ErrorHandler;
import net.md_5.bungee.api.connection.ProxiedPlayer;

16
Plan/bungeecord/src/main/java/com/djrapitops/plan/system/tasks/bungee/PingCountTimerBungee.java → Plan/bungeecord/src/main/java/com/djrapitops/plan/system/gathering/timed/BungeePingCounter.java
View File

@ -21,14 +21,14 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package com.djrapitops.plan.system.tasks.bungee;
package com.djrapitops.plan.system.gathering.timed;
import com.djrapitops.plan.data.store.objects.DateObj;
import com.djrapitops.plan.db.access.transactions.events.PingStoreTransaction;
import com.djrapitops.plan.system.database.DBSystem;
import com.djrapitops.plan.system.info.server.ServerInfo;
import com.djrapitops.plan.system.delivery.domain.DateObj;
import com.djrapitops.plan.system.identification.ServerInfo;
import com.djrapitops.plan.system.settings.config.PlanConfig;
import com.djrapitops.plan.system.settings.paths.TimeSettings;
import com.djrapitops.plan.system.settings.config.paths.TimeSettings;
import com.djrapitops.plan.system.storage.database.DBSystem;
import com.djrapitops.plan.system.storage.database.transactions.events.PingStoreTransaction;
import com.djrapitops.plugin.api.TimeAmount;
import com.djrapitops.plugin.task.AbsRunnable;
import com.djrapitops.plugin.task.RunnableFactory;
@ -50,7 +50,7 @@ import java.util.concurrent.TimeUnit;
* @author BrainStone
*/
@Singleton
public class PingCountTimerBungee extends AbsRunnable implements Listener {
public class BungeePingCounter extends AbsRunnable implements Listener {
private final Map<UUID, List<DateObj<Integer>>> playerHistory;
@ -60,7 +60,7 @@ public class PingCountTimerBungee extends AbsRunnable implements Listener {
private final RunnableFactory runnableFactory;
@Inject
public PingCountTimerBungee(
public BungeePingCounter(
PlanConfig config,
DBSystem dbSystem,
ServerInfo serverInfo,

17
Plan/bungeecord/src/main/java/com/djrapitops/plan/system/tasks/bungee/BungeeTPSCountTimer.java → Plan/bungeecord/src/main/java/com/djrapitops/plan/system/gathering/timed/BungeeTPSCounter.java
View File

@ -14,14 +14,13 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Plan. If not, see <https://www.gnu.org/licenses/>.
*/
package com.djrapitops.plan.system.tasks.bungee;
package com.djrapitops.plan.system.gathering.timed;
import com.djrapitops.plan.data.container.TPS;
import com.djrapitops.plan.data.container.builders.TPSBuilder;
import com.djrapitops.plan.system.database.DBSystem;
import com.djrapitops.plan.system.info.server.ServerInfo;
import com.djrapitops.plan.system.info.server.properties.ServerProperties;
import com.djrapitops.plan.system.tasks.TPSCountTimer;
import com.djrapitops.plan.system.gathering.domain.TPS;
import com.djrapitops.plan.system.gathering.domain.builders.TPSBuilder;
import com.djrapitops.plan.system.identification.ServerInfo;
import com.djrapitops.plan.system.identification.properties.ServerProperties;
import com.djrapitops.plan.system.storage.database.DBSystem;
import com.djrapitops.plugin.logging.console.PluginLogger;
import com.djrapitops.plugin.logging.error.ErrorHandler;
@ -29,12 +28,12 @@ import javax.inject.Inject;
import javax.inject.Singleton;
@Singleton
public class BungeeTPSCountTimer extends TPSCountTimer {
public class BungeeTPSCounter extends TPSCounter {
private final ServerProperties serverProperties;
@Inject
public BungeeTPSCountTimer(
public BungeeTPSCounter(
DBSystem dbSystem,
ServerInfo serverInfo,
ServerProperties serverProperties,

18
Plan/bungeecord/src/main/java/com/djrapitops/plan/system/info/server/BungeeServerInfo.java → Plan/bungeecord/src/main/java/com/djrapitops/plan/system/identification/BungeeServerInfo.java
View File

@ -14,16 +14,16 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Plan. If not, see <https://www.gnu.org/licenses/>.
*/
package com.djrapitops.plan.system.info.server;
package com.djrapitops.plan.system.identification;
import com.djrapitops.plan.api.exceptions.EnableException;
import com.djrapitops.plan.api.exceptions.database.DBOpException;
import com.djrapitops.plan.db.Database;
import com.djrapitops.plan.db.access.queries.objects.ServerQueries;
import com.djrapitops.plan.db.access.transactions.StoreServerInformationTransaction;
import com.djrapitops.plan.system.database.DBSystem;
import com.djrapitops.plan.system.info.server.properties.ServerProperties;
import com.djrapitops.plan.system.webserver.WebServer;
import com.djrapitops.plan.exceptions.EnableException;
import com.djrapitops.plan.exceptions.database.DBOpException;
import com.djrapitops.plan.system.delivery.webserver.WebServer;
import com.djrapitops.plan.system.identification.properties.ServerProperties;
import com.djrapitops.plan.system.storage.database.DBSystem;
import com.djrapitops.plan.system.storage.database.Database;
import com.djrapitops.plan.system.storage.database.queries.objects.ServerQueries;
import com.djrapitops.plan.system.storage.database.transactions.StoreServerInformationTransaction;
import com.djrapitops.plugin.logging.console.PluginLogger;
import dagger.Lazy;

4
Plan/bungeecord/src/main/java/com/djrapitops/plan/system/info/server/properties/BungeeServerProperties.java → Plan/bungeecord/src/main/java/com/djrapitops/plan/system/identification/properties/BungeeServerProperties.java
View File

@ -14,10 +14,10 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Plan. If not, see <https://www.gnu.org/licenses/>.
*/
package com.djrapitops.plan.system.info.server.properties;
package com.djrapitops.plan.system.identification.properties;
import com.djrapitops.plan.system.settings.config.PlanConfig;
import com.djrapitops.plan.system.settings.paths.ProxySettings;
import com.djrapitops.plan.system.settings.config.paths.ProxySettings;
import net.md_5.bungee.api.ProxyServer;
/**

2
Plan/bungeecord/src/main/java/com/djrapitops/plan/system/info/server/properties/RedisCheck.java → Plan/bungeecord/src/main/java/com/djrapitops/plan/system/identification/properties/RedisCheck.java
View File

@ -14,7 +14,7 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Plan. If not, see <https://www.gnu.org/licenses/>.
*/
package com.djrapitops.plan.system.info.server.properties;
package com.djrapitops.plan.system.identification.properties;
import com.djrapitops.plugin.api.Check;

2
Plan/bungeecord/src/main/java/com/djrapitops/plan/system/info/server/properties/RedisPlayersOnlineSupplier.java → Plan/bungeecord/src/main/java/com/djrapitops/plan/system/identification/properties/RedisPlayersOnlineSupplier.java
View File

@ -14,7 +14,7 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Plan. If not, see <https://www.gnu.org/licenses/>.
*/
package com.djrapitops.plan.system.info.server.properties;
package com.djrapitops.plan.system.identification.properties;
import com.imaginarycode.minecraft.redisbungee.RedisBungee;

35
Plan/bungeecord/src/main/java/com/djrapitops/plan/system/tasks/BungeeTaskSystem.java
View File

@ -17,15 +17,18 @@
package com.djrapitops.plan.system.tasks;
import com.djrapitops.plan.PlanBungee;
import com.djrapitops.plan.db.tasks.DBCleanTask;
import com.djrapitops.plan.extension.ExtensionServerMethodCallerTask;
import com.djrapitops.plan.system.TaskSystem;
import com.djrapitops.plan.system.delivery.upkeep.NetworkPageRefreshTask;
import com.djrapitops.plan.system.delivery.upkeep.PlayersPageRefreshTask;
import com.djrapitops.plan.system.gathering.timed.BungeePingCounter;
import com.djrapitops.plan.system.gathering.timed.BungeeTPSCounter;
import com.djrapitops.plan.system.settings.config.PlanConfig;
import com.djrapitops.plan.system.settings.paths.DataGatheringSettings;
import com.djrapitops.plan.system.settings.paths.TimeSettings;
import com.djrapitops.plan.system.tasks.bungee.BungeeTPSCountTimer;
import com.djrapitops.plan.system.tasks.bungee.PingCountTimerBungee;
import com.djrapitops.plan.system.tasks.proxy.NetworkConfigStoreTask;
import com.djrapitops.plan.system.tasks.proxy.NetworkPageRefreshTask;
import com.djrapitops.plan.system.settings.config.paths.DataGatheringSettings;
import com.djrapitops.plan.system.settings.config.paths.TimeSettings;
import com.djrapitops.plan.system.settings.upkeep.NetworkConfigStoreTask;
import com.djrapitops.plan.system.storage.upkeep.DBCleanTask;
import com.djrapitops.plan.system.storage.upkeep.LogsFolderCleanTask;
import com.djrapitops.plugin.api.TimeAmount;
import com.djrapitops.plugin.task.RunnableFactory;
@ -43,8 +46,9 @@ public class BungeeTaskSystem extends TaskSystem {
private final PlanBungee plugin;
private final PlanConfig config;
private final BungeeTPSCounter tpsCounter;
private final NetworkPageRefreshTask networkPageRefreshTask;
private final PingCountTimerBungee pingCountTimer;
private final BungeePingCounter pingCounter;
private final LogsFolderCleanTask logsFolderCleanTask;
private final PlayersPageRefreshTask playersPageRefreshTask;
private final NetworkConfigStoreTask networkConfigStoreTask;
@ -56,21 +60,22 @@ public class BungeeTaskSystem extends TaskSystem {
PlanBungee plugin,
PlanConfig config,
RunnableFactory runnableFactory,
BungeeTPSCountTimer bungeeTPSCountTimer,
BungeeTPSCounter tpsCounter,
NetworkPageRefreshTask networkPageRefreshTask,
PingCountTimerBungee pingCountTimer,
BungeePingCounter pingCounter,
LogsFolderCleanTask logsFolderCleanTask,
PlayersPageRefreshTask playersPageRefreshTask,
NetworkConfigStoreTask networkConfigStoreTask,
DBCleanTask dbCleanTask,
ExtensionServerMethodCallerTask extensionServerMethodCallerTask
) {
super(runnableFactory, bungeeTPSCountTimer);
super(runnableFactory);
this.plugin = plugin;
this.config = config;
this.tpsCounter = tpsCounter;
this.networkPageRefreshTask = networkPageRefreshTask;
this.pingCountTimer = pingCountTimer;
this.pingCounter = pingCounter;
this.logsFolderCleanTask = logsFolderCleanTask;
this.playersPageRefreshTask = playersPageRefreshTask;
this.networkConfigStoreTask = networkConfigStoreTask;
@ -84,15 +89,15 @@ public class BungeeTaskSystem extends TaskSystem {
}
private void registerTasks() {
registerTask(tpsCountTimer).runTaskTimerAsynchronously(1000, TimeAmount.toTicks(1L, TimeUnit.SECONDS));
registerTask(tpsCounter).runTaskTimerAsynchronously(1000, TimeAmount.toTicks(1L, TimeUnit.SECONDS));
registerTask(networkPageRefreshTask).runTaskTimerAsynchronously(1500, TimeAmount.toTicks(5L, TimeUnit.MINUTES));
registerTask(logsFolderCleanTask).runTaskLaterAsynchronously(TimeAmount.toTicks(30L, TimeUnit.SECONDS));
Long pingDelay = config.get(TimeSettings.PING_SERVER_ENABLE_DELAY);
if (pingDelay < TimeUnit.HOURS.toMillis(1L) && config.get(DataGatheringSettings.PING)) {
plugin.registerListener(pingCountTimer);
plugin.registerListener(pingCounter);
long startDelay = TimeAmount.toTicks(pingDelay, TimeUnit.MILLISECONDS);
registerTask(pingCountTimer).runTaskTimer(startDelay, 40L);
registerTask(pingCounter).runTaskTimer(startDelay, 40L);
}
registerTask(playersPageRefreshTask)

10
Plan/bungeecord/src/test/java/com/djrapitops/plan/BungeeSystemTest.java
View File

@ -16,13 +16,13 @@
*/
package com.djrapitops.plan;
import com.djrapitops.plan.api.exceptions.EnableException;
import com.djrapitops.plan.db.SQLiteDB;
import com.djrapitops.plan.exceptions.EnableException;
import com.djrapitops.plan.system.PlanSystem;
import com.djrapitops.plan.system.database.DBSystem;
import com.djrapitops.plan.system.settings.config.PlanConfig;
import com.djrapitops.plan.system.settings.paths.ProxySettings;
import com.djrapitops.plan.system.settings.paths.WebserverSettings;
import com.djrapitops.plan.system.settings.config.paths.ProxySettings;
import com.djrapitops.plan.system.settings.config.paths.WebserverSettings;
import com.djrapitops.plan.system.storage.database.DBSystem;
import com.djrapitops.plan.system.storage.database.SQLiteDB;
import com.google.common.util.concurrent.MoreExecutors;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

15
Plan/common/src/main/java/com/djrapitops/plan/api/CommonAPI.java
View File

@ -18,14 +18,14 @@ package com.djrapitops.plan.api;
import com.djrapitops.plan.api.data.PlayerContainer;
import com.djrapitops.plan.api.data.ServerContainer;
import com.djrapitops.plan.api.exceptions.database.DBOpException;
import com.djrapitops.plan.data.plugin.PluginData;
import com.djrapitops.plan.db.access.Query;
import com.djrapitops.plan.db.access.queries.containers.ContainerFetchQueries;
import com.djrapitops.plan.db.access.queries.objects.ServerQueries;
import com.djrapitops.plan.db.access.queries.objects.UserIdentifierQueries;
import com.djrapitops.plan.system.database.DBSystem;
import com.djrapitops.plan.utilities.uuid.UUIDUtility;
import com.djrapitops.plan.exceptions.database.DBOpException;
import com.djrapitops.plan.system.identification.UUIDUtility;
import com.djrapitops.plan.system.storage.database.DBSystem;
import com.djrapitops.plan.system.storage.database.queries.Query;
import com.djrapitops.plan.system.storage.database.queries.containers.ContainerFetchQueries;
import com.djrapitops.plan.system.storage.database.queries.objects.ServerQueries;
import com.djrapitops.plan.system.storage.database.queries.objects.UserIdentifierQueries;
import com.djrapitops.plugin.logging.L;
import com.djrapitops.plugin.logging.console.PluginLogger;
import com.djrapitops.plugin.logging.error.ErrorHandler;
@ -43,6 +43,7 @@ import java.util.UUID;
* @author Rsl1122
*/
@Singleton
@Deprecated
public class CommonAPI implements PlanAPI {
private final DBSystem dbSystem;

1
Plan/common/src/main/java/com/djrapitops/plan/api/PlanAPI.java
View File

@ -30,6 +30,7 @@ import java.util.UUID;
*
* @author Rsl1122
*/
@Deprecated
public interface PlanAPI {
static PlanAPI getInstance() {

9
Plan/common/src/main/java/com/djrapitops/plan/api/data/PlayerContainer.java
View File

@ -16,7 +16,7 @@
*/
package com.djrapitops.plan.api.data;
import com.djrapitops.plan.data.store.Key;
import com.djrapitops.plan.system.delivery.domain.keys.Key;
import java.util.Optional;
@ -24,17 +24,18 @@ import java.util.Optional;
* Wrapper for a PlayerContainer.
* <p>
* The actual object is wrapped to avoid exposing too much API that might change.
* See {@link com.djrapitops.plan.data.store.keys.PlayerKeys} for Key objects.
* See {@link com.djrapitops.plan.system.delivery.domain.keys.PlayerKeys} for Key objects.
* <p>
* The Keys might change in the future, but the Optional API should help dealing with those cases.
*
* @author Rsl1122
*/
@Deprecated
public class PlayerContainer {
private final com.djrapitops.plan.data.store.containers.PlayerContainer container;
private final com.djrapitops.plan.system.delivery.domain.container.PlayerContainer container;
public PlayerContainer(com.djrapitops.plan.data.store.containers.PlayerContainer container) {
public PlayerContainer(com.djrapitops.plan.system.delivery.domain.container.PlayerContainer container) {
this.container = container;
}

9
Plan/common/src/main/java/com/djrapitops/plan/api/data/ServerContainer.java
View File

@ -16,7 +16,7 @@
*/
package com.djrapitops.plan.api.data;
import com.djrapitops.plan.data.store.Key;
import com.djrapitops.plan.system.delivery.domain.keys.Key;
import java.util.Optional;
@ -24,17 +24,18 @@ import java.util.Optional;
* Wrapper for a ServerContainer.
* <p>
* The actual object is wrapped to avoid exposing too much API that might change.
* See {@link com.djrapitops.plan.data.store.keys.ServerKeys} for Key objects.
* See {@link com.djrapitops.plan.system.delivery.domain.keys.ServerKeys} for Key objects.
* <p>
* The Keys might change in the future, but the Optional API should help dealing with those cases.
*
* @author Rsl1122
*/
@Deprecated
public class ServerContainer {
private final com.djrapitops.plan.data.store.containers.ServerContainer container;
private final com.djrapitops.plan.system.delivery.domain.container.ServerContainer container;
public ServerContainer(com.djrapitops.plan.data.store.containers.ServerContainer container) {
public ServerContainer(com.djrapitops.plan.system.delivery.domain.container.ServerContainer container) {
this.container = container;
}

2
Plan/common/src/main/java/com/djrapitops/plan/data/element/TableContainer.java
View File

@ -16,8 +16,8 @@
*/
package com.djrapitops.plan.data.element;
import com.djrapitops.plan.system.delivery.rendering.html.icon.Icon;
import com.djrapitops.plan.utilities.formatting.Formatter;
import com.djrapitops.plan.utilities.html.icon.Icon;
import com.djrapitops.plugin.utilities.ArrayUtil;
import java.io.Serializable;

4
Plan/common/src/main/java/com/djrapitops/plan/data/plugin/PluginData.java
View File

@ -18,8 +18,8 @@ package com.djrapitops.plan.data.plugin;
import com.djrapitops.plan.data.element.AnalysisContainer;
import com.djrapitops.plan.data.element.InspectContainer;
import com.djrapitops.plan.utilities.html.icon.Color;
import com.djrapitops.plan.utilities.html.icon.Icon;
import com.djrapitops.plan.system.delivery.rendering.html.icon.Color;
import com.djrapitops.plan.system.delivery.rendering.html.icon.Icon;
import java.util.Collection;
import java.util.Objects;

7
Plan/common/src/main/java/com/djrapitops/plan/data/store/containers/AnalysisContainer.java
View File

@ -16,12 +16,15 @@
*/
package com.djrapitops.plan.data.store.containers;
import com.djrapitops.plan.system.delivery.domain.container.DynamicDataContainer;
import com.djrapitops.plan.system.delivery.domain.keys.PlaceholderKey;
/**
* Container used for analysis.
*
* @author Rsl1122
* @see com.djrapitops.plan.data.store.keys.AnalysisKeys for Key objects
* @see com.djrapitops.plan.data.store.PlaceholderKey for placeholder information
* @see com.djrapitops.plan.system.delivery.domain.keys.AnalysisKeys for Key objects
* @see PlaceholderKey for placeholder information
* @deprecated AnalysisContainer is no longer used.
*/
@Deprecated

2
Plan/common/src/main/java/com/djrapitops/plan/api/exceptions/DataExtensionMethodCallException.java → Plan/common/src/main/java/com/djrapitops/plan/exceptions/DataExtensionMethodCallException.java
View File

@ -14,7 +14,7 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Plan. If not, see <https://www.gnu.org/licenses/>.
*/
package com.djrapitops.plan.api.exceptions;
package com.djrapitops.plan.exceptions;
import com.djrapitops.plan.extension.implementation.providers.MethodWrapper;

2
Plan/common/src/main/java/com/djrapitops/plan/api/exceptions/EnableException.java → Plan/common/src/main/java/com/djrapitops/plan/exceptions/EnableException.java
View File

@ -14,7 +14,7 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Plan. If not, see <https://www.gnu.org/licenses/>.
*/
package com.djrapitops.plan.api.exceptions;
package com.djrapitops.plan.exceptions;
/**
* Thrown when something goes wrong with Plan initialization.

2
Plan/common/src/main/java/com/djrapitops/plan/api/exceptions/ParseException.java → Plan/common/src/main/java/com/djrapitops/plan/exceptions/ParseException.java
View File

@ -14,7 +14,7 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Plan. If not, see <https://www.gnu.org/licenses/>.
*/
package com.djrapitops.plan.api.exceptions;
package com.djrapitops.plan.exceptions;
/**
* Exception thrown when Page encounters an Exception.

2
Plan/common/src/main/java/com/djrapitops/plan/api/exceptions/PassEncryptException.java → Plan/common/src/main/java/com/djrapitops/plan/exceptions/PassEncryptException.java
View File

@ -14,7 +14,7 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Plan. If not, see <https://www.gnu.org/licenses/>.
*/
package com.djrapitops.plan.api.exceptions;
package com.djrapitops.plan.exceptions;
public class PassEncryptException extends Exception {

6
Plan/common/src/main/java/com/djrapitops/plan/api/exceptions/WebUserAuthException.java → Plan/common/src/main/java/com/djrapitops/plan/exceptions/WebUserAuthException.java
View File

@ -14,10 +14,10 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Plan. If not, see <https://www.gnu.org/licenses/>.
*/
package com.djrapitops.plan.api.exceptions;
package com.djrapitops.plan.exceptions;
import com.djrapitops.plan.api.exceptions.connection.WebException;
import com.djrapitops.plan.system.webserver.auth.FailReason;
import com.djrapitops.plan.exceptions.connection.WebException;
import com.djrapitops.plan.system.delivery.webserver.auth.FailReason;
/**
* Thrown when WebUser can not be authorized (WebServer).

4
Plan/common/src/main/java/com/djrapitops/plan/api/exceptions/connection/BadRequestException.java → Plan/common/src/main/java/com/djrapitops/plan/exceptions/connection/BadRequestException.java
View File

@ -14,9 +14,9 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Plan. If not, see <https://www.gnu.org/licenses/>.
*/
package com.djrapitops.plan.api.exceptions.connection;
package com.djrapitops.plan.exceptions.connection;
import com.djrapitops.plan.system.webserver.response.ResponseCode;
import com.djrapitops.plan.system.delivery.webserver.response.ResponseCode;
/**
* Thrown when connection is returned 401 Bad Request.

4
Plan/common/src/main/java/com/djrapitops/plan/api/exceptions/connection/ForbiddenException.java → Plan/common/src/main/java/com/djrapitops/plan/exceptions/connection/ForbiddenException.java
View File

@ -14,9 +14,9 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Plan. If not, see <https://www.gnu.org/licenses/>.
*/
package com.djrapitops.plan.api.exceptions.connection;
package com.djrapitops.plan.exceptions.connection;
import com.djrapitops.plan.system.webserver.response.ResponseCode;
import com.djrapitops.plan.system.delivery.webserver.response.ResponseCode;
/**
* Thrown when Connection gets a 403 response.

4
Plan/common/src/main/java/com/djrapitops/plan/api/exceptions/connection/InternalErrorException.java → Plan/common/src/main/java/com/djrapitops/plan/exceptions/connection/InternalErrorException.java
View File

@ -14,9 +14,9 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Plan. If not, see <https://www.gnu.org/licenses/>.
*/
package com.djrapitops.plan.api.exceptions.connection;
package com.djrapitops.plan.exceptions.connection;
import com.djrapitops.plan.system.webserver.response.ResponseCode;
import com.djrapitops.plan.system.delivery.webserver.response.ResponseCode;
/**
* Thrown when Connection returns 500.

4
Plan/common/src/main/java/com/djrapitops/plan/api/exceptions/connection/NotFoundException.java → Plan/common/src/main/java/com/djrapitops/plan/exceptions/connection/NotFoundException.java
View File

@ -14,9 +14,9 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Plan. If not, see <https://www.gnu.org/licenses/>.
*/
package com.djrapitops.plan.api.exceptions.connection;
package com.djrapitops.plan.exceptions.connection;
import com.djrapitops.plan.system.webserver.response.ResponseCode;
import com.djrapitops.plan.system.delivery.webserver.response.ResponseCode;
/**
* Thrown when Connection returns 404, when page is not found.

4
Plan/common/src/main/java/com/djrapitops/plan/api/exceptions/connection/WebException.java → Plan/common/src/main/java/com/djrapitops/plan/exceptions/connection/WebException.java
View File

@ -14,9 +14,9 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Plan. If not, see <https://www.gnu.org/licenses/>.
*/
package com.djrapitops.plan.api.exceptions.connection;
package com.djrapitops.plan.exceptions.connection;
import com.djrapitops.plan.system.webserver.response.ResponseCode;
import com.djrapitops.plan.system.delivery.webserver.response.ResponseCode;
/**
* Thrown when Connection POST-request fails, general Exception.

2
Plan/common/src/main/java/com/djrapitops/plan/api/exceptions/database/DBInitException.java → Plan/common/src/main/java/com/djrapitops/plan/exceptions/database/DBInitException.java
View File

@ -14,7 +14,7 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Plan. If not, see <https://www.gnu.org/licenses/>.
*/
package com.djrapitops.plan.api.exceptions.database;
package com.djrapitops.plan.exceptions.database;
/**
* Thrown when something goes wrong with {@code Database#init}.

2
Plan/common/src/main/java/com/djrapitops/plan/api/exceptions/database/DBOpException.java → Plan/common/src/main/java/com/djrapitops/plan/exceptions/database/DBOpException.java
View File

@ -14,7 +14,7 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Plan. If not, see <https://www.gnu.org/licenses/>.
*/
package com.djrapitops.plan.api.exceptions.database;
package com.djrapitops.plan.exceptions.database;
import java.sql.SQLException;

2
Plan/common/src/main/java/com/djrapitops/plan/api/exceptions/database/FatalDBException.java → Plan/common/src/main/java/com/djrapitops/plan/exceptions/database/FatalDBException.java
View File

@ -14,7 +14,7 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Plan. If not, see <https://www.gnu.org/licenses/>.
*/
package com.djrapitops.plan.api.exceptions.database;
package com.djrapitops.plan.exceptions.database;
public class FatalDBException extends DBOpException {

12
Plan/common/src/main/java/com/djrapitops/plan/extension/ExtensionServiceImplementation.java
View File

@ -16,17 +16,17 @@
*/
package com.djrapitops.plan.extension;
import com.djrapitops.plan.api.exceptions.DataExtensionMethodCallException;
import com.djrapitops.plan.data.plugin.PluginsConfigSection;
import com.djrapitops.plan.exceptions.DataExtensionMethodCallException;
import com.djrapitops.plan.extension.implementation.CallerImplementation;
import com.djrapitops.plan.extension.implementation.DataProviderExtractor;
import com.djrapitops.plan.extension.implementation.ExtensionRegister;
import com.djrapitops.plan.extension.implementation.providers.gathering.ProviderValueGatherer;
import com.djrapitops.plan.system.DebugChannels;
import com.djrapitops.plan.system.database.DBSystem;
import com.djrapitops.plan.system.info.server.ServerInfo;
import com.djrapitops.plan.system.identification.ServerInfo;
import com.djrapitops.plan.system.processing.Processing;
import com.djrapitops.plan.system.settings.config.ExtensionSettings;
import com.djrapitops.plan.system.settings.config.PlanConfig;
import com.djrapitops.plan.system.storage.database.DBSystem;
import com.djrapitops.plugin.logging.L;
import com.djrapitops.plugin.logging.console.PluginLogger;
import com.djrapitops.plugin.logging.error.ErrorHandler;
@ -82,7 +82,7 @@ public class ExtensionServiceImplementation implements ExtensionService {
public void register() {
try {
extensionRegister.registerBuiltInExtensions(config.getPluginsConfigSection().getDisabled());
extensionRegister.registerBuiltInExtensions(config.getExtensionSettings().getDisabled());
} catch (IllegalStateException failedToRegisterOne) {
logger.warn("One or more extensions failed to register, see suppressed exceptions.");
errorHandler.log(L.WARN, this.getClass(), failedToRegisterOne);
@ -120,7 +120,7 @@ public class ExtensionServiceImplementation implements ExtensionService {
}
private boolean shouldNotAllowRegistration(String pluginName) {
PluginsConfigSection pluginsConfig = config.getPluginsConfigSection();
ExtensionSettings pluginsConfig = config.getExtensionSettings();
if (!pluginsConfig.hasSection(pluginName)) {
try {

6
Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/providers/gathering/BooleanProviderValueGatherer.java
View File

@ -16,9 +16,7 @@
*/
package com.djrapitops.plan.extension.implementation.providers.gathering;
import com.djrapitops.plan.api.exceptions.DataExtensionMethodCallException;
import com.djrapitops.plan.db.Database;
import com.djrapitops.plan.db.access.transactions.Transaction;
import com.djrapitops.plan.exceptions.DataExtensionMethodCallException;
import com.djrapitops.plan.extension.DataExtension;
import com.djrapitops.plan.extension.implementation.ProviderInformation;
import com.djrapitops.plan.extension.implementation.providers.BooleanDataProvider;
@ -29,6 +27,8 @@ import com.djrapitops.plan.extension.implementation.storage.transactions.StoreIc
import com.djrapitops.plan.extension.implementation.storage.transactions.providers.StoreBooleanProviderTransaction;
import com.djrapitops.plan.extension.implementation.storage.transactions.results.StorePlayerBooleanResultTransaction;
import com.djrapitops.plan.extension.implementation.storage.transactions.results.StoreServerBooleanResultTransaction;
import com.djrapitops.plan.system.storage.database.Database;
import com.djrapitops.plan.system.storage.database.transactions.Transaction;
import java.util.*;
import java.util.concurrent.Callable;

6
Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/providers/gathering/DoubleAndPercentageProviderValueGatherer.java
View File

@ -16,9 +16,7 @@
*/
package com.djrapitops.plan.extension.implementation.providers.gathering;
import com.djrapitops.plan.api.exceptions.DataExtensionMethodCallException;
import com.djrapitops.plan.db.Database;
import com.djrapitops.plan.db.access.transactions.Transaction;
import com.djrapitops.plan.exceptions.DataExtensionMethodCallException;
import com.djrapitops.plan.extension.DataExtension;
import com.djrapitops.plan.extension.implementation.ProviderInformation;
import com.djrapitops.plan.extension.implementation.providers.DataProvider;
@ -31,6 +29,8 @@ import com.djrapitops.plan.extension.implementation.storage.transactions.results
import com.djrapitops.plan.extension.implementation.storage.transactions.results.StorePlayerPercentageResultTransaction;
import com.djrapitops.plan.extension.implementation.storage.transactions.results.StoreServerDoubleResultTransaction;
import com.djrapitops.plan.extension.implementation.storage.transactions.results.StoreServerPercentageResultTransaction;
import com.djrapitops.plan.system.storage.database.Database;
import com.djrapitops.plan.system.storage.database.transactions.Transaction;
import java.util.Optional;
import java.util.UUID;

4
Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/providers/gathering/GroupProviderValueGatherer.java
View File

@ -16,8 +16,7 @@
*/
package com.djrapitops.plan.extension.implementation.providers.gathering;
import com.djrapitops.plan.api.exceptions.DataExtensionMethodCallException;
import com.djrapitops.plan.db.Database;
import com.djrapitops.plan.exceptions.DataExtensionMethodCallException;
import com.djrapitops.plan.extension.DataExtension;
import com.djrapitops.plan.extension.implementation.ProviderInformation;
import com.djrapitops.plan.extension.implementation.providers.DataProvider;
@ -26,6 +25,7 @@ import com.djrapitops.plan.extension.implementation.providers.MethodWrapper;
import com.djrapitops.plan.extension.implementation.storage.transactions.StoreIconTransaction;
import com.djrapitops.plan.extension.implementation.storage.transactions.providers.StoreGroupProviderTransaction;
import com.djrapitops.plan.extension.implementation.storage.transactions.results.StorePlayerGroupsResultTransaction;
import com.djrapitops.plan.system.storage.database.Database;
import java.util.Optional;
import java.util.UUID;

6
Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/providers/gathering/NumberProviderValueGatherer.java
View File

@ -16,9 +16,7 @@
*/
package com.djrapitops.plan.extension.implementation.providers.gathering;
import com.djrapitops.plan.api.exceptions.DataExtensionMethodCallException;
import com.djrapitops.plan.db.Database;
import com.djrapitops.plan.db.access.transactions.Transaction;
import com.djrapitops.plan.exceptions.DataExtensionMethodCallException;
import com.djrapitops.plan.extension.DataExtension;
import com.djrapitops.plan.extension.FormatType;
import com.djrapitops.plan.extension.implementation.ProviderInformation;
@ -30,6 +28,8 @@ import com.djrapitops.plan.extension.implementation.storage.transactions.StoreIc
import com.djrapitops.plan.extension.implementation.storage.transactions.providers.StoreNumberProviderTransaction;
import com.djrapitops.plan.extension.implementation.storage.transactions.results.StorePlayerNumberResultTransaction;
import com.djrapitops.plan.extension.implementation.storage.transactions.results.StoreServerNumberResultTransaction;
import com.djrapitops.plan.system.storage.database.Database;
import com.djrapitops.plan.system.storage.database.transactions.Transaction;
import java.util.Optional;
import java.util.UUID;

6
Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/providers/gathering/ProviderValueGatherer.java
View File

@ -16,7 +16,6 @@
*/
package com.djrapitops.plan.extension.implementation.providers.gathering;
import com.djrapitops.plan.db.Database;
import com.djrapitops.plan.extension.CallEvents;
import com.djrapitops.plan.extension.DataExtension;
import com.djrapitops.plan.extension.icon.Icon;
@ -28,8 +27,9 @@ import com.djrapitops.plan.extension.implementation.storage.transactions.StoreIc
import com.djrapitops.plan.extension.implementation.storage.transactions.StorePluginTransaction;
import com.djrapitops.plan.extension.implementation.storage.transactions.StoreTabInformationTransaction;
import com.djrapitops.plan.extension.implementation.storage.transactions.results.RemoveInvalidResultsTransaction;
import com.djrapitops.plan.system.database.DBSystem;
import com.djrapitops.plan.system.info.server.ServerInfo;
import com.djrapitops.plan.system.identification.ServerInfo;
import com.djrapitops.plan.system.storage.database.DBSystem;
import com.djrapitops.plan.system.storage.database.Database;
import java.util.UUID;

6
Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/providers/gathering/StringProviderValueGatherer.java
View File

@ -16,9 +16,7 @@
*/
package com.djrapitops.plan.extension.implementation.providers.gathering;
import com.djrapitops.plan.api.exceptions.DataExtensionMethodCallException;
import com.djrapitops.plan.db.Database;
import com.djrapitops.plan.db.access.transactions.Transaction;
import com.djrapitops.plan.exceptions.DataExtensionMethodCallException;
import com.djrapitops.plan.extension.DataExtension;
import com.djrapitops.plan.extension.implementation.ProviderInformation;
import com.djrapitops.plan.extension.implementation.providers.DataProvider;
@ -29,6 +27,8 @@ import com.djrapitops.plan.extension.implementation.storage.transactions.StoreIc
import com.djrapitops.plan.extension.implementation.storage.transactions.providers.StoreStringProviderTransaction;
import com.djrapitops.plan.extension.implementation.storage.transactions.results.StorePlayerStringResultTransaction;
import com.djrapitops.plan.extension.implementation.storage.transactions.results.StoreServerStringResultTransaction;
import com.djrapitops.plan.system.storage.database.Database;
import com.djrapitops.plan.system.storage.database.transactions.Transaction;
import org.apache.commons.lang3.StringUtils;
import java.util.Optional;

6
Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/providers/gathering/TableProviderValueGatherer.java
View File

@ -16,9 +16,7 @@
*/
package com.djrapitops.plan.extension.implementation.providers.gathering;
import com.djrapitops.plan.api.exceptions.DataExtensionMethodCallException;
import com.djrapitops.plan.db.Database;
import com.djrapitops.plan.db.access.transactions.Transaction;
import com.djrapitops.plan.exceptions.DataExtensionMethodCallException;
import com.djrapitops.plan.extension.DataExtension;
import com.djrapitops.plan.extension.icon.Icon;
import com.djrapitops.plan.extension.implementation.ProviderInformation;
@ -31,6 +29,8 @@ import com.djrapitops.plan.extension.implementation.storage.transactions.provide
import com.djrapitops.plan.extension.implementation.storage.transactions.results.StorePlayerTableResultTransaction;
import com.djrapitops.plan.extension.implementation.storage.transactions.results.StoreServerTableResultTransaction;
import com.djrapitops.plan.extension.table.Table;
import com.djrapitops.plan.system.storage.database.Database;
import com.djrapitops.plan.system.storage.database.transactions.Transaction;
import java.util.Optional;
import java.util.UUID;

5
Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/ExtensionStringData.java
View File

@ -16,8 +16,7 @@
*/
package com.djrapitops.plan.extension.implementation.results;
import com.djrapitops.plan.api.PlanAPI;
import com.djrapitops.plan.utilities.html.Html;
import com.djrapitops.plan.system.delivery.rendering.html.Html;
/**
* Represents double data returned by a DoubleProvider or PercentageProvider method.
@ -42,7 +41,7 @@ public class ExtensionStringData implements DescribedExtensionData {
public String getFormattedValue() {
String withColors = Html.swapColorCodesToSpan(value);
return !playerName ? withColors : Html.LINK.parse(PlanAPI.getInstance().getPlayerInspectPageLink(value), withColors);
return !playerName ? withColors : Html.LINK.parse("../player/" + value, withColors);
}
ExtensionStringData concatenate(ExtensionStringData other) {

4
Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/results/ExtensionTableData.java
View File

@ -55,7 +55,7 @@ public class ExtensionTableData implements Comparable<ExtensionTableData> {
if (rows.size() > 50) {
htmlTable.useJqueryDataTables(); // Use a jQuery data table since there are a lot of rows.
} else {
String colorName = com.djrapitops.plan.utilities.html.icon.Color.getByName(tableColor.name()).orElse(com.djrapitops.plan.utilities.html.icon.Color.NONE).getHtmlClass()
String colorName = com.djrapitops.plan.system.delivery.rendering.html.icon.Color.getByName(tableColor.name()).orElse(com.djrapitops.plan.system.delivery.rendering.html.icon.Color.NONE).getHtmlClass()
.replace("col-", ""); // TODO after PluginData deprecation, change this thing
htmlTable.setColor(colorName);
}
@ -75,7 +75,7 @@ public class ExtensionTableData implements Comparable<ExtensionTableData> {
if (column == null) {
break;
}
header.add(com.djrapitops.plan.utilities.html.icon.Icon.fromExtensionIcon(icons[i]).toHtml() + ' ' + column);
header.add(com.djrapitops.plan.system.delivery.rendering.html.icon.Icon.fromExtensionIcon(icons[i]).toHtml() + ' ' + column);
}
return header.toArray(new String[0]);

10
Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregateBooleansQuery.java
View File

@ -16,10 +16,6 @@
*/
package com.djrapitops.plan.extension.implementation.storage.queries;
import com.djrapitops.plan.db.SQLDB;
import com.djrapitops.plan.db.access.Query;
import com.djrapitops.plan.db.access.QueryStatement;
import com.djrapitops.plan.db.sql.tables.*;
import com.djrapitops.plan.extension.ElementOrder;
import com.djrapitops.plan.extension.icon.Color;
import com.djrapitops.plan.extension.icon.Family;
@ -29,6 +25,10 @@ import com.djrapitops.plan.extension.implementation.results.ExtensionData;
import com.djrapitops.plan.extension.implementation.results.ExtensionDescriptive;
import com.djrapitops.plan.extension.implementation.results.ExtensionDoubleData;
import com.djrapitops.plan.extension.implementation.results.ExtensionTabData;
import com.djrapitops.plan.system.storage.database.SQLDB;
import com.djrapitops.plan.system.storage.database.queries.Query;
import com.djrapitops.plan.system.storage.database.queries.QueryStatement;
import com.djrapitops.plan.system.storage.database.sql.tables.*;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@ -37,7 +37,7 @@ import java.util.Map;
import java.util.Optional;
import java.util.UUID;
import static com.djrapitops.plan.db.sql.parsing.Sql.*;
import static com.djrapitops.plan.system.storage.database.sql.parsing.Sql.*;
/**
* Query aggregated boolean values from player value table.

10
Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregateDoublesQuery.java
View File

@ -16,10 +16,6 @@
*/
package com.djrapitops.plan.extension.implementation.storage.queries;
import com.djrapitops.plan.db.SQLDB;
import com.djrapitops.plan.db.access.Query;
import com.djrapitops.plan.db.access.QueryStatement;
import com.djrapitops.plan.db.sql.tables.*;
import com.djrapitops.plan.extension.ElementOrder;
import com.djrapitops.plan.extension.icon.Color;
import com.djrapitops.plan.extension.icon.Family;
@ -29,6 +25,10 @@ import com.djrapitops.plan.extension.implementation.results.ExtensionData;
import com.djrapitops.plan.extension.implementation.results.ExtensionDescriptive;
import com.djrapitops.plan.extension.implementation.results.ExtensionDoubleData;
import com.djrapitops.plan.extension.implementation.results.ExtensionTabData;
import com.djrapitops.plan.system.storage.database.SQLDB;
import com.djrapitops.plan.system.storage.database.queries.Query;
import com.djrapitops.plan.system.storage.database.queries.QueryStatement;
import com.djrapitops.plan.system.storage.database.sql.tables.*;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@ -37,7 +37,7 @@ import java.util.Map;
import java.util.Optional;
import java.util.UUID;
import static com.djrapitops.plan.db.sql.parsing.Sql.*;
import static com.djrapitops.plan.system.storage.database.sql.parsing.Sql.*;
/**
* Query aggregated boolean values from player value table.

10
Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregateGroupsQuery.java
View File

@ -16,10 +16,6 @@
*/
package com.djrapitops.plan.extension.implementation.storage.queries;
import com.djrapitops.plan.db.SQLDB;
import com.djrapitops.plan.db.access.Query;
import com.djrapitops.plan.db.access.QueryStatement;
import com.djrapitops.plan.db.sql.tables.*;
import com.djrapitops.plan.extension.ElementOrder;
import com.djrapitops.plan.extension.icon.Color;
import com.djrapitops.plan.extension.icon.Family;
@ -27,6 +23,10 @@ import com.djrapitops.plan.extension.icon.Icon;
import com.djrapitops.plan.extension.implementation.results.ExtensionData;
import com.djrapitops.plan.extension.table.Table;
import com.djrapitops.plan.extension.table.TableAccessor;
import com.djrapitops.plan.system.storage.database.SQLDB;
import com.djrapitops.plan.system.storage.database.queries.Query;
import com.djrapitops.plan.system.storage.database.queries.QueryStatement;
import com.djrapitops.plan.system.storage.database.sql.tables.*;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@ -35,7 +35,7 @@ import java.util.Map;
import java.util.Optional;
import java.util.UUID;
import static com.djrapitops.plan.db.sql.parsing.Sql.*;
import static com.djrapitops.plan.system.storage.database.sql.parsing.Sql.*;
/**
* Query aggregated Group values from groups table.

10
Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregateNumbersQuery.java
View File

@ -16,10 +16,6 @@
*/
package com.djrapitops.plan.extension.implementation.storage.queries;
import com.djrapitops.plan.db.SQLDB;
import com.djrapitops.plan.db.access.Query;
import com.djrapitops.plan.db.access.QueryStatement;
import com.djrapitops.plan.db.sql.tables.*;
import com.djrapitops.plan.extension.ElementOrder;
import com.djrapitops.plan.extension.FormatType;
import com.djrapitops.plan.extension.icon.Color;
@ -30,6 +26,10 @@ import com.djrapitops.plan.extension.implementation.results.ExtensionData;
import com.djrapitops.plan.extension.implementation.results.ExtensionDescriptive;
import com.djrapitops.plan.extension.implementation.results.ExtensionNumberData;
import com.djrapitops.plan.extension.implementation.results.ExtensionTabData;
import com.djrapitops.plan.system.storage.database.SQLDB;
import com.djrapitops.plan.system.storage.database.queries.Query;
import com.djrapitops.plan.system.storage.database.queries.QueryStatement;
import com.djrapitops.plan.system.storage.database.sql.tables.*;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@ -38,7 +38,7 @@ import java.util.Map;
import java.util.Optional;
import java.util.UUID;
import static com.djrapitops.plan.db.sql.parsing.Sql.*;
import static com.djrapitops.plan.system.storage.database.sql.parsing.Sql.*;
/**
* Query aggregated boolean values from player value table.

10
Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregatePercentagesQuery.java
View File

@ -16,10 +16,6 @@
*/
package com.djrapitops.plan.extension.implementation.storage.queries;
import com.djrapitops.plan.db.SQLDB;
import com.djrapitops.plan.db.access.Query;
import com.djrapitops.plan.db.access.QueryStatement;
import com.djrapitops.plan.db.sql.tables.*;
import com.djrapitops.plan.extension.ElementOrder;
import com.djrapitops.plan.extension.icon.Color;
import com.djrapitops.plan.extension.icon.Family;
@ -29,6 +25,10 @@ import com.djrapitops.plan.extension.implementation.results.ExtensionData;
import com.djrapitops.plan.extension.implementation.results.ExtensionDescriptive;
import com.djrapitops.plan.extension.implementation.results.ExtensionDoubleData;
import com.djrapitops.plan.extension.implementation.results.ExtensionTabData;
import com.djrapitops.plan.system.storage.database.SQLDB;
import com.djrapitops.plan.system.storage.database.queries.Query;
import com.djrapitops.plan.system.storage.database.queries.QueryStatement;
import com.djrapitops.plan.system.storage.database.sql.tables.*;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@ -37,7 +37,7 @@ import java.util.Map;
import java.util.Optional;
import java.util.UUID;
import static com.djrapitops.plan.db.sql.parsing.Sql.*;
import static com.djrapitops.plan.system.storage.database.sql.parsing.Sql.*;
/**
* Query aggregated boolean values from player value table.

12
Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionInformationQueries.java
View File

@ -16,22 +16,22 @@
*/
package com.djrapitops.plan.extension.implementation.storage.queries;
import com.djrapitops.plan.db.access.Query;
import com.djrapitops.plan.db.access.QueryAllStatement;
import com.djrapitops.plan.db.access.QueryStatement;
import com.djrapitops.plan.db.sql.tables.ExtensionIconTable;
import com.djrapitops.plan.db.sql.tables.ExtensionPluginTable;
import com.djrapitops.plan.extension.icon.Color;
import com.djrapitops.plan.extension.icon.Family;
import com.djrapitops.plan.extension.icon.Icon;
import com.djrapitops.plan.extension.implementation.results.ExtensionInformation;
import com.djrapitops.plan.system.storage.database.queries.Query;
import com.djrapitops.plan.system.storage.database.queries.QueryAllStatement;
import com.djrapitops.plan.system.storage.database.queries.QueryStatement;
import com.djrapitops.plan.system.storage.database.sql.tables.ExtensionIconTable;
import com.djrapitops.plan.system.storage.database.sql.tables.ExtensionPluginTable;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.*;
import static com.djrapitops.plan.db.sql.parsing.Sql.*;
import static com.djrapitops.plan.system.storage.database.sql.parsing.Sql.*;
/**
* Queries for information about DataExtensions stored in the database.

16
Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionPlayerDataQuery.java
View File

@ -16,13 +16,6 @@
*/
package com.djrapitops.plan.extension.implementation.storage.queries;
import com.djrapitops.plan.db.SQLDB;
import com.djrapitops.plan.db.access.Query;
import com.djrapitops.plan.db.access.QueryStatement;
import com.djrapitops.plan.db.sql.tables.ExtensionIconTable;
import com.djrapitops.plan.db.sql.tables.ExtensionPlayerValueTable;
import com.djrapitops.plan.db.sql.tables.ExtensionProviderTable;
import com.djrapitops.plan.db.sql.tables.ExtensionTabTable;
import com.djrapitops.plan.extension.ElementOrder;
import com.djrapitops.plan.extension.FormatType;
import com.djrapitops.plan.extension.icon.Color;
@ -30,13 +23,20 @@ import com.djrapitops.plan.extension.icon.Family;
import com.djrapitops.plan.extension.icon.Icon;
import com.djrapitops.plan.extension.implementation.TabInformation;
import com.djrapitops.plan.extension.implementation.results.*;
import com.djrapitops.plan.system.storage.database.SQLDB;
import com.djrapitops.plan.system.storage.database.queries.Query;
import com.djrapitops.plan.system.storage.database.queries.QueryStatement;
import com.djrapitops.plan.system.storage.database.sql.tables.ExtensionIconTable;
import com.djrapitops.plan.system.storage.database.sql.tables.ExtensionPlayerValueTable;
import com.djrapitops.plan.system.storage.database.sql.tables.ExtensionProviderTable;
import com.djrapitops.plan.system.storage.database.sql.tables.ExtensionTabTable;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.*;
import static com.djrapitops.plan.db.sql.parsing.Sql.*;
import static com.djrapitops.plan.system.storage.database.sql.parsing.Sql.*;
/**
* Query all ExtensionData by Server UUIDs.

10
Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionPlayerGroupsQuery.java
View File

@ -16,10 +16,6 @@
*/
package com.djrapitops.plan.extension.implementation.storage.queries;
import com.djrapitops.plan.db.SQLDB;
import com.djrapitops.plan.db.access.Query;
import com.djrapitops.plan.db.access.QueryStatement;
import com.djrapitops.plan.db.sql.tables.*;
import com.djrapitops.plan.extension.ElementOrder;
import com.djrapitops.plan.extension.icon.Color;
import com.djrapitops.plan.extension.icon.Family;
@ -29,6 +25,10 @@ import com.djrapitops.plan.extension.implementation.results.ExtensionData;
import com.djrapitops.plan.extension.implementation.results.ExtensionDescriptive;
import com.djrapitops.plan.extension.implementation.results.ExtensionStringData;
import com.djrapitops.plan.extension.implementation.results.ExtensionTabData;
import com.djrapitops.plan.system.storage.database.SQLDB;
import com.djrapitops.plan.system.storage.database.queries.Query;
import com.djrapitops.plan.system.storage.database.queries.QueryStatement;
import com.djrapitops.plan.system.storage.database.sql.tables.*;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@ -37,7 +37,7 @@ import java.util.Map;
import java.util.Optional;
import java.util.UUID;
import static com.djrapitops.plan.db.sql.parsing.Sql.*;
import static com.djrapitops.plan.system.storage.database.sql.parsing.Sql.*;
/**
* Query player's Groups by Plugin ID inside ExtensionData objects.

16
Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionPlayerTablesQuery.java
View File

@ -16,13 +16,6 @@
*/
package com.djrapitops.plan.extension.implementation.storage.queries;
import com.djrapitops.plan.db.SQLDB;
import com.djrapitops.plan.db.access.Query;
import com.djrapitops.plan.db.access.QueryStatement;
import com.djrapitops.plan.db.sql.tables.ExtensionIconTable;
import com.djrapitops.plan.db.sql.tables.ExtensionPlayerTableValueTable;
import com.djrapitops.plan.db.sql.tables.ExtensionTabTable;
import com.djrapitops.plan.db.sql.tables.ExtensionTableProviderTable;
import com.djrapitops.plan.extension.ElementOrder;
import com.djrapitops.plan.extension.icon.Color;
import com.djrapitops.plan.extension.icon.Family;
@ -30,13 +23,20 @@ import com.djrapitops.plan.extension.icon.Icon;
import com.djrapitops.plan.extension.implementation.results.ExtensionData;
import com.djrapitops.plan.extension.table.Table;
import com.djrapitops.plan.extension.table.TableAccessor;
import com.djrapitops.plan.system.storage.database.SQLDB;
import com.djrapitops.plan.system.storage.database.queries.Query;
import com.djrapitops.plan.system.storage.database.queries.QueryStatement;
import com.djrapitops.plan.system.storage.database.sql.tables.ExtensionIconTable;
import com.djrapitops.plan.system.storage.database.sql.tables.ExtensionPlayerTableValueTable;
import com.djrapitops.plan.system.storage.database.sql.tables.ExtensionTabTable;
import com.djrapitops.plan.system.storage.database.sql.tables.ExtensionTableProviderTable;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.*;
import static com.djrapitops.plan.db.sql.parsing.Sql.*;
import static com.djrapitops.plan.system.storage.database.sql.parsing.Sql.*;
/**
* Query player tables from tableprovider table.

10
Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionServerDataQuery.java
View File

@ -16,10 +16,6 @@
*/
package com.djrapitops.plan.extension.implementation.storage.queries;
import com.djrapitops.plan.db.SQLDB;
import com.djrapitops.plan.db.access.Query;
import com.djrapitops.plan.db.access.QueryStatement;
import com.djrapitops.plan.db.sql.tables.*;
import com.djrapitops.plan.extension.ElementOrder;
import com.djrapitops.plan.extension.FormatType;
import com.djrapitops.plan.extension.icon.Color;
@ -27,13 +23,17 @@ import com.djrapitops.plan.extension.icon.Family;
import com.djrapitops.plan.extension.icon.Icon;
import com.djrapitops.plan.extension.implementation.TabInformation;
import com.djrapitops.plan.extension.implementation.results.*;
import com.djrapitops.plan.system.storage.database.SQLDB;
import com.djrapitops.plan.system.storage.database.queries.Query;
import com.djrapitops.plan.system.storage.database.queries.QueryStatement;
import com.djrapitops.plan.system.storage.database.sql.tables.*;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.*;
import static com.djrapitops.plan.db.sql.parsing.Sql.*;
import static com.djrapitops.plan.system.storage.database.sql.parsing.Sql.*;
/**
* Query ExtensionServerData of a server.

10
Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionServerPlayerDataTableQuery.java
View File

@ -16,15 +16,15 @@
*/
package com.djrapitops.plan.extension.implementation.storage.queries;
import com.djrapitops.plan.db.SQLDB;
import com.djrapitops.plan.db.access.Query;
import com.djrapitops.plan.db.access.QueryStatement;
import com.djrapitops.plan.db.sql.tables.*;
import com.djrapitops.plan.extension.FormatType;
import com.djrapitops.plan.extension.icon.Color;
import com.djrapitops.plan.extension.icon.Family;
import com.djrapitops.plan.extension.icon.Icon;
import com.djrapitops.plan.extension.implementation.results.*;
import com.djrapitops.plan.system.storage.database.SQLDB;
import com.djrapitops.plan.system.storage.database.queries.Query;
import com.djrapitops.plan.system.storage.database.queries.QueryStatement;
import com.djrapitops.plan.system.storage.database.sql.tables.*;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@ -34,7 +34,7 @@ import java.util.Map;
import java.util.UUID;
import java.util.stream.Collectors;
import static com.djrapitops.plan.db.sql.parsing.Sql.*;
import static com.djrapitops.plan.system.storage.database.sql.parsing.Sql.*;
/**
* Query Extension data of x most recent players on a server.

10
Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionServerTablesQuery.java
View File

@ -16,10 +16,6 @@
*/
package com.djrapitops.plan.extension.implementation.storage.queries;
import com.djrapitops.plan.db.SQLDB;
import com.djrapitops.plan.db.access.Query;
import com.djrapitops.plan.db.access.QueryStatement;
import com.djrapitops.plan.db.sql.tables.*;
import com.djrapitops.plan.extension.ElementOrder;
import com.djrapitops.plan.extension.icon.Color;
import com.djrapitops.plan.extension.icon.Family;
@ -27,13 +23,17 @@ import com.djrapitops.plan.extension.icon.Icon;
import com.djrapitops.plan.extension.implementation.results.ExtensionData;
import com.djrapitops.plan.extension.table.Table;
import com.djrapitops.plan.extension.table.TableAccessor;
import com.djrapitops.plan.system.storage.database.SQLDB;
import com.djrapitops.plan.system.storage.database.queries.Query;
import com.djrapitops.plan.system.storage.database.queries.QueryStatement;
import com.djrapitops.plan.system.storage.database.sql.tables.*;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.*;
import static com.djrapitops.plan.db.sql.parsing.Sql.*;
import static com.djrapitops.plan.system.storage.database.sql.parsing.Sql.*;
/**
* Query server tables from tableprovider table.

14
Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/StoreIconTransaction.java
View File

@ -16,18 +16,18 @@
*/
package com.djrapitops.plan.extension.implementation.storage.transactions;
import com.djrapitops.plan.db.access.ExecStatement;
import com.djrapitops.plan.db.access.Executable;
import com.djrapitops.plan.db.access.HasMoreThanZeroQueryStatement;
import com.djrapitops.plan.db.access.Query;
import com.djrapitops.plan.db.access.transactions.Transaction;
import com.djrapitops.plan.db.sql.tables.ExtensionIconTable;
import com.djrapitops.plan.extension.icon.Icon;
import com.djrapitops.plan.system.storage.database.queries.HasMoreThanZeroQueryStatement;
import com.djrapitops.plan.system.storage.database.queries.Query;
import com.djrapitops.plan.system.storage.database.sql.tables.ExtensionIconTable;
import com.djrapitops.plan.system.storage.database.transactions.ExecStatement;
import com.djrapitops.plan.system.storage.database.transactions.Executable;
import com.djrapitops.plan.system.storage.database.transactions.Transaction;
import java.sql.PreparedStatement;
import java.sql.SQLException;
import static com.djrapitops.plan.db.sql.parsing.Sql.*;
import static com.djrapitops.plan.system.storage.database.sql.parsing.Sql.*;
/**
* Transaction to store an Icon to the database.

14
Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/StorePluginTransaction.java
View File

@ -16,19 +16,19 @@
*/
package com.djrapitops.plan.extension.implementation.storage.transactions;
import com.djrapitops.plan.db.access.ExecStatement;
import com.djrapitops.plan.db.access.Executable;
import com.djrapitops.plan.db.access.transactions.Transaction;
import com.djrapitops.plan.db.sql.tables.ExtensionIconTable;
import com.djrapitops.plan.db.sql.tables.ExtensionPluginTable;
import com.djrapitops.plan.extension.icon.Icon;
import com.djrapitops.plan.system.storage.database.sql.tables.ExtensionIconTable;
import com.djrapitops.plan.system.storage.database.sql.tables.ExtensionPluginTable;
import com.djrapitops.plan.system.storage.database.transactions.ExecStatement;
import com.djrapitops.plan.system.storage.database.transactions.Executable;
import com.djrapitops.plan.system.storage.database.transactions.Transaction;
import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.util.UUID;
import static com.djrapitops.plan.db.sql.parsing.Sql.AND;
import static com.djrapitops.plan.db.sql.parsing.Sql.WHERE;
import static com.djrapitops.plan.system.storage.database.sql.parsing.Sql.AND;
import static com.djrapitops.plan.system.storage.database.sql.parsing.Sql.WHERE;
/**
* Transaction to update command usage information in the database.

16
Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/StoreTabInformationTransaction.java
View File

@ -16,21 +16,21 @@
*/
package com.djrapitops.plan.extension.implementation.storage.transactions;
import com.djrapitops.plan.db.access.ExecStatement;
import com.djrapitops.plan.db.access.Executable;
import com.djrapitops.plan.db.access.transactions.Transaction;
import com.djrapitops.plan.db.sql.tables.ExtensionIconTable;
import com.djrapitops.plan.db.sql.tables.ExtensionPluginTable;
import com.djrapitops.plan.db.sql.tables.ExtensionTabTable;
import com.djrapitops.plan.extension.ElementOrder;
import com.djrapitops.plan.extension.implementation.TabInformation;
import com.djrapitops.plan.system.storage.database.sql.tables.ExtensionIconTable;
import com.djrapitops.plan.system.storage.database.sql.tables.ExtensionPluginTable;
import com.djrapitops.plan.system.storage.database.sql.tables.ExtensionTabTable;
import com.djrapitops.plan.system.storage.database.transactions.ExecStatement;
import com.djrapitops.plan.system.storage.database.transactions.Executable;
import com.djrapitops.plan.system.storage.database.transactions.Transaction;
import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.util.UUID;
import static com.djrapitops.plan.db.sql.parsing.Sql.AND;
import static com.djrapitops.plan.db.sql.parsing.Sql.WHERE;
import static com.djrapitops.plan.system.storage.database.sql.parsing.Sql.AND;
import static com.djrapitops.plan.system.storage.database.sql.parsing.Sql.WHERE;
/**
* Transaction for storing {@link TabInformation}s.

18
Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/providers/StoreBooleanProviderTransaction.java
View File

@ -16,14 +16,14 @@
*/
package com.djrapitops.plan.extension.implementation.storage.transactions.providers;
import com.djrapitops.plan.db.access.ExecStatement;
import com.djrapitops.plan.db.access.Executable;
import com.djrapitops.plan.db.access.transactions.Transaction;
import com.djrapitops.plan.db.sql.tables.ExtensionIconTable;
import com.djrapitops.plan.db.sql.tables.ExtensionPluginTable;
import com.djrapitops.plan.db.sql.tables.ExtensionTabTable;
import com.djrapitops.plan.extension.implementation.ProviderInformation;
import com.djrapitops.plan.extension.implementation.providers.DataProvider;
import com.djrapitops.plan.system.storage.database.sql.tables.ExtensionIconTable;
import com.djrapitops.plan.system.storage.database.sql.tables.ExtensionPluginTable;
import com.djrapitops.plan.system.storage.database.sql.tables.ExtensionTabTable;
import com.djrapitops.plan.system.storage.database.transactions.ExecStatement;
import com.djrapitops.plan.system.storage.database.transactions.Executable;
import com.djrapitops.plan.system.storage.database.transactions.Transaction;
import java.sql.PreparedStatement;
import java.sql.SQLException;
@ -31,9 +31,9 @@ import java.sql.Types;
import java.util.Optional;
import java.util.UUID;
import static com.djrapitops.plan.db.sql.parsing.Sql.AND;
import static com.djrapitops.plan.db.sql.parsing.Sql.WHERE;
import static com.djrapitops.plan.db.sql.tables.ExtensionProviderTable.*;
import static com.djrapitops.plan.system.storage.database.sql.parsing.Sql.AND;
import static com.djrapitops.plan.system.storage.database.sql.parsing.Sql.WHERE;
import static com.djrapitops.plan.system.storage.database.sql.tables.ExtensionProviderTable.*;
/**
* Transaction to store information about a {@link com.djrapitops.plan.extension.implementation.providers.BooleanDataProvider}.

18
Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/providers/StoreDoubleProviderTransaction.java
View File

@ -16,14 +16,14 @@
*/
package com.djrapitops.plan.extension.implementation.storage.transactions.providers;
import com.djrapitops.plan.db.access.ExecStatement;
import com.djrapitops.plan.db.access.Executable;
import com.djrapitops.plan.db.access.transactions.Transaction;
import com.djrapitops.plan.db.sql.tables.ExtensionIconTable;
import com.djrapitops.plan.db.sql.tables.ExtensionPluginTable;
import com.djrapitops.plan.db.sql.tables.ExtensionTabTable;
import com.djrapitops.plan.extension.implementation.ProviderInformation;
import com.djrapitops.plan.extension.implementation.providers.DataProvider;
import com.djrapitops.plan.system.storage.database.sql.tables.ExtensionIconTable;
import com.djrapitops.plan.system.storage.database.sql.tables.ExtensionPluginTable;
import com.djrapitops.plan.system.storage.database.sql.tables.ExtensionTabTable;
import com.djrapitops.plan.system.storage.database.transactions.ExecStatement;
import com.djrapitops.plan.system.storage.database.transactions.Executable;
import com.djrapitops.plan.system.storage.database.transactions.Transaction;
import java.sql.PreparedStatement;
import java.sql.SQLException;
@ -31,9 +31,9 @@ import java.sql.Types;
import java.util.Optional;
import java.util.UUID;
import static com.djrapitops.plan.db.sql.parsing.Sql.AND;
import static com.djrapitops.plan.db.sql.parsing.Sql.WHERE;
import static com.djrapitops.plan.db.sql.tables.ExtensionProviderTable.*;
import static com.djrapitops.plan.system.storage.database.sql.parsing.Sql.AND;
import static com.djrapitops.plan.system.storage.database.sql.parsing.Sql.WHERE;
import static com.djrapitops.plan.system.storage.database.sql.tables.ExtensionProviderTable.*;
/**
* Transaction to store information about a dobule {@link DataProvider}.

18
Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/providers/StoreGroupProviderTransaction.java
View File

@ -16,14 +16,14 @@
*/
package com.djrapitops.plan.extension.implementation.storage.transactions.providers;
import com.djrapitops.plan.db.access.ExecStatement;
import com.djrapitops.plan.db.access.Executable;
import com.djrapitops.plan.db.access.transactions.Transaction;
import com.djrapitops.plan.db.sql.tables.ExtensionIconTable;
import com.djrapitops.plan.db.sql.tables.ExtensionPluginTable;
import com.djrapitops.plan.db.sql.tables.ExtensionTabTable;
import com.djrapitops.plan.extension.implementation.ProviderInformation;
import com.djrapitops.plan.extension.implementation.providers.DataProvider;
import com.djrapitops.plan.system.storage.database.sql.tables.ExtensionIconTable;
import com.djrapitops.plan.system.storage.database.sql.tables.ExtensionPluginTable;
import com.djrapitops.plan.system.storage.database.sql.tables.ExtensionTabTable;
import com.djrapitops.plan.system.storage.database.transactions.ExecStatement;
import com.djrapitops.plan.system.storage.database.transactions.Executable;
import com.djrapitops.plan.system.storage.database.transactions.Transaction;
import java.sql.PreparedStatement;
import java.sql.SQLException;
@ -31,9 +31,9 @@ import java.sql.Types;
import java.util.Optional;
import java.util.UUID;
import static com.djrapitops.plan.db.sql.parsing.Sql.AND;
import static com.djrapitops.plan.db.sql.parsing.Sql.WHERE;
import static com.djrapitops.plan.db.sql.tables.ExtensionProviderTable.*;
import static com.djrapitops.plan.system.storage.database.sql.parsing.Sql.AND;
import static com.djrapitops.plan.system.storage.database.sql.parsing.Sql.WHERE;
import static com.djrapitops.plan.system.storage.database.sql.tables.ExtensionProviderTable.*;
/**
* Transaction to store information about a {@link com.djrapitops.plan.extension.implementation.providers.GroupDataProvider}.

18
Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/providers/StoreNumberProviderTransaction.java
View File

@ -16,15 +16,15 @@
*/
package com.djrapitops.plan.extension.implementation.storage.transactions.providers;
import com.djrapitops.plan.db.access.ExecStatement;
import com.djrapitops.plan.db.access.Executable;
import com.djrapitops.plan.db.access.transactions.Transaction;
import com.djrapitops.plan.db.sql.tables.ExtensionIconTable;
import com.djrapitops.plan.db.sql.tables.ExtensionPluginTable;
import com.djrapitops.plan.db.sql.tables.ExtensionTabTable;
import com.djrapitops.plan.extension.FormatType;
import com.djrapitops.plan.extension.implementation.ProviderInformation;
import com.djrapitops.plan.extension.implementation.providers.DataProvider;
import com.djrapitops.plan.system.storage.database.sql.tables.ExtensionIconTable;
import com.djrapitops.plan.system.storage.database.sql.tables.ExtensionPluginTable;
import com.djrapitops.plan.system.storage.database.sql.tables.ExtensionTabTable;
import com.djrapitops.plan.system.storage.database.transactions.ExecStatement;
import com.djrapitops.plan.system.storage.database.transactions.Executable;
import com.djrapitops.plan.system.storage.database.transactions.Transaction;
import java.sql.PreparedStatement;
import java.sql.SQLException;
@ -32,9 +32,9 @@ import java.sql.Types;
import java.util.Optional;
import java.util.UUID;
import static com.djrapitops.plan.db.sql.parsing.Sql.AND;
import static com.djrapitops.plan.db.sql.parsing.Sql.WHERE;
import static com.djrapitops.plan.db.sql.tables.ExtensionProviderTable.*;
import static com.djrapitops.plan.system.storage.database.sql.parsing.Sql.AND;
import static com.djrapitops.plan.system.storage.database.sql.parsing.Sql.WHERE;
import static com.djrapitops.plan.system.storage.database.sql.tables.ExtensionProviderTable.*;
/**
* Transaction to store information about a {@link com.djrapitops.plan.extension.implementation.providers.NumberDataProvider}.

18
Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/providers/StoreStringProviderTransaction.java
View File

@ -16,14 +16,14 @@
*/
package com.djrapitops.plan.extension.implementation.storage.transactions.providers;
import com.djrapitops.plan.db.access.ExecStatement;
import com.djrapitops.plan.db.access.Executable;
import com.djrapitops.plan.db.access.transactions.Transaction;
import com.djrapitops.plan.db.sql.tables.ExtensionIconTable;
import com.djrapitops.plan.db.sql.tables.ExtensionPluginTable;
import com.djrapitops.plan.db.sql.tables.ExtensionTabTable;
import com.djrapitops.plan.extension.implementation.ProviderInformation;
import com.djrapitops.plan.extension.implementation.providers.DataProvider;
import com.djrapitops.plan.system.storage.database.sql.tables.ExtensionIconTable;
import com.djrapitops.plan.system.storage.database.sql.tables.ExtensionPluginTable;
import com.djrapitops.plan.system.storage.database.sql.tables.ExtensionTabTable;
import com.djrapitops.plan.system.storage.database.transactions.ExecStatement;
import com.djrapitops.plan.system.storage.database.transactions.Executable;
import com.djrapitops.plan.system.storage.database.transactions.Transaction;
import java.sql.PreparedStatement;
import java.sql.SQLException;
@ -31,9 +31,9 @@ import java.sql.Types;
import java.util.Optional;
import java.util.UUID;
import static com.djrapitops.plan.db.sql.parsing.Sql.AND;
import static com.djrapitops.plan.db.sql.parsing.Sql.WHERE;
import static com.djrapitops.plan.db.sql.tables.ExtensionProviderTable.*;
import static com.djrapitops.plan.system.storage.database.sql.parsing.Sql.AND;
import static com.djrapitops.plan.system.storage.database.sql.parsing.Sql.WHERE;
import static com.djrapitops.plan.system.storage.database.sql.tables.ExtensionProviderTable.*;
/**
* Transaction to store information about a {@link com.djrapitops.plan.extension.implementation.providers.StringDataProvider}.

18
Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/providers/StoreTableProviderTransaction.java
View File

@ -16,25 +16,25 @@
*/
package com.djrapitops.plan.extension.implementation.storage.transactions.providers;
import com.djrapitops.plan.db.access.ExecStatement;
import com.djrapitops.plan.db.access.Executable;
import com.djrapitops.plan.db.access.transactions.Transaction;
import com.djrapitops.plan.db.sql.tables.ExtensionIconTable;
import com.djrapitops.plan.db.sql.tables.ExtensionPluginTable;
import com.djrapitops.plan.db.sql.tables.ExtensionTabTable;
import com.djrapitops.plan.extension.icon.Color;
import com.djrapitops.plan.extension.icon.Icon;
import com.djrapitops.plan.extension.implementation.ProviderInformation;
import com.djrapitops.plan.extension.table.Table;
import com.djrapitops.plan.system.storage.database.sql.tables.ExtensionIconTable;
import com.djrapitops.plan.system.storage.database.sql.tables.ExtensionPluginTable;
import com.djrapitops.plan.system.storage.database.sql.tables.ExtensionTabTable;
import com.djrapitops.plan.system.storage.database.transactions.ExecStatement;
import com.djrapitops.plan.system.storage.database.transactions.Executable;
import com.djrapitops.plan.system.storage.database.transactions.Transaction;
import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.sql.Types;
import java.util.UUID;
import static com.djrapitops.plan.db.sql.parsing.Sql.AND;
import static com.djrapitops.plan.db.sql.parsing.Sql.WHERE;
import static com.djrapitops.plan.db.sql.tables.ExtensionTableProviderTable.*;
import static com.djrapitops.plan.system.storage.database.sql.parsing.Sql.AND;
import static com.djrapitops.plan.system.storage.database.sql.parsing.Sql.WHERE;
import static com.djrapitops.plan.system.storage.database.sql.tables.ExtensionTableProviderTable.*;
/**
* Transaction to store information about a {@link com.djrapitops.plan.extension.implementation.providers.TableDataProvider}.

10
Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/RemoveInvalidResultsTransaction.java
View File

@ -16,17 +16,17 @@
*/
package com.djrapitops.plan.extension.implementation.storage.transactions.results;
import com.djrapitops.plan.db.access.ExecStatement;
import com.djrapitops.plan.db.access.Executable;
import com.djrapitops.plan.db.access.transactions.Transaction;
import com.djrapitops.plan.db.sql.tables.*;
import com.djrapitops.plan.system.storage.database.sql.tables.*;
import com.djrapitops.plan.system.storage.database.transactions.ExecStatement;
import com.djrapitops.plan.system.storage.database.transactions.Executable;
import com.djrapitops.plan.system.storage.database.transactions.Transaction;
import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.util.Collection;
import java.util.UUID;
import static com.djrapitops.plan.db.sql.parsing.Sql.*;
import static com.djrapitops.plan.system.storage.database.sql.parsing.Sql.*;
/**
* Transaction to remove method results that correspond to {@link com.djrapitops.plan.extension.annotation.InvalidateMethod} annotations.

12
Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/RemoveUnsatisfiedConditionalPlayerResultsTransaction.java
View File

@ -16,16 +16,16 @@
*/
package com.djrapitops.plan.extension.implementation.storage.transactions.results;
import com.djrapitops.plan.db.DBType;
import com.djrapitops.plan.db.access.ExecStatement;
import com.djrapitops.plan.db.access.Executable;
import com.djrapitops.plan.db.access.transactions.Transaction;
import com.djrapitops.plan.db.sql.tables.*;
import com.djrapitops.plan.system.storage.database.DBType;
import com.djrapitops.plan.system.storage.database.sql.tables.*;
import com.djrapitops.plan.system.storage.database.transactions.ExecStatement;
import com.djrapitops.plan.system.storage.database.transactions.Executable;
import com.djrapitops.plan.system.storage.database.transactions.Transaction;
import java.sql.PreparedStatement;
import java.sql.SQLException;
import static com.djrapitops.plan.db.sql.parsing.Sql.*;
import static com.djrapitops.plan.system.storage.database.sql.parsing.Sql.*;
/**
* Transaction to remove older results that violate an updated condition value.

18
Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/RemoveUnsatisfiedConditionalServerResultsTransaction.java
View File

@ -16,19 +16,19 @@
*/
package com.djrapitops.plan.extension.implementation.storage.transactions.results;
import com.djrapitops.plan.db.DBType;
import com.djrapitops.plan.db.access.ExecStatement;
import com.djrapitops.plan.db.access.Executable;
import com.djrapitops.plan.db.access.transactions.Transaction;
import com.djrapitops.plan.db.sql.tables.ExtensionProviderTable;
import com.djrapitops.plan.db.sql.tables.ExtensionServerTableValueTable;
import com.djrapitops.plan.db.sql.tables.ExtensionServerValueTable;
import com.djrapitops.plan.db.sql.tables.ExtensionTableProviderTable;
import com.djrapitops.plan.system.storage.database.DBType;
import com.djrapitops.plan.system.storage.database.sql.tables.ExtensionProviderTable;
import com.djrapitops.plan.system.storage.database.sql.tables.ExtensionServerTableValueTable;
import com.djrapitops.plan.system.storage.database.sql.tables.ExtensionServerValueTable;
import com.djrapitops.plan.system.storage.database.sql.tables.ExtensionTableProviderTable;
import com.djrapitops.plan.system.storage.database.transactions.ExecStatement;
import com.djrapitops.plan.system.storage.database.transactions.Executable;
import com.djrapitops.plan.system.storage.database.transactions.Transaction;
import java.sql.PreparedStatement;
import java.sql.SQLException;
import static com.djrapitops.plan.db.sql.parsing.Sql.*;
import static com.djrapitops.plan.system.storage.database.sql.parsing.Sql.*;
/**
* Transaction to remove older results that violate an updated condition value.

14
Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/StorePlayerBooleanResultTransaction.java
View File

@ -16,18 +16,18 @@
*/
package com.djrapitops.plan.extension.implementation.storage.transactions.results;
import com.djrapitops.plan.db.access.ExecStatement;
import com.djrapitops.plan.db.access.Executable;
import com.djrapitops.plan.db.access.transactions.Transaction;
import com.djrapitops.plan.db.sql.tables.ExtensionProviderTable;
import com.djrapitops.plan.system.storage.database.sql.tables.ExtensionProviderTable;
import com.djrapitops.plan.system.storage.database.transactions.ExecStatement;
import com.djrapitops.plan.system.storage.database.transactions.Executable;
import com.djrapitops.plan.system.storage.database.transactions.Transaction;
import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.util.UUID;
import static com.djrapitops.plan.db.sql.parsing.Sql.AND;
import static com.djrapitops.plan.db.sql.parsing.Sql.WHERE;
import static com.djrapitops.plan.db.sql.tables.ExtensionPlayerValueTable.*;
import static com.djrapitops.plan.system.storage.database.sql.parsing.Sql.AND;
import static com.djrapitops.plan.system.storage.database.sql.parsing.Sql.WHERE;
import static com.djrapitops.plan.system.storage.database.sql.tables.ExtensionPlayerValueTable.*;
/**
* Transaction to store method result of a {@link com.djrapitops.plan.extension.implementation.providers.BooleanDataProvider}.

14
Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/StorePlayerDoubleResultTransaction.java
View File

@ -16,18 +16,18 @@
*/
package com.djrapitops.plan.extension.implementation.storage.transactions.results;
import com.djrapitops.plan.db.access.ExecStatement;
import com.djrapitops.plan.db.access.Executable;
import com.djrapitops.plan.db.access.transactions.Transaction;
import com.djrapitops.plan.db.sql.tables.ExtensionProviderTable;
import com.djrapitops.plan.system.storage.database.sql.tables.ExtensionProviderTable;
import com.djrapitops.plan.system.storage.database.transactions.ExecStatement;
import com.djrapitops.plan.system.storage.database.transactions.Executable;
import com.djrapitops.plan.system.storage.database.transactions.Transaction;
import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.util.UUID;
import static com.djrapitops.plan.db.sql.parsing.Sql.AND;
import static com.djrapitops.plan.db.sql.parsing.Sql.WHERE;
import static com.djrapitops.plan.db.sql.tables.ExtensionPlayerValueTable.*;
import static com.djrapitops.plan.system.storage.database.sql.parsing.Sql.AND;
import static com.djrapitops.plan.system.storage.database.sql.parsing.Sql.WHERE;
import static com.djrapitops.plan.system.storage.database.sql.tables.ExtensionPlayerValueTable.*;
/**
* Transaction to store method result of a {@link com.djrapitops.plan.extension.implementation.providers.DoubleDataProvider}.

14
Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/StorePlayerGroupsResultTransaction.java
View File

@ -16,19 +16,19 @@
*/
package com.djrapitops.plan.extension.implementation.storage.transactions.results;
import com.djrapitops.plan.db.access.ExecStatement;
import com.djrapitops.plan.db.access.Executable;
import com.djrapitops.plan.db.access.transactions.Transaction;
import com.djrapitops.plan.db.sql.tables.ExtensionGroupsTable;
import com.djrapitops.plan.db.sql.tables.ExtensionProviderTable;
import com.djrapitops.plan.system.storage.database.sql.tables.ExtensionGroupsTable;
import com.djrapitops.plan.system.storage.database.sql.tables.ExtensionProviderTable;
import com.djrapitops.plan.system.storage.database.transactions.ExecStatement;
import com.djrapitops.plan.system.storage.database.transactions.Executable;
import com.djrapitops.plan.system.storage.database.transactions.Transaction;
import org.apache.commons.lang3.StringUtils;
import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.util.UUID;
import static com.djrapitops.plan.db.sql.parsing.Sql.AND;
import static com.djrapitops.plan.db.sql.parsing.Sql.WHERE;
import static com.djrapitops.plan.system.storage.database.sql.parsing.Sql.AND;
import static com.djrapitops.plan.system.storage.database.sql.parsing.Sql.WHERE;
/**
* Transaction to store method result of a {@link com.djrapitops.plan.extension.implementation.providers.GroupDataProvider}.

14
Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/StorePlayerNumberResultTransaction.java
View File

@ -16,18 +16,18 @@
*/
package com.djrapitops.plan.extension.implementation.storage.transactions.results;
import com.djrapitops.plan.db.access.ExecStatement;
import com.djrapitops.plan.db.access.Executable;
import com.djrapitops.plan.db.access.transactions.Transaction;
import com.djrapitops.plan.db.sql.tables.ExtensionProviderTable;
import com.djrapitops.plan.system.storage.database.sql.tables.ExtensionProviderTable;
import com.djrapitops.plan.system.storage.database.transactions.ExecStatement;
import com.djrapitops.plan.system.storage.database.transactions.Executable;
import com.djrapitops.plan.system.storage.database.transactions.Transaction;
import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.util.UUID;
import static com.djrapitops.plan.db.sql.parsing.Sql.AND;
import static com.djrapitops.plan.db.sql.parsing.Sql.WHERE;
import static com.djrapitops.plan.db.sql.tables.ExtensionPlayerValueTable.*;
import static com.djrapitops.plan.system.storage.database.sql.parsing.Sql.AND;
import static com.djrapitops.plan.system.storage.database.sql.parsing.Sql.WHERE;
import static com.djrapitops.plan.system.storage.database.sql.tables.ExtensionPlayerValueTable.*;
/**
* Transaction to store method result of a {@link com.djrapitops.plan.extension.implementation.providers.NumberDataProvider}.

Some files were not shown because too many files have changed in this diff Show More