From 92910d647a2ffe614210f824426155a19fecaec5 Mon Sep 17 00:00:00 2001 From: Aurora Lahtela <24460436+AuroraLS3@users.noreply.github.com> Date: Sat, 18 Jun 2022 11:31:53 +0300 Subject: [PATCH] Revert API jar to Java 8 and update to Java 11 APIs --- Plan/api/build.gradle | 4 ++ .../PlaceholderCacheRefreshTask.java | 2 +- .../listeners/bukkit/DeathEventListener.java | 2 +- .../plan/utilities/java/Reflection.java | 2 +- .../djrapitops/plan/commands/PlanCommand.java | 2 +- .../subcommands/DataUtilityCommands.java | 2 +- .../commands/subcommands/LinkCommands.java | 2 +- .../subcommands/RegistrationCommands.java | 37 +++++++---------- .../commands/use/ConsoleMessageBuilder.java | 4 +- .../plan/delivery/domain/keys/CommonKeys.java | 12 +++--- .../plan/delivery/domain/keys/PlayerKeys.java | 8 ++-- .../plan/delivery/domain/keys/ServerKeys.java | 14 +++---- .../plan/delivery/domain/keys/Type.java | 4 +- .../domain/mutators/PlayersMutator.java | 2 +- .../delivery/export/NetworkPageExporter.java | 8 ++-- .../delivery/export/PlayerPageExporter.java | 8 ++-- .../delivery/export/PlayersPageExporter.java | 8 ++-- .../delivery/export/ServerPageExporter.java | 8 ++-- .../plan/delivery/rendering/html/Html.java | 18 +++------ .../graphs/special/SpecialGraphFactory.java | 2 +- .../delivery/rendering/pages/PlayerPage.java | 2 +- .../delivery/webserver/ResponseResolver.java | 2 +- .../plan/delivery/webserver/WebServer.java | 4 +- .../resolver/ServerPageResolver.java | 2 +- .../resolver/json/QueryJSONResolver.java | 3 +- .../resolver/json/WhoAmIJSONResolver.java | 2 +- .../ExtensionAggregateBooleansQuery.java | 2 +- .../ExtensionAggregateDoublesQuery.java | 2 +- .../ExtensionAggregateGroupsQuery.java | 2 +- .../ExtensionAggregateNumbersQuery.java | 2 +- .../ExtensionAggregatePercentagesQuery.java | 2 +- .../queries/ExtensionInformationQueries.java | 4 +- .../queries/ExtensionPlayerDataQuery.java | 2 +- .../queries/ExtensionPlayerGroupsQuery.java | 2 +- .../queries/ExtensionPlayerTablesQuery.java | 4 +- .../ExtensionQueryResultTableDataQuery.java | 4 +- .../queries/ExtensionServerDataQuery.java | 2 +- .../ExtensionServerTableDataQuery.java | 4 +- .../queries/ExtensionServerTablesQuery.java | 4 +- .../transactions/StoreIconTransaction.java | 2 +- .../StorePlayerTableResultTransaction.java | 4 +- .../StoreServerTableResultTransaction.java | 4 +- .../gathering/ServerUptimeCalculator.java | 2 +- .../plan/gathering/afk/AFKTracker.java | 2 +- .../plan/placeholder/PlanPlaceholders.java | 2 +- .../processors/player/MobKillProcessor.java | 11 +---- .../player/PlayerKillProcessor.java | 14 ++----- .../plan/settings/ConfigSystem.java | 2 +- .../plan/settings/config/ConfigNode.java | 2 +- .../plan/settings/config/ConfigWriter.java | 4 +- .../settings/config/WorldAliasSettings.java | 8 ++-- .../settings/config/changes/ConfigChange.java | 8 ++-- .../config/paths/DisplaySettings.java | 2 +- .../config/paths/key/StringListSetting.java | 4 +- .../network/ServerSettingsManager.java | 4 +- .../plan/storage/database/Database.java | 6 +-- .../plan/storage/database/SQLDB.java | 6 ++- .../database/queries/LargeFetchQueries.java | 4 +- .../queries/PerServerAggregateQueries.java | 4 +- .../database/queries/PlayerFetchQueries.java | 6 +-- .../database/queries/QueryStatement.java | 4 +- .../queries/ServerAggregateQueries.java | 6 +-- .../analysis/ActivityIndexQueries.java | 14 +++---- .../analysis/NetworkActivityIndexQueries.java | 16 ++++---- .../queries/analysis/PlayerCountQueries.java | 2 +- .../filters/PluginBooleanGroupFilter.java | 4 +- .../queries/objects/GeoInfoQueries.java | 2 +- .../queries/objects/JoinAddressQueries.java | 2 +- .../database/queries/objects/KillQueries.java | 8 ++-- .../queries/objects/NicknameQueries.java | 2 +- .../database/queries/objects/PingQueries.java | 12 +++--- .../queries/objects/ServerQueries.java | 18 ++++----- .../queries/objects/SessionQueries.java | 40 +++++++++---------- .../database/queries/objects/TPSQueries.java | 32 +++++++-------- .../objects/UserIdentifierQueries.java | 16 ++++---- .../queries/objects/UserInfoQueries.java | 10 ++--- .../queries/objects/WorldTimesQueries.java | 10 ++--- .../playertable/NetworkTablePlayersQuery.java | 2 +- .../playertable/QueryTablePlayersQuery.java | 2 +- .../playertable/ServerTablePlayersQuery.java | 2 +- .../queries/schema/MySQLSchemaQueries.java | 4 +- .../queries/schema/SQLiteSchemaQueries.java | 2 +- .../database/sql/tables/KillsTable.java | 2 +- .../database/sql/tables/WorldTimesTable.java | 2 +- .../database/transactions/ExecStatement.java | 4 +- .../RemoveDuplicateUserInfoTransaction.java | 2 +- .../init/RemoveOldExtensionsTransaction.java | 4 +- .../transactions/patches/DeleteIPsPatch.java | 4 +- .../LinkUsersToPlayersSecurityTablePatch.java | 2 +- .../patches/LitebansTableHeaderPatch.java | 2 +- .../patches/NicknameLastSeenPatch.java | 4 +- .../database/transactions/patches/Patch.java | 2 +- .../patches/PlayerTableRowPatch.java | 4 +- .../RegisterDateMinimizationPatch.java | 2 +- .../RemoveDanglingServerDataPatch.java | 4 +- .../patches/RemoveDanglingUserDataPatch.java | 2 +- .../patches/ServerTableRowPatch.java | 4 +- .../patches/SessionJoinAddressPatch.java | 6 +-- .../patches/WorldsServerIDPatch.java | 4 +- .../plan/storage/file/FileResource.java | 2 +- .../plan/storage/file/JarResource.java | 5 ++- .../plan/storage/upkeep/DBCleanTask.java | 2 +- .../commands/use/NukkitMessageBuilder.java | 4 +- .../listeners/nukkit/DeathEventListener.java | 4 +- .../listeners/SpongeListenerSystem.java | 1 - .../plan/modules/sponge/SpongeTaskModule.java | 1 - 106 files changed, 272 insertions(+), 312 deletions(-) diff --git a/Plan/api/build.gradle b/Plan/api/build.gradle index bdf6ff69d..de3b83892 100644 --- a/Plan/api/build.gradle +++ b/Plan/api/build.gradle @@ -4,6 +4,10 @@ dependencies { compileOnly "com.google.code.gson:gson:$gsonVersion" } +compileJava { + options.release = 8 +} + ext.apiVersion = '5.4-R0.1' publishing { diff --git a/Plan/bukkit/src/main/java/com/djrapitops/plan/addons/placeholderapi/PlaceholderCacheRefreshTask.java b/Plan/bukkit/src/main/java/com/djrapitops/plan/addons/placeholderapi/PlaceholderCacheRefreshTask.java index f9dd6dc24..ecb8f5bbb 100644 --- a/Plan/bukkit/src/main/java/com/djrapitops/plan/addons/placeholderapi/PlaceholderCacheRefreshTask.java +++ b/Plan/bukkit/src/main/java/com/djrapitops/plan/addons/placeholderapi/PlaceholderCacheRefreshTask.java @@ -49,7 +49,7 @@ public class PlaceholderCacheRefreshTask extends TaskSystem.Task { @Override public void run() { - if (!config.getNode("Plugins.PlaceholderAPI").isPresent()) { + if (config.getNode("Plugins.PlaceholderAPI").isEmpty()) { cancel(); // Cancel the task and don't do anything if PlaceholderAPI is not installed. return; } diff --git a/Plan/bukkit/src/main/java/com/djrapitops/plan/gathering/listeners/bukkit/DeathEventListener.java b/Plan/bukkit/src/main/java/com/djrapitops/plan/gathering/listeners/bukkit/DeathEventListener.java index 2c5844146..72dfa8b9f 100644 --- a/Plan/bukkit/src/main/java/com/djrapitops/plan/gathering/listeners/bukkit/DeathEventListener.java +++ b/Plan/bukkit/src/main/java/com/djrapitops/plan/gathering/listeners/bukkit/DeathEventListener.java @@ -74,7 +74,7 @@ public class DeathEventListener implements Listener { try { Optional foundKiller = findKiller(dead); - if (!foundKiller.isPresent()) { + if (foundKiller.isEmpty()) { return; } Player killer = foundKiller.get(); diff --git a/Plan/bukkit/src/main/java/com/djrapitops/plan/utilities/java/Reflection.java b/Plan/bukkit/src/main/java/com/djrapitops/plan/utilities/java/Reflection.java index 314b89355..f6e150a74 100644 --- a/Plan/bukkit/src/main/java/com/djrapitops/plan/utilities/java/Reflection.java +++ b/Plan/bukkit/src/main/java/com/djrapitops/plan/utilities/java/Reflection.java @@ -71,7 +71,7 @@ public final class Reflection { field.setAccessible(true); // A function for retrieving a specific field value - return new FieldAccessor() { + return new FieldAccessor<>() { @Override @SuppressWarnings("unchecked") diff --git a/Plan/common/src/main/java/com/djrapitops/plan/commands/PlanCommand.java b/Plan/common/src/main/java/com/djrapitops/plan/commands/PlanCommand.java index 23fc1a6c6..b0ffa738d 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/commands/PlanCommand.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/commands/PlanCommand.java @@ -369,7 +369,7 @@ public class PlanCommand { return DBType.names(); } Optional firstArgument = arguments.get(0); - if (!firstArgument.isPresent()) { + if (firstArgument.isEmpty()) { return tabCompleteCache.getMatchingBackupFilenames(null); } String part = firstArgument.get(); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/commands/subcommands/DataUtilityCommands.java b/Plan/common/src/main/java/com/djrapitops/plan/commands/subcommands/DataUtilityCommands.java index e844e3daa..0a8319df2 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/commands/subcommands/DataUtilityCommands.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/commands/subcommands/DataUtilityCommands.java @@ -231,7 +231,7 @@ public class DataUtilityCommands { } PlayerContainer player = dbSystem.getDatabase().query(ContainerFetchQueries.fetchPlayerContainer(playerUUID)); - if (!player.getValue(PlayerKeys.REGISTERED).isPresent()) { + if (player.getValue(PlayerKeys.REGISTERED).isEmpty()) { throw new IllegalArgumentException(locale.getString(CommandLang.FAIL_PLAYER_NOT_FOUND_REGISTER, identifier)); } diff --git a/Plan/common/src/main/java/com/djrapitops/plan/commands/subcommands/LinkCommands.java b/Plan/common/src/main/java/com/djrapitops/plan/commands/subcommands/LinkCommands.java index e6b7d0c6e..7088684f3 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/commands/subcommands/LinkCommands.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/commands/subcommands/LinkCommands.java @@ -194,7 +194,7 @@ public class LinkCommands { .addPart(colors.getMainColor() + locale.getString(CommandLang.LINK_NETWORK)) .apply(builder -> linkTo(builder, sender, address)) .send(); - if (!dbSystem.getDatabase().query(ServerQueries.fetchProxyServerInformation()).isPresent()) { + if (dbSystem.getDatabase().query(ServerQueries.fetchProxyServerInformation()).isEmpty()) { throw new IllegalArgumentException(locale.getString(CommandLang.NOTIFY_NO_NETWORK)); } } diff --git a/Plan/common/src/main/java/com/djrapitops/plan/commands/subcommands/RegistrationCommands.java b/Plan/common/src/main/java/com/djrapitops/plan/commands/subcommands/RegistrationCommands.java index c6f0c3e3f..87a1e56b3 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/commands/subcommands/RegistrationCommands.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/commands/subcommands/RegistrationCommands.java @@ -177,31 +177,26 @@ public class RegistrationCommands { UUID playerUUID = sender.getUUID().orElse(null); String username; - if (!givenUsername.isPresent() && playerUUID != null) { - Optional found = database.query(WebUserQueries.fetchUser(playerUUID)); - if (!found.isPresent()) { - throw new IllegalArgumentException(locale.getString(CommandLang.USER_NOT_LINKED)); - } - username = found.get().getUsername(); - } else if (!givenUsername.isPresent()) { + if (givenUsername.isEmpty() && playerUUID != null) { + username = database.query(WebUserQueries.fetchUser(playerUUID)) + .map(User::getUsername) + .orElseThrow(() -> new IllegalArgumentException(locale.getString(CommandLang.USER_NOT_LINKED))); + } else if (givenUsername.isEmpty()) { throw new IllegalArgumentException(locale.getString(CommandLang.FAIL_REQ_ONE_ARG, "<" + locale.getString(HelpLang.ARG_USERNAME) + ">")); } else { username = givenUsername.get(); } - Optional found = database.query(WebUserQueries.fetchUser(username)); - if (!found.isPresent()) { - throw new IllegalArgumentException(locale.getString(FailReason.USER_DOES_NOT_EXIST)); - } - User presentUser = found.get(); - boolean ownsTheUser = Objects.equals(playerUUID, presentUser.getLinkedToUUID()); + User user = database.query(WebUserQueries.fetchUser(username)) + .orElseThrow(() -> new IllegalArgumentException(locale.getString(FailReason.USER_DOES_NOT_EXIST))); + boolean ownsTheUser = Objects.equals(playerUUID, user.getLinkedToUUID()); if (!(ownsTheUser || sender.hasPermission(Permissions.UNREGISTER_OTHER.getPerm()))) { throw new IllegalArgumentException(locale.getString(CommandLang.USER_NOT_LINKED)); } if (sender.supportsChatEvents()) { sender.buildMessage() - .addPart(colors.getMainColor() + locale.getString(CommandLang.CONFIRM_UNREGISTER, presentUser.getUsername(), presentUser.getLinkedTo())).newLine() + .addPart(colors.getMainColor() + locale.getString(CommandLang.CONFIRM_UNREGISTER, user.getUsername(), user.getLinkedTo())).newLine() .addPart(colors.getTertiaryColor() + locale.getString(CommandLang.CONFIRM)) .addPart("§2§l[\u2714]").command("/" + mainCommand + " accept").hover(locale.getString(CommandLang.CONFIRM_ACCEPT)) .addPart(" ") @@ -209,7 +204,7 @@ public class RegistrationCommands { .send(); } else { sender.buildMessage() - .addPart(colors.getMainColor() + locale.getString(CommandLang.CONFIRM_UNREGISTER, presentUser.getUsername(), presentUser.getLinkedTo())).newLine() + .addPart(colors.getMainColor() + locale.getString(CommandLang.CONFIRM_UNREGISTER, user.getUsername(), user.getLinkedTo())).newLine() .addPart(colors.getTertiaryColor() + locale.getString(CommandLang.CONFIRM)).addPart("§a/" + mainCommand + " accept") .addPart(" ") .addPart("§c/" + mainCommand + " cancel") @@ -219,7 +214,7 @@ public class RegistrationCommands { confirmation.confirm(sender, choice -> { if (Boolean.TRUE.equals(choice)) { try { - sender.send(colors.getMainColor() + locale.getString(CommandLang.UNREGISTER, presentUser.getUsername())); + sender.send(colors.getMainColor() + locale.getString(CommandLang.UNREGISTER, user.getUsername())); database.executeTransaction(new RemoveWebUserTransaction(username)) .get(); // Wait for completion ActiveCookieStore.removeUserCookie(username); @@ -230,19 +225,15 @@ public class RegistrationCommands { errorLogger.warn(e, ErrorContext.builder().related("unregister command", sender, sender.getPlayerName().orElse("console"), arguments).build()); } } else { - sender.send(colors.getMainColor() + locale.getString(CommandLang.CONFIRM_CANCELLED_UNREGISTER, presentUser.getUsername())); + sender.send(colors.getMainColor() + locale.getString(CommandLang.CONFIRM_CANCELLED_UNREGISTER, user.getUsername())); } }); } public void onLogoutCommand(CMDSender sender, Arguments arguments) { - Optional username = arguments.get(0); - if (!username.isPresent()) { - throw new IllegalArgumentException(locale.getString(CommandLang.FAIL_REQ_ONE_ARG, locale.getString(HelpLang.ARG_USERNAME) + "/*")); - } - - String loggingOut = username.get(); + String loggingOut = arguments.get(0) + .orElseThrow(() -> new IllegalArgumentException(locale.getString(CommandLang.FAIL_REQ_ONE_ARG, locale.getString(HelpLang.ARG_USERNAME) + "/*"))); if ("*".equals(loggingOut)) { activeCookieStore.removeAll(); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/commands/use/ConsoleMessageBuilder.java b/Plan/common/src/main/java/com/djrapitops/plan/commands/use/ConsoleMessageBuilder.java index d7f22b453..4c8bcc203 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/commands/use/ConsoleMessageBuilder.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/commands/use/ConsoleMessageBuilder.java @@ -67,9 +67,7 @@ public class ConsoleMessageBuilder implements MessageBuilder { @Override public MessageBuilder indent(int spaces) { - for (int i = 0; i < spaces; i++) { - stringBuilder.append(' '); - } + stringBuilder.append(" ".repeat(Math.max(0, spaces))); return this; } diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/domain/keys/CommonKeys.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/domain/keys/CommonKeys.java index c1cab23f6..47a1a375b 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/domain/keys/CommonKeys.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/domain/keys/CommonKeys.java @@ -38,15 +38,15 @@ public class CommonKeys { public static final Key SERVER_UUID = new Key<>(UUID.class, "server_uuid"); public static final Key NAME = new Key<>(String.class, "name"); public static final PlaceholderKey REGISTERED = new PlaceholderKey<>(Long.class, "registered"); - public static final Key> PING = new Key<>(new Type>() {}, "ping"); + public static final Key> PING = new Key<>(new Type<>() {}, "ping"); - public static final Key> SESSIONS = new Key<>(new Type>() {}, "sessions"); + public static final Key> SESSIONS = new Key<>(new Type<>() {}, "sessions"); public static final Key WORLD_TIMES = new Key<>(WorldTimes.class, "world_times"); public static final PlaceholderKey LAST_SEEN = new PlaceholderKey<>(Long.class, "lastSeen"); - @Deprecated - public static final Key> PLAYER_DEATHS = new Key<>(new Type>() {}, "player_deaths"); - public static final Key> PLAYER_KILLS = new Key<>(new Type>() {}, "player_kills"); + @Deprecated(forRemoval = true, since = "5.0") + public static final Key> PLAYER_DEATHS = new Key<>(new Type<>() {}, "player_deaths"); + public static final Key> PLAYER_KILLS = new Key<>(new Type<>() {}, "player_kills"); public static final Key PLAYER_KILL_COUNT = new Key<>(Integer.class, "player_kill_count"); public static final Key PLAYER_DEATH_COUNT = new Key<>(Integer.class, "player_death_count"); public static final Key MOB_KILL_COUNT = new Key<>(Integer.class, "mob_kill_count"); @@ -61,6 +61,6 @@ public class CommonKeys { public static final Key TPS_MUTATOR = new Key<>(TPSMutator.class, "TPS_MUTATOR"); public static final Key PLAYERS_MUTATOR = new Key<>(PlayersMutator.class, "PLAYERS_MUTATOR"); - public static final Key>>> ACTIVITY_DATA = new Key<>(new Type>>>() {}, "ACTIVITY_DATA"); + public static final Key>>> ACTIVITY_DATA = new Key<>(new Type<>() {}, "ACTIVITY_DATA"); } \ No newline at end of file diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/domain/keys/PlayerKeys.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/domain/keys/PlayerKeys.java index f1d5c31fd..a23899f86 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/domain/keys/PlayerKeys.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/domain/keys/PlayerKeys.java @@ -38,12 +38,12 @@ public class PlayerKeys { public static final Key UUID = CommonKeys.UUID; public static final Key NAME = CommonKeys.NAME; - public static final Key> NICKNAMES = new Key<>(new Type>() {}, "nicknames"); + public static final Key> NICKNAMES = new Key<>(new Type<>() {}, "nicknames"); public static final PlaceholderKey REGISTERED = CommonKeys.REGISTERED; public static final Key KICK_COUNT = new Key<>(Integer.class, "kick_count"); - public static final Key> GEO_INFO = new Key<>(new Type>() {}, "geo_info"); + public static final Key> GEO_INFO = new Key<>(new Type<>() {}, "geo_info"); public static final Key> PING = CommonKeys.PING; public static final Key ACTIVE_SESSION = new Key<>(ActiveSession.class, "active_session"); @@ -51,9 +51,9 @@ public class PlayerKeys { public static final Key WORLD_TIMES = CommonKeys.WORLD_TIMES; public static final Key> PLAYER_KILLS = CommonKeys.PLAYER_KILLS; - public static final Key> PLAYER_DEATHS_KILLS = new Key<>(new Type>() { + public static final Key> PLAYER_DEATHS_KILLS = new Key<>(new Type<>() { }, "player_deaths_kills"); - @Deprecated + @Deprecated(forRemoval = true, since = "5.0") public static final Key> PLAYER_DEATHS = CommonKeys.PLAYER_DEATHS; public static final Key PLAYER_KILL_COUNT = CommonKeys.PLAYER_KILL_COUNT; public static final Key MOB_KILL_COUNT = CommonKeys.MOB_KILL_COUNT; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/domain/keys/ServerKeys.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/domain/keys/ServerKeys.java index 32c73f6a3..5c068fb05 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/domain/keys/ServerKeys.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/domain/keys/ServerKeys.java @@ -41,8 +41,8 @@ public class ServerKeys { public static final Key SERVER_UUID = CommonKeys.SERVER_UUID; public static final Key NAME = CommonKeys.NAME; - public static final Key> PLAYERS = new Key<>(new Type>() {}, "players"); - public static final Key> OPERATORS = new Key<>(new Type>() {}, "operators"); + public static final Key> PLAYERS = new Key<>(new Type<>() {}, "players"); + public static final Key> OPERATORS = new Key<>(new Type<>() {}, "operators"); public static final Key PLAYER_COUNT = new Key<>(Integer.class, "player_count"); public static final Key> SESSIONS = CommonKeys.SESSIONS; @@ -54,10 +54,10 @@ public class ServerKeys { public static final Key MOB_KILL_COUNT = CommonKeys.MOB_KILL_COUNT; public static final Key DEATH_COUNT = CommonKeys.DEATH_COUNT; - public static final Key> TPS = new Key<>(new Type>() {}, "tps"); - public static final Key> ALL_TIME_PEAK_PLAYERS = new Key<>(new Type>() {}, "all_time_peak_players"); - public static final Key> RECENT_PEAK_PLAYERS = new Key<>(new Type>() {}, "recent_peak_players"); + public static final Key> TPS = new Key<>(new Type<>() {}, "tps"); + public static final Key> ALL_TIME_PEAK_PLAYERS = new Key<>(new Type<>() {}, "all_time_peak_players"); + public static final Key> RECENT_PEAK_PLAYERS = new Key<>(new Type<>() {}, "recent_peak_players"); @Deprecated - public static final Key> COMMAND_USAGE = new Key<>(new Type>() {}, "command_usage"); - public static final Key> EXTENSION_DATA = new Key<>(new Type>() {}, "extension_data"); + public static final Key> COMMAND_USAGE = new Key<>(new Type<>() {}, "command_usage"); + public static final Key> EXTENSION_DATA = new Key<>(new Type<>() {}, "extension_data"); } \ No newline at end of file diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/domain/keys/Type.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/domain/keys/Type.java index f784132f3..d2e87f74d 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/domain/keys/Type.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/domain/keys/Type.java @@ -34,11 +34,11 @@ public abstract class Type { } public static Type ofClass(Class of) { - return new Type() {}; + return new Type<>() {}; } public static Type of(K object) { - return new Type() {}; + return new Type<>() {}; } public Class> getGenericsClass() { diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/domain/mutators/PlayersMutator.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/domain/mutators/PlayersMutator.java index f34e7ee07..19a5f5b22 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/domain/mutators/PlayersMutator.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/domain/mutators/PlayersMutator.java @@ -127,7 +127,7 @@ public class PlayersMutator { Map> pingPerCountry = new HashMap<>(); for (PlayerContainer player : players) { Optional mostRecent = GeoInfoMutator.forContainer(player).mostRecent(); - if (!mostRecent.isPresent()) { + if (mostRecent.isEmpty()) { continue; } List pings = player.getValue(PlayerKeys.PING).orElse(new ArrayList<>()); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/export/NetworkPageExporter.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/export/NetworkPageExporter.java index 9b5deb346..3745f5812 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/export/NetworkPageExporter.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/export/NetworkPageExporter.java @@ -147,17 +147,15 @@ public class NetworkPageExporter extends FileExporter { } private void exportJSON(ExportPaths exportPaths, Path toDirectory, String resource) throws IOException { - Optional found = getJSONResponse(resource); - if (!found.isPresent()) { - throw new NotFoundException(resource + " was not properly exported: not found"); - } + Response response = getJSONResponse(resource) + .orElseThrow(() -> new NotFoundException(resource + " was not properly exported: not found")); String jsonResourceName = toFileName(toJSONResourceName(resource)) + ".json"; String relativePlayerLink = toRelativePathFromRoot("player"); export(toDirectory.resolve("data").resolve(jsonResourceName), // Replace ../player in urls to fix player page links - StringUtils.replaceEach(found.get().getAsString(), + StringUtils.replaceEach(response.getAsString(), new String[]{StringEscapeUtils.escapeJson("../player"), StringEscapeUtils.escapeJson("./player")}, new String[]{StringEscapeUtils.escapeJson(relativePlayerLink), StringEscapeUtils.escapeJson(relativePlayerLink)} ) diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/export/PlayerPageExporter.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/export/PlayerPageExporter.java index 5de89c2f8..1efc7f947 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/export/PlayerPageExporter.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/export/PlayerPageExporter.java @@ -113,14 +113,12 @@ public class PlayerPageExporter extends FileExporter { } private void exportJSON(ExportPaths exportPaths, Path toDirectory, String resource) throws IOException { - Optional found = getJSONResponse(resource); - if (!found.isPresent()) { - throw new NotFoundException(resource + " was not properly exported: no response"); - } + Response response = getJSONResponse(resource) + .orElseThrow(() -> new NotFoundException(resource + " was not properly exported: no response")); String jsonResourceName = toFileName(toJSONResourceName(resource)) + ".json"; - export(toDirectory.resolve(jsonResourceName), found.get().getBytes()); + export(toDirectory.resolve(jsonResourceName), response.getBytes()); exportPaths.put("../v1/player?player=${encodeURIComponent(playerUUID)}", "./" + jsonResourceName); } diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/export/PlayersPageExporter.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/export/PlayersPageExporter.java index fc2e85dfd..2ea8dffff 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/export/PlayersPageExporter.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/export/PlayersPageExporter.java @@ -109,16 +109,14 @@ public class PlayersPageExporter extends FileExporter { } private void exportJSON(Path toDirectory) throws IOException { - Optional found = getJSONResponse("players"); - if (!found.isPresent()) { - throw new NotFoundException("players page was not properly exported: not found"); - } + Response response = getJSONResponse("players") + .orElseThrow(() -> new NotFoundException("players page was not properly exported: not found")); String jsonResourceName = toFileName(toJSONResourceName("players")) + ".json"; export(toDirectory.resolve("data").resolve(jsonResourceName), // Replace ../player in urls to fix player page links - StringUtils.replace(found.get().getAsString(), "../player", toRelativePathFromRoot("player")) + StringUtils.replace(response.getAsString(), "../player", toRelativePathFromRoot("player")) ); exportPaths.put("./v1/players", toRelativePathFromRoot("data/" + jsonResourceName)); } diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/export/ServerPageExporter.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/export/ServerPageExporter.java index 178e36a5d..82800a6da 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/export/ServerPageExporter.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/export/ServerPageExporter.java @@ -166,17 +166,15 @@ public class ServerPageExporter extends FileExporter { } private void exportJSON(Path toDirectory, String resource) throws IOException { - Optional found = getJSONResponse(resource); - if (!found.isPresent()) { - throw new NotFoundException(resource + " was not properly exported: not found"); - } + Response response = getJSONResponse(resource) + .orElseThrow(() -> new NotFoundException(resource + " was not properly exported: not found")); String jsonResourceName = toFileName(toJSONResourceName(resource)) + ".json"; export(toDirectory.resolve("data").resolve(jsonResourceName), // Replace ../player in urls to fix player page links StringUtils.replace( - found.get().getAsString(), + response.getAsString(), StringEscapeUtils.escapeJson("../player"), StringEscapeUtils.escapeJson(toRelativePathFromRoot("player")) ) diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/html/Html.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/html/Html.java index 946640c0a..c9ae1129d 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/html/Html.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/html/Html.java @@ -21,8 +21,8 @@ import org.apache.commons.text.StringSubstitutor; import org.apache.commons.text.TextStringBuilder; import java.io.Serializable; -import java.io.UnsupportedEncodingException; import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.Map; @@ -178,9 +178,7 @@ public enum Html { } private static void appendEndTags(StringBuilder result, int placedSpans) { - for (int i = 0; i < placedSpans; i++) { - result.append(""); - } + result.append("".repeat(Math.max(0, placedSpans))); } /** @@ -200,13 +198,9 @@ public enum Html { } public static String encodeToURL(String string) { - try { - return StringUtils.replace( - URLEncoder.encode(string, "UTF-8"), - "+", "%20" // Encoding replaces spaces with + - ); - } catch (UnsupportedEncodingException e) { - return string; - } + return StringUtils.replace( + URLEncoder.encode(string, StandardCharsets.UTF_8), + "+", "%20" // Encoding replaces spaces with + + ); } } diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/graphs/special/SpecialGraphFactory.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/graphs/special/SpecialGraphFactory.java index 43795461a..27c259631 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/graphs/special/SpecialGraphFactory.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/graphs/special/SpecialGraphFactory.java @@ -71,7 +71,7 @@ public class SpecialGraphFactory { private void prepareGeocodes() { try { geoCodes = files.getResourceFromJar("geocodes.json") - .asParsed(gson, new TypeToken>() {}); + .asParsed(gson, new TypeToken<>() {}); } catch (IOException e) { geoCodes = new HashMap<>(); errorLogger.error(e, ErrorContext.builder().whatToDo("Failed to read geocodes.json from jar. Try restarting the server.").build()); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/PlayerPage.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/PlayerPage.java index feb98d03d..87f081a10 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/PlayerPage.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/PlayerPage.java @@ -81,7 +81,7 @@ public class PlayerPage implements Page { @Override public String toHtml() { - if (!player.getValue(PlayerKeys.REGISTERED).isPresent()) { + if (player.getValue(PlayerKeys.REGISTERED).isEmpty()) { throw new IllegalStateException("Player is not registered"); } return createFor(player); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/ResponseResolver.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/ResponseResolver.java index 87e743bd5..77e98e392 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/ResponseResolver.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/ResponseResolver.java @@ -181,7 +181,7 @@ public class ResponseResolver { for (Resolver resolver : foundResolvers) { boolean isAuthRequired = webServer.get().isAuthRequired() && resolver.requiresAuth(request); if (isAuthRequired) { - if (!user.isPresent()) { + if (user.isEmpty()) { if (webServer.get().isUsingHTTPS()) { throw new WebUserAuthException(FailReason.NO_USER_PRESENT); } else { diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/WebServer.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/WebServer.java index 41d7f23e1..953de2a46 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/WebServer.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/WebServer.java @@ -94,7 +94,7 @@ public class WebServer implements SubSystem { initServer(); - if (!addresses.getAccessAddress().isPresent()) { + if (addresses.getAccessAddress().isEmpty()) { logger.warn(locale.getString(PluginLang.ENABLE_NOTIFY_BAD_IP)); } @@ -160,7 +160,7 @@ public class WebServer implements SubSystem { logger.info(locale.getString(PluginLang.ENABLED_WEB_SERVER, server.getAddress().getPort(), address)); boolean usingAlternativeIP = config.isTrue(WebserverSettings.SHOW_ALTERNATIVE_IP); - if (!usingAlternativeIP && !addresses.getAccessAddress().isPresent()) { + if (!usingAlternativeIP && addresses.getAccessAddress().isEmpty()) { logger.info("§e" + locale.getString(PluginLang.ENABLE_NOTIFY_EMPTY_IP)); } } catch (BindException failedToBind) { diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/ServerPageResolver.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/ServerPageResolver.java index 8bacfdfe7..079f80018 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/ServerPageResolver.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/ServerPageResolver.java @@ -95,7 +95,7 @@ public class ServerPageResolver implements Resolver { private Optional getServerUUID(URIPath path) { if (serverInfo.getServer().isProxy() && path.getPart(0).map("network"::equals).orElse(false) - && !path.getPart(1).isPresent() // No slash at the end. + && path.getPart(1).isEmpty() // No slash at the end. ) { return Optional.of(serverInfo.getServerUUID()); } diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/QueryJSONResolver.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/QueryJSONResolver.java index 6167dcf67..88fc1a4e2 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/QueryJSONResolver.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/QueryJSONResolver.java @@ -55,6 +55,7 @@ import javax.inject.Inject; import javax.inject.Singleton; import java.io.IOException; import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; import java.text.ParseException; import java.util.*; @@ -130,7 +131,7 @@ public class QueryJSONResolver implements Resolver { private InputQueryDto parseInputQueryFromQueryParams(Request request) { String q = request.getQuery().get("q").orElseThrow(() -> new BadRequestException("'q' parameter not set (expecting json array)")); try { - String query = URLDecoder.decode(q, "UTF-8"); + String query = URLDecoder.decode(q, StandardCharsets.UTF_8); List queryFilters = InputFilterDto.parse(query, gson); ViewDto view = request.getQuery().get("view") .map(viewJson -> gson.fromJson(viewJson, ViewDto.class)) diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/WhoAmIJSONResolver.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/WhoAmIJSONResolver.java index 360820c50..206616ec8 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/WhoAmIJSONResolver.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/WhoAmIJSONResolver.java @@ -45,7 +45,7 @@ public class WhoAmIJSONResolver implements NoAuthResolver { private Response getResponse(Request request) { Optional foundUser = request.getUser(); - if (!foundUser.isPresent()) { + if (foundUser.isEmpty()) { return Response.builder() .setJSONContent(Maps.builder(String.class, Boolean.class) .put("authRequired", webServer.get().isAuthRequired()) diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregateBooleansQuery.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregateBooleansQuery.java index 7f2e20ff6..5c38b3799 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregateBooleansQuery.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregateBooleansQuery.java @@ -104,7 +104,7 @@ public class ExtensionAggregateBooleansQuery implements Query>(sql, 1000) { + return db.query(new QueryStatement<>(sql, 1000) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setBoolean(1, true); // selectTrueBooleans parameter diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregateDoublesQuery.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregateDoublesQuery.java index 464bc6387..010e050cb 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregateDoublesQuery.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregateDoublesQuery.java @@ -103,7 +103,7 @@ public class ExtensionAggregateDoublesQuery implements Query>(sql, 1000) { + return db.query(new QueryStatement<>(sql, 1000) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, serverUUID.toString()); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregateGroupsQuery.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregateGroupsQuery.java index b8e5b3938..0835b5c7f 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregateGroupsQuery.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregateGroupsQuery.java @@ -92,7 +92,7 @@ public class ExtensionAggregateGroupsQuery implements Query>(sql, 1000) { + return db.query(new QueryStatement<>(sql, 1000) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, serverUUID.toString()); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregateNumbersQuery.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregateNumbersQuery.java index c0caa7467..79d7ce3c1 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregateNumbersQuery.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregateNumbersQuery.java @@ -107,7 +107,7 @@ public class ExtensionAggregateNumbersQuery implements Query>(sql, 1000) { + return db.query(new QueryStatement<>(sql, 1000) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, serverUUID.toString()); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregatePercentagesQuery.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregatePercentagesQuery.java index 92c0c06be..e67c77bc3 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregatePercentagesQuery.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregatePercentagesQuery.java @@ -94,7 +94,7 @@ public class ExtensionAggregatePercentagesQuery implements Query>(sql, 1000) { + return db.query(new QueryStatement<>(sql, 1000) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, serverUUID.toString()); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionInformationQueries.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionInformationQueries.java index 26fd2af79..dc6b36a15 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionInformationQueries.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionInformationQueries.java @@ -61,7 +61,7 @@ public class ExtensionInformationQueries { ExtensionPluginTable.ICON_ID + "=" + ExtensionIconTable.TABLE_NAME + '.' + ExtensionIconTable.ID + WHERE + ExtensionPluginTable.SERVER_UUID + "=?"; - return new QueryStatement>(sql, 100) { + return new QueryStatement<>(sql, 100) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, serverUUID.toString()); @@ -102,7 +102,7 @@ public class ExtensionInformationQueries { INNER_JOIN + ExtensionIconTable.TABLE_NAME + " on " + ExtensionPluginTable.ICON_ID + "=" + ExtensionIconTable.TABLE_NAME + '.' + ExtensionIconTable.ID; - return new QueryAllStatement>>(sql, 100) { + return new QueryAllStatement<>(sql, 100) { @Override public Map> processResults(ResultSet set) throws SQLException { Map> byServerUUID = new HashMap<>(); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionPlayerDataQuery.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionPlayerDataQuery.java index 21743ba49..f99b17da0 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionPlayerDataQuery.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionPlayerDataQuery.java @@ -137,7 +137,7 @@ public class ExtensionPlayerDataQuery implements Query>(sql, 1000) { + return new QueryStatement<>(sql, 1000) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, playerUUID.toString()); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionPlayerGroupsQuery.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionPlayerGroupsQuery.java index 98a86df40..6d14518d0 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionPlayerGroupsQuery.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionPlayerGroupsQuery.java @@ -86,7 +86,7 @@ public class ExtensionPlayerGroupsQuery implements Query>(sql, 1000) { + return new QueryStatement<>(sql, 1000) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, playerUUID.toString()); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionPlayerTablesQuery.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionPlayerTablesQuery.java index 139b6b7a2..bd3c96a63 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionPlayerTablesQuery.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionPlayerTablesQuery.java @@ -77,7 +77,7 @@ public class ExtensionPlayerTablesQuery implements Query(selectTableValues, 10000) { + return new QueryStatement<>(selectTableValues, 10000) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, playerUUID.toString()); @@ -152,7 +152,7 @@ public class ExtensionPlayerTablesQuery implements Query(selectTables, 100) { + return new QueryStatement<>(selectTables, 100) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, playerUUID.toString()); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionQueryResultTableDataQuery.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionQueryResultTableDataQuery.java index 36b24efda..ce2cd9cdb 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionQueryResultTableDataQuery.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionQueryResultTableDataQuery.java @@ -104,7 +104,7 @@ public class ExtensionQueryResultTableDataQuery implements Query>(sql, 1000) { + return new QueryStatement<>(sql, 1000) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setBoolean(1, true); // Select only values that should be shown @@ -138,7 +138,7 @@ public class ExtensionQueryResultTableDataQuery implements Query>(sql, 1000) { + return new QueryStatement<>(sql, 1000) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, serverUUID.toString()); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionServerDataQuery.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionServerDataQuery.java index 6ed988c7d..650e9f31b 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionServerDataQuery.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionServerDataQuery.java @@ -140,7 +140,7 @@ public class ExtensionServerDataQuery implements Query> { WHERE + ExtensionPluginTable.SERVER_UUID + "=?" + AND + "p1." + ExtensionProviderTable.HIDDEN + "=?"; - return new QueryStatement>(sql, 1000) { + return new QueryStatement<>(sql, 1000) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, serverUUID.toString()); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionServerTableDataQuery.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionServerTableDataQuery.java index 46ee89a27..fc18efc11 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionServerTableDataQuery.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionServerTableDataQuery.java @@ -105,7 +105,7 @@ public class ExtensionServerTableDataQuery implements Query>(sql, 1000) { + return new QueryStatement<>(sql, 1000) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setInt(1, xMostRecentPlayers); // Limit to x most recently seen players @@ -143,7 +143,7 @@ public class ExtensionServerTableDataQuery implements Query>(sql, 1000) { + return new QueryStatement<>(sql, 1000) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setInt(1, xMostRecentPlayers); // Limit to x most recently seen players diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionServerTablesQuery.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionServerTablesQuery.java index 4e4060eda..efe53ca47 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionServerTablesQuery.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionServerTablesQuery.java @@ -80,7 +80,7 @@ public class ExtensionServerTablesQuery implements Query(selectTableValues, 10000) { + return new QueryStatement<>(selectTableValues, 10000) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, serverUUID.toString()); @@ -162,7 +162,7 @@ public class ExtensionServerTablesQuery implements Query cachedSession = SessionCache.getCachedSession(uuid); - if (!cachedSession.isPresent()) { - return; - } - ActiveSession session = cachedSession.get(); - - session.addMobKill(); + SessionCache.getCachedSession(uuid).ifPresent(ActiveSession::addMobKill); } } diff --git a/Plan/common/src/main/java/com/djrapitops/plan/processing/processors/player/PlayerKillProcessor.java b/Plan/common/src/main/java/com/djrapitops/plan/processing/processors/player/PlayerKillProcessor.java index 49933e3b8..93a59d6db 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/processing/processors/player/PlayerKillProcessor.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/processing/processors/player/PlayerKillProcessor.java @@ -18,12 +18,9 @@ package com.djrapitops.plan.processing.processors.player; import com.djrapitops.plan.delivery.domain.ServerIdentifier; import com.djrapitops.plan.gathering.cache.SessionCache; -import com.djrapitops.plan.gathering.domain.ActiveSession; import com.djrapitops.plan.gathering.domain.PlayerKill; import com.djrapitops.plan.processing.CriticalRunnable; -import java.util.Optional; - /** * Processor Class for KillEvent information when the killer is a * player. @@ -50,12 +47,9 @@ public class PlayerKillProcessor implements CriticalRunnable { @Override public void run() { - Optional cachedSession = SessionCache.getCachedSession(killer.getUuid()); - if (!cachedSession.isPresent()) { - return; - } - ActiveSession session = cachedSession.get(); - - session.addPlayerKill(new PlayerKill(killer, victim, server, weaponName, time)); + SessionCache.getCachedSession(killer.getUuid()) + .ifPresent(session -> session.addPlayerKill( + new PlayerKill(killer, victim, server, weaponName, time) + )); } } diff --git a/Plan/common/src/main/java/com/djrapitops/plan/settings/ConfigSystem.java b/Plan/common/src/main/java/com/djrapitops/plan/settings/ConfigSystem.java index 7a24778b4..3a4fc03bb 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/settings/ConfigSystem.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/settings/ConfigSystem.java @@ -90,7 +90,7 @@ public abstract class ConfigSystem implements SubSystem { public void checkWrongTimeZone() { String timeZone = config.get(FormatSettings.TIMEZONE); Optional foundTZ = TimeZoneUtility.parseTimeZone(timeZone); - if (!foundTZ.isPresent()) { + if (foundTZ.isEmpty()) { logger.warn("Config: " + FormatSettings.TIMEZONE.getPath() + " has invalid value '" + timeZone + "', using GMT+0"); } } diff --git a/Plan/common/src/main/java/com/djrapitops/plan/settings/config/ConfigNode.java b/Plan/common/src/main/java/com/djrapitops/plan/settings/config/ConfigNode.java index ec4906af1..532ea3183 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/settings/config/ConfigNode.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/settings/config/ConfigNode.java @@ -178,7 +178,7 @@ public class ConfigNode { */ public boolean moveChild(String oldPath, String newPath) { Optional found = getNode(oldPath); - if (!found.isPresent()) { + if (found.isEmpty()) { return false; } diff --git a/Plan/common/src/main/java/com/djrapitops/plan/settings/config/ConfigWriter.java b/Plan/common/src/main/java/com/djrapitops/plan/settings/config/ConfigWriter.java index 0cb9873fe..13ce9aa94 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/settings/config/ConfigWriter.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/settings/config/ConfigWriter.java @@ -171,8 +171,6 @@ public class ConfigWriter { } private void indent(int indent, StringBuilder lineBuilder) { - for (int i = 0; i < indent; i++) { - lineBuilder.append(' '); - } + lineBuilder.append(" ".repeat(Math.max(0, indent))); } } diff --git a/Plan/common/src/main/java/com/djrapitops/plan/settings/config/WorldAliasSettings.java b/Plan/common/src/main/java/com/djrapitops/plan/settings/config/WorldAliasSettings.java index 9f87bf1f2..8698648df 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/settings/config/WorldAliasSettings.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/settings/config/WorldAliasSettings.java @@ -144,7 +144,7 @@ public class WorldAliasSettings { long playtime = entry.getValue(); Optional foundAlias = getAlias(worldName); - if (!foundAlias.isPresent()) { + if (foundAlias.isEmpty()) { addWorld(worldName); } @@ -165,7 +165,7 @@ public class WorldAliasSettings { GMTimes gmTimes = entry.getValue(); Optional foundAlias = getAlias(worldName); - if (!foundAlias.isPresent()) { + if (foundAlias.isEmpty()) { addWorld(worldName); } @@ -182,7 +182,7 @@ public class WorldAliasSettings { public String getLongestWorldPlayed(ActiveSession session) { Optional foundWorldTimes = session.getExtraData(WorldTimes.class); - if (!foundWorldTimes.isPresent()) { + if (foundWorldTimes.isEmpty()) { return locale.get().getString(HtmlLang.UNIT_NO_DATA); } WorldTimes worldTimes = foundWorldTimes.orElseGet(WorldTimes::new); @@ -195,7 +195,7 @@ public class WorldAliasSettings { public String getLongestWorldPlayed(FinishedSession session) { Optional foundWorldTimes = session.getExtraData(WorldTimes.class); - if (!foundWorldTimes.isPresent()) { + if (foundWorldTimes.isEmpty()) { return locale.get().getString(HtmlLang.UNIT_NO_DATA); } WorldTimes worldTimes = foundWorldTimes.orElseGet(WorldTimes::new); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/settings/config/changes/ConfigChange.java b/Plan/common/src/main/java/com/djrapitops/plan/settings/config/changes/ConfigChange.java index f549c8617..2bf0dc7a8 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/settings/config/changes/ConfigChange.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/settings/config/changes/ConfigChange.java @@ -69,7 +69,7 @@ public interface ConfigChange { @Override public boolean hasBeenApplied(Config config) { - return !config.getNode(oldPath).isPresent() || config.getNode(newPath).isPresent(); + return config.getNode(oldPath).isEmpty() || config.getNode(newPath).isPresent(); } @Override @@ -117,7 +117,7 @@ public interface ConfigChange { @Override public boolean hasBeenApplied(Config config) { - return !config.getNode(oldPath).isPresent(); + return config.getNode(oldPath).isEmpty(); } @Override @@ -143,7 +143,7 @@ public interface ConfigChange { @Override public boolean hasBeenApplied(Config config) { Optional node = config.getNode(path); - return !node.isPresent() || node.get().getComment().isEmpty(); + return node.isEmpty() || node.get().getComment().isEmpty(); } @Override @@ -173,7 +173,7 @@ public interface ConfigChange { @Override public boolean hasBeenApplied(Config config) { Optional oldNode = config.getNode(oldPath); - return !oldNode.isPresent(); + return oldNode.isEmpty(); } @Override diff --git a/Plan/common/src/main/java/com/djrapitops/plan/settings/config/paths/DisplaySettings.java b/Plan/common/src/main/java/com/djrapitops/plan/settings/config/paths/DisplaySettings.java index 700189a9c..d06435e78 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/settings/config/paths/DisplaySettings.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/settings/config/paths/DisplaySettings.java @@ -41,7 +41,7 @@ public class DisplaySettings { public static final Setting CMD_COLOR_MAIN = new StringSetting("Display_options.Command_colors.Main"); public static final Setting CMD_COLOR_SECONDARY = new StringSetting("Display_options.Command_colors.Secondary"); public static final Setting CMD_COLOR_TERTIARY = new StringSetting("Display_options.Command_colors.Highlight"); - public static final Setting WORLD_ALIASES = new Setting("World_aliases.List", ConfigNode.class) { + public static final Setting WORLD_ALIASES = new Setting<>("World_aliases.List", ConfigNode.class) { @Override public ConfigNode getValueFrom(ConfigNode node) { return node.getNode(path).orElseGet(() -> node.addNode(path)); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/settings/config/paths/key/StringListSetting.java b/Plan/common/src/main/java/com/djrapitops/plan/settings/config/paths/key/StringListSetting.java index 25715dea0..0747395ff 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/settings/config/paths/key/StringListSetting.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/settings/config/paths/key/StringListSetting.java @@ -30,11 +30,11 @@ import java.util.function.Predicate; public class StringListSetting extends Setting> { public StringListSetting(String path) { - super(path, new Type>() {}); + super(path, new Type<>() {}); } public StringListSetting(String path, Predicate> validator) { - super(path, new Type>() {}, validator); + super(path, new Type<>() {}, validator); } @Override diff --git a/Plan/common/src/main/java/com/djrapitops/plan/settings/network/ServerSettingsManager.java b/Plan/common/src/main/java/com/djrapitops/plan/settings/network/ServerSettingsManager.java index 60df29e94..337f04d86 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/settings/network/ServerSettingsManager.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/settings/network/ServerSettingsManager.java @@ -108,7 +108,7 @@ public class ServerSettingsManager implements SubSystem { Database database = dbSystem.getDatabase(); Optional serverUUID = serverInfo.getServerUUIDSafe(); - if (!serverUUID.isPresent()) { + if (serverUUID.isEmpty()) { return; } @@ -132,7 +132,7 @@ public class ServerSettingsManager implements SubSystem { long lastModified = configFile.exists() ? configFile.lastModified() : -1; Optional serverUUID = serverInfo.getServerUUIDSafe(); - if (!serverUUID.isPresent()) { + if (serverUUID.isEmpty()) { return; } diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/Database.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/Database.java index c339ca4ad..ff521e6c7 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/Database.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/Database.java @@ -58,7 +58,7 @@ public interface Database { T query(Query query); default Optional queryOptional(String sql, RowExtractor rowExtractor, Object... parameters) { - return query(new QueryStatement>(sql) { + return query(new QueryStatement<>(sql) { @Override public void prepare(PreparedStatement statement) throws SQLException { QueryParameterSetter.setParameters(statement, parameters); @@ -80,7 +80,7 @@ public interface Database { } default , T> C queryCollection(String sql, RowExtractor rowExtractor, Supplier collectionConstructor, Object... parameters) { - return query(new QueryStatement(sql, 1000) { + return query(new QueryStatement<>(sql, 1000) { @Override public void prepare(PreparedStatement statement) throws SQLException { QueryParameterSetter.setParameters(statement, parameters); @@ -102,7 +102,7 @@ public interface Database { } default , K, V> M queryMap(String sql, MapRowExtractor rowExtractor, Supplier mapConstructor, Object... parameters) { - return query(new QueryStatement(sql, 100) { + return query(new QueryStatement<>(sql, 100) { @Override public void prepare(PreparedStatement statement) throws SQLException { QueryParameterSetter.setParameters(statement, parameters); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/SQLDB.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/SQLDB.java index a8909673b..c7350a964 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/SQLDB.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/SQLDB.java @@ -366,8 +366,10 @@ public abstract class SQLDB extends AbstractDatabase { logger.error("Database failed to open, " + transaction.getClass().getName() + " failed to be executed."); FatalDBException actual = (FatalDBException) throwable.getCause(); Optional whatToDo = actual.getContext().flatMap(ErrorContext::getWhatToDo); - whatToDo.ifPresent(message -> logger.error("What to do: " + message)); - if (!whatToDo.isPresent()) logger.error("Error msg: " + actual.getMessage()); + whatToDo.ifPresentOrElse( + message -> logger.error("What to do: " + message), + () -> logger.error("Error msg: " + actual.getMessage()) + ); setState(State.CLOSED); } ThrowableUtils.appendEntryPointToCause(throwable, origin); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/LargeFetchQueries.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/LargeFetchQueries.java index 744194e78..b4d446a50 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/LargeFetchQueries.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/LargeFetchQueries.java @@ -66,7 +66,7 @@ public class LargeFetchQueries { FROM + TPSTable.TABLE_NAME + INNER_JOIN + ServerTable.TABLE_NAME + " on " + serverIDColumn + "=" + TPSTable.SERVER_ID; - return new QueryAllStatement>>(sql, 50000) { + return new QueryAllStatement<>(sql, 50000) { @Override public Map> processResults(ResultSet set) throws SQLException { Map> serverMap = new HashMap<>(); @@ -101,7 +101,7 @@ public class LargeFetchQueries { public static Query>> fetchAllWorldNames() { String sql = SELECT + '*' + FROM + WorldTable.TABLE_NAME; - return new QueryAllStatement>>(sql, 1000) { + return new QueryAllStatement<>(sql, 1000) { @Override public Map> processResults(ResultSet set) throws SQLException { Map> worldMap = new HashMap<>(); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/PerServerAggregateQueries.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/PerServerAggregateQueries.java index 5cec44c66..04fbf8a3e 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/PerServerAggregateQueries.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/PerServerAggregateQueries.java @@ -58,7 +58,7 @@ public class PerServerAggregateQueries { INNER_JOIN + ServerTable.TABLE_NAME + " se on se." + ServerTable.ID + '=' + SessionsTable.TABLE_NAME + '.' + SessionsTable.SERVER_ID + WHERE + SessionsTable.USER_ID + "=" + UsersTable.SELECT_USER_ID + GROUP_BY + SessionsTable.SERVER_ID; - return new QueryStatement>(sql) { + return new QueryStatement<>(sql) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, playerUUID.toString()); @@ -119,7 +119,7 @@ public class PerServerAggregateQueries { private static QueryStatement> getQueryForCountOf(UUID playerUUID, String sql, String column) { - return new QueryStatement>(sql) { + return new QueryStatement<>(sql) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, playerUUID.toString()); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/PlayerFetchQueries.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/PlayerFetchQueries.java index 4add5e3cf..0af68cf47 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/PlayerFetchQueries.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/PlayerFetchQueries.java @@ -50,7 +50,7 @@ public class PlayerFetchQueries { String sql = SELECT + UsersTable.USER_NAME + FROM + UsersTable.TABLE_NAME + WHERE + UsersTable.USER_UUID + "=?"; - return new QueryStatement>(sql) { + return new QueryStatement<>(sql) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, playerUUID.toString()); @@ -76,7 +76,7 @@ public class PlayerFetchQueries { String sql = SELECT + UsersTable.ID + FROM + UsersTable.TABLE_NAME + WHERE + UsersTable.USER_UUID + "=?"; - return new QueryStatement(sql) { + return new QueryStatement<>(sql) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, playerUUID.toString()); @@ -115,7 +115,7 @@ public class PlayerFetchQueries { FROM + UsersTable.TABLE_NAME + WHERE + UsersTable.USER_UUID + "=? LIMIT 1"; - return new QueryStatement>(sql) { + return new QueryStatement<>(sql) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, playerUUID.toString()); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/QueryStatement.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/QueryStatement.java index fe87b7f34..240df92cf 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/QueryStatement.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/QueryStatement.java @@ -66,14 +66,12 @@ public abstract class QueryStatement implements Query { } public T executeQuery(PreparedStatement statement) throws SQLException { - try { + try (statement) { statement.setFetchSize(fetchSize); prepare(statement); try (ResultSet set = statement.executeQuery()) { return processResults(set); } - } finally { - statement.close(); } } diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/ServerAggregateQueries.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/ServerAggregateQueries.java index 5a49cdcb3..33f5025b9 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/ServerAggregateQueries.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/ServerAggregateQueries.java @@ -47,7 +47,7 @@ public class ServerAggregateQueries { */ public static Query baseUserCount() { String sql = SELECT + "COUNT(1) as c FROM " + UsersTable.TABLE_NAME; - return new QueryAllStatement(sql) { + return new QueryAllStatement<>(sql) { @Override public Integer processResults(ResultSet set) throws SQLException { return set.next() ? set.getInt("c") : 0; @@ -64,7 +64,7 @@ public class ServerAggregateQueries { public static Query serverUserCount(ServerUUID serverUUID) { String sql = SELECT + "COUNT(1) as c FROM " + UserInfoTable.TABLE_NAME + WHERE + UserInfoTable.SERVER_ID + "=" + ServerTable.SELECT_SERVER_ID; - return new QueryStatement(sql) { + return new QueryStatement<>(sql) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, serverUUID.toString()); @@ -91,7 +91,7 @@ public class ServerAggregateQueries { INNER_JOIN + ServerTable.TABLE_NAME + " s on s." + ServerTable.ID + '=' + UserInfoTable.TABLE_NAME + '.' + UserInfoTable.SERVER_ID + GROUP_BY + UserInfoTable.SERVER_ID; - return new QueryAllStatement>(sql, 100) { + return new QueryAllStatement<>(sql, 100) { @Override public Map processResults(ResultSet set) throws SQLException { Map ofServer = new HashMap<>(); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/analysis/ActivityIndexQueries.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/analysis/ActivityIndexQueries.java index 7f2baff0d..da89d1b30 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/analysis/ActivityIndexQueries.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/analysis/ActivityIndexQueries.java @@ -131,7 +131,7 @@ public class ActivityIndexQueries { WHERE + "i.activity_index>=?" + AND + "i.activity_index(selectCount) { + return new QueryStatement<>(selectCount) { @Override public void prepare(PreparedStatement statement) throws SQLException { setSelectActivityIndexSQLParameters(statement, 1, playtimeThreshold, serverUUID, date); @@ -157,7 +157,7 @@ public class ActivityIndexQueries { WHERE + "u." + UserInfoTable.SERVER_ID + "=" + ServerTable.SELECT_SERVER_ID + AND + "u." + UserInfoTable.REGISTERED + "<=?"; - return new QueryStatement>(selectIndexes) { + return new QueryStatement<>(selectIndexes) { @Override public void prepare(PreparedStatement statement) throws SQLException { setSelectActivityIndexSQLParameters(statement, 1, threshold, serverUUID, date); @@ -190,7 +190,7 @@ public class ActivityIndexQueries { AND + "q2.activity_index>=?" + AND + "q2.activity_index(selectActivePlayerCount) { + return new QueryStatement<>(selectActivePlayerCount) { @Override public void prepare(PreparedStatement statement) throws SQLException { setSelectActivityIndexSQLParameters(statement, 1, threshold, serverUUID, before); @@ -228,7 +228,7 @@ public class ActivityIndexQueries { AND + "q4.activity_index>=?" + AND + "q4.activity_index(selectActivePlayerCount) { + return new QueryStatement<>(selectActivePlayerCount) { @Override public void prepare(PreparedStatement statement) throws SQLException { setSelectActivityIndexSQLParameters(statement, 1, threshold, serverUUID, start); @@ -361,7 +361,7 @@ public class ActivityIndexQueries { FROM + '(' + selectNewUUIDs + ") n" + INNER_JOIN + '(' + selectActivityIndexSQL() + ") a on n." + SessionsTable.USER_ID + "=a." + SessionsTable.USER_ID; - return new QueryStatement>(sql) { + return new QueryStatement<>(sql) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setLong(1, before); @@ -399,7 +399,7 @@ public class ActivityIndexQueries { INNER_JOIN + '(' + selectUniqueUUIDs + ") u on n." + SessionsTable.USER_ID + "=u." + SessionsTable.USER_ID + INNER_JOIN + '(' + selectActivityIndexSQL() + ") a on n." + SessionsTable.USER_ID + "=a." + SessionsTable.USER_ID; - return new QueryStatement(sql) { + return new QueryStatement<>(sql) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setLong(1, before); @@ -440,7 +440,7 @@ public class ActivityIndexQueries { INNER_JOIN + '(' + selectActivityIndexSQL() + ") a on n." + SessionsTable.USER_ID + "=a." + SessionsTable.USER_ID + WHERE + "n." + SessionsTable.USER_ID + IS_NULL; - return new QueryStatement(sql) { + return new QueryStatement<>(sql) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setLong(1, before); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/analysis/NetworkActivityIndexQueries.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/analysis/NetworkActivityIndexQueries.java index 047912f68..bb14659c9 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/analysis/NetworkActivityIndexQueries.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/analysis/NetworkActivityIndexQueries.java @@ -134,7 +134,7 @@ public class NetworkActivityIndexQueries { WHERE + "i.activity_index>=?" + AND + "i.activity_index(selectCount) { + return new QueryStatement<>(selectCount) { @Override public void prepare(PreparedStatement statement) throws SQLException { setSelectActivityIndexSQLParameters(statement, 1, playtimeThreshold, date); @@ -158,7 +158,7 @@ public class NetworkActivityIndexQueries { LEFT_JOIN + '(' + selectActivityIndex + ") s on s." + SessionsTable.USER_ID + "=u." + UsersTable.ID + WHERE + "u." + UsersTable.REGISTERED + "<=?"; - return new QueryStatement>(selectIndexes) { + return new QueryStatement<>(selectIndexes) { @Override public void prepare(PreparedStatement statement) throws SQLException { setSelectActivityIndexSQLParameters(statement, 1, threshold, date); @@ -188,7 +188,7 @@ public class NetworkActivityIndexQueries { AND + "u." + UsersTable.ID + " IN (" + new TextStringBuilder().appendWithSeparators(userIds, ",").build() + ")"; - return new QueryStatement>(selectIndexes) { + return new QueryStatement<>(selectIndexes) { @Override public void prepare(PreparedStatement statement) throws SQLException { setSelectActivityIndexSQLParameters(statement, 1, threshold, date); @@ -219,7 +219,7 @@ public class NetworkActivityIndexQueries { AND + "q2.activity_index>=?" + AND + "q2.activity_index(selectActivePlayerCount) { + return new QueryStatement<>(selectActivePlayerCount) { @Override public void prepare(PreparedStatement statement) throws SQLException { setSelectActivityIndexSQLParameters(statement, 1, threshold, before); @@ -255,7 +255,7 @@ public class NetworkActivityIndexQueries { AND + "q4.activity_index>=?" + AND + "q4.activity_index(selectActivePlayerCount) { + return new QueryStatement<>(selectActivePlayerCount) { @Override public void prepare(PreparedStatement statement) throws SQLException { setSelectActivityIndexSQLParameters(statement, 1, threshold, end); @@ -381,7 +381,7 @@ public class NetworkActivityIndexQueries { FROM + '(' + selectNewUUIDs + ") n" + INNER_JOIN + '(' + selectActivityIndexSQL() + ") a on n." + UsersTable.ID + "=a." + SessionsTable.USER_ID; - return new QueryStatement>(sql) { + return new QueryStatement<>(sql) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setLong(1, before); @@ -416,7 +416,7 @@ public class NetworkActivityIndexQueries { INNER_JOIN + '(' + selectUniqueUUIDs + ") u on n." + UsersTable.ID + "=u." + SessionsTable.USER_ID + INNER_JOIN + '(' + selectActivityIndexSQL() + ") a on n." + UsersTable.ID + "=a." + SessionsTable.USER_ID; - return new QueryStatement(sql) { + return new QueryStatement<>(sql) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setLong(1, before); @@ -438,7 +438,7 @@ public class NetworkActivityIndexQueries { public static Query> activityIndexForAllPlayers(long date, long playtimeThreshold) { String selectActivityIndex = selectActivityIndexSQL(); - return new QueryStatement>(selectActivityIndex, 1000) { + return new QueryStatement<>(selectActivityIndex, 1000) { @Override public void prepare(PreparedStatement statement) throws SQLException { setSelectActivityIndexSQLParameters(statement, 1, playtimeThreshold, date); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/analysis/PlayerCountQueries.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/analysis/PlayerCountQueries.java index e62bfdf21..61236a29d 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/analysis/PlayerCountQueries.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/analysis/PlayerCountQueries.java @@ -411,7 +411,7 @@ public class PlayerCountQueries { AND + SessionsTable.SESSION_END + "<=?" + AND + "s." + SessionsTable.SERVER_ID + "=" + ServerTable.SELECT_SERVER_ID; - return new QueryStatement(selectUniqueUUIDs) { + return new QueryStatement<>(selectUniqueUUIDs) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setLong(1, after); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/filters/PluginBooleanGroupFilter.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/filters/PluginBooleanGroupFilter.java index fc8941bfe..8f157da57 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/filters/PluginBooleanGroupFilter.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/filter/filters/PluginBooleanGroupFilter.java @@ -59,7 +59,7 @@ public class PluginBooleanGroupFilter extends MultiOptionFilter { INNER_JOIN + ExtensionPlayerValueTable.TABLE_NAME + " value on value." + ExtensionPlayerValueTable.PROVIDER_ID + "=provider." + ExtensionProviderTable.ID + WHERE + "value." + ExtensionPlayerValueTable.BOOLEAN_VALUE + " IS NOT NULL" + ORDER_BY + "server_name ASC, plugin_name ASC, provider_text ASC"; - return new QueryAllStatement>(selectOptions) { + return new QueryAllStatement<>(selectOptions) { @Override public List processResults(ResultSet set) throws SQLException { List options = new ArrayList<>(); @@ -115,7 +115,7 @@ public class PluginBooleanGroupFilter extends MultiOptionFilter { AND + "provider." + ExtensionProviderTable.TEXT + "=?" + AND + "value." + ExtensionPlayerValueTable.BOOLEAN_VALUE + (selectedBoolean == SelectedBoolean.BOTH ? "IS NOT NULL" : "=?"); - return new QueryStatement>(selectUUIDsWithBooleanValues) { + return new QueryStatement<>(selectUUIDsWithBooleanValues) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, serverUUID.toString()); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/GeoInfoQueries.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/GeoInfoQueries.java index ffaf181fd..53e411aa0 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/GeoInfoQueries.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/GeoInfoQueries.java @@ -58,7 +58,7 @@ public class GeoInfoQueries { FROM + GeoInfoTable.TABLE_NAME + " g" + INNER_JOIN + UsersTable.TABLE_NAME + " u on g.user_id=u.id"; - return new QueryAllStatement>>(sql, 10000) { + return new QueryAllStatement<>(sql, 10000) { @Override public Map> processResults(ResultSet set) throws SQLException { return extractGeoInformation(set); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/JoinAddressQueries.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/JoinAddressQueries.java index 9f467a973..9fc34a50d 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/JoinAddressQueries.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/JoinAddressQueries.java @@ -80,7 +80,7 @@ public class JoinAddressQueries { FROM + JoinAddressTable.TABLE_NAME + ORDER_BY + JoinAddressTable.JOIN_ADDRESS + " ASC"; - return new QueryAllStatement>(sql, 100) { + return new QueryAllStatement<>(sql, 100) { @Override public List processResults(ResultSet set) throws SQLException { List joinAddresses = new ArrayList<>(); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/KillQueries.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/KillQueries.java index 8a00085f0..51ba992de 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/KillQueries.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/KillQueries.java @@ -67,7 +67,7 @@ public class KillQueries { WHERE + "ki." + KillsTable.SERVER_UUID + "=?" + ORDER_BY + KillsTable.DATE + " DESC LIMIT ?"; - return new QueryStatement>(sql, limit) { + return new QueryStatement<>(sql, limit) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, serverUUID.toString()); @@ -103,7 +103,7 @@ public class KillQueries { WHERE + "ki." + KillsTable.KILLER_UUID + "=?" + ORDER_BY + KillsTable.DATE + " DESC"; - return new QueryStatement>(sql, 100) { + return new QueryStatement<>(sql, 100) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, playerUUID.toString()); @@ -138,7 +138,7 @@ public class KillQueries { WHERE + "ki." + KillsTable.VICTIM_UUID + "=?" + ORDER_BY + KillsTable.DATE + " DESC"; - return new QueryStatement>(sql, 100) { + return new QueryStatement<>(sql, 100) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, playerUUID.toString()); @@ -205,7 +205,7 @@ public class KillQueries { WHERE + "kills" + IS_NOT_NULL + AND + "deaths" + IS_NOT_NULL; - return new QueryStatement(sql) { + return new QueryStatement<>(sql) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, serverUUID.toString()); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/NicknameQueries.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/NicknameQueries.java index c3788d4a6..23bbd8393 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/NicknameQueries.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/NicknameQueries.java @@ -54,7 +54,7 @@ public class NicknameQueries { NicknamesTable.SERVER_UUID + FROM + NicknamesTable.TABLE_NAME; - return new QueryAllStatement>>>(sql, 5000) { + return new QueryAllStatement<>(sql, 5000) { @Override public Map>> processResults(ResultSet set) throws SQLException { Map>> map = new HashMap<>(); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/PingQueries.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/PingQueries.java index 53da4f405..304596e0f 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/PingQueries.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/PingQueries.java @@ -61,7 +61,7 @@ public class PingQueries { FROM + PingTable.TABLE_NAME + " p" + INNER_JOIN + UsersTable.TABLE_NAME + " u on u.id=p." + PingTable.USER_ID + INNER_JOIN + ServerTable.TABLE_NAME + " s on s.id=p." + PingTable.SERVER_ID; - return new QueryAllStatement>>(sql, 100000) { + return new QueryAllStatement<>(sql, 100000) { @Override public Map> processResults(ResultSet set) throws SQLException { return extractUserPings(set); @@ -101,7 +101,7 @@ public class PingQueries { INNER_JOIN + ServerTable.TABLE_NAME + " s on s." + ServerTable.ID + "=p." + PingTable.SERVER_ID + WHERE + PingTable.USER_ID + "=" + UsersTable.SELECT_USER_ID; - return new QueryStatement>(sql, 10000) { + return new QueryStatement<>(sql, 10000) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, playerUUID.toString()); @@ -137,7 +137,7 @@ public class PingQueries { WHERE + PingTable.SERVER_ID + "=" + ServerTable.SELECT_SERVER_ID + AND + PingTable.DATE + ">=?" + AND + PingTable.DATE + "<=?"; - return new QueryStatement>(sql, 1000) { + return new QueryStatement<>(sql, 1000) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, serverUUID.toString()); @@ -181,7 +181,7 @@ public class PingQueries { AND + "sp." + PingTable.SERVER_ID + "=" + ServerTable.SELECT_SERVER_ID + GROUP_BY + "a." + GeoInfoTable.GEOLOCATION; - return new QueryStatement>(selectPingByGeolocation) { + return new QueryStatement<>(selectPingByGeolocation) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, serverUUID.toString()); @@ -220,7 +220,7 @@ public class PingQueries { WHERE + "b." + GeoInfoTable.LAST_USED + IS_NULL + GROUP_BY + "a." + GeoInfoTable.GEOLOCATION; - return new QueryAllStatement>(selectPingByGeolocation) { + return new QueryAllStatement<>(selectPingByGeolocation) { @Override public Map processResults(ResultSet set) throws SQLException { // TreeMap to sort alphabetically @@ -246,7 +246,7 @@ public class PingQueries { AND + PingTable.DATE + ">=?" + AND + PingTable.DATE + "<=?"; - return new QueryStatement(sql, 1000) { + return new QueryStatement<>(sql, 1000) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, serverUUID.toString()); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/ServerQueries.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/ServerQueries.java index 777c04784..f5f71c50a 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/ServerQueries.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/ServerQueries.java @@ -47,7 +47,7 @@ public class ServerQueries { public static Query> fetchUninstalledServerInformation() { String sql = SELECT + '*' + FROM + ServerTable.TABLE_NAME + WHERE + ServerTable.INSTALLED + "=?"; - return new QueryStatement>(sql, 100) { + return new QueryStatement<>(sql, 100) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setBoolean(1, false); @@ -78,7 +78,7 @@ public class ServerQueries { public static Query> fetchPlanServerInformation() { String sql = SELECT + '*' + FROM + ServerTable.TABLE_NAME + WHERE + ServerTable.INSTALLED + "=?"; - return new QueryStatement>(sql, 100) { + return new QueryStatement<>(sql, 100) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setBoolean(1, true); @@ -118,7 +118,7 @@ public class ServerQueries { OR + ServerTable.ID + "=?)" + AND + ServerTable.INSTALLED + "=?" + LIMIT + '1'; - return new QueryStatement>(sql) { + return new QueryStatement<>(sql) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, identifier); @@ -150,7 +150,7 @@ public class ServerQueries { WHERE + ServerTable.INSTALLED + "=?" + AND + ServerTable.PROXY + "=?" + LIMIT + '1'; - return new QueryStatement>(sql) { + return new QueryStatement<>(sql) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setBoolean(1, true); @@ -179,7 +179,7 @@ public class ServerQueries { .where(ServerTable.PROXY + "=0") .toString(); - return new QueryAllStatement>(sql) { + return new QueryAllStatement<>(sql) { @Override public List processResults(ResultSet set) throws SQLException { List names = new ArrayList<>(); @@ -196,7 +196,7 @@ public class ServerQueries { ServerTable.ID, ServerTable.SERVER_UUID, ServerTable.NAME) .toString(); - return new QueryAllStatement>(sql) { + return new QueryAllStatement<>(sql) { @Override public Map processResults(ResultSet set) throws SQLException { Map names = new HashMap<>(); @@ -219,7 +219,7 @@ public class ServerQueries { OR + ServerTable.ID + "=?)" + AND + ServerTable.INSTALLED + "=?" + LIMIT + '1'; - return new QueryStatement>(sql) { + return new QueryStatement<>(sql) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, '%' + identifier + '%'); @@ -250,7 +250,7 @@ public class ServerQueries { public static Query fetchServerCount() { String sql = SELECT + "COUNT(1) as c" + FROM + ServerTable.TABLE_NAME + WHERE + ServerTable.INSTALLED + "=?"; - return new QueryStatement(sql) { + return new QueryStatement<>(sql) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setBoolean(1, true); @@ -266,7 +266,7 @@ public class ServerQueries { public static Query fetchBiggestServerID() { String sql = SELECT + "MAX(" + ServerTable.ID + ") as max_id" + FROM + ServerTable.TABLE_NAME + WHERE + ServerTable.INSTALLED + "=?"; - return new QueryStatement(sql) { + return new QueryStatement<>(sql) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setBoolean(1, true); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/SessionQueries.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/SessionQueries.java index 72f0cb4f9..fd05897de 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/SessionQueries.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/SessionQueries.java @@ -99,7 +99,7 @@ public class SessionQueries { public static Query> fetchAllSessions() { String sql = SELECT_SESSIONS_STATEMENT + ORDER_BY_SESSION_START_DESC; - return new QueryAllStatement>(sql, 50000) { + return new QueryAllStatement<>(sql, 50000) { @Override public List processResults(ResultSet set) throws SQLException { return extractDataFromSessionSelectStatement(set); @@ -117,7 +117,7 @@ public class SessionQueries { String sql = SELECT_SESSIONS_STATEMENT + WHERE + "s." + SessionsTable.USER_ID + "=" + UsersTable.SELECT_USER_ID + ORDER_BY_SESSION_START_DESC; - return new QueryStatement>>(sql, 1000) { + return new QueryStatement<>(sql, 1000) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, playerUUID.toString()); @@ -180,7 +180,7 @@ public class SessionQueries { worldTimes.setGMTimesForWorld(worldName, gmTimes); } - if (!existingWorldTimes.isPresent()) extraData.put(WorldTimes.class, worldTimes); + if (existingWorldTimes.isEmpty()) extraData.put(WorldTimes.class, worldTimes); ServerName serverName = new ServerName( Server.getIdentifiableName( @@ -210,7 +210,7 @@ public class SessionQueries { playerKills.add(newKill); } } - if (!existingPlayerKills.isPresent()) extraData.put(PlayerKills.class, playerKills); + if (existingPlayerKills.isEmpty()) extraData.put(PlayerKills.class, playerKills); extraData.put(PlayerName.class, new PlayerName(set.getString("name"))); @@ -243,7 +243,7 @@ public class SessionQueries { AND + SessionsTable.SESSION_START + ">=?" + AND + SessionsTable.SESSION_START + "<=?"; - return new QueryStatement>(sql, 1000) { + return new QueryStatement<>(sql, 1000) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, serverUUID.toString()); @@ -281,7 +281,7 @@ public class SessionQueries { WHERE + SessionsTable.SERVER_ID + "=" + ServerTable.SELECT_SERVER_ID + ORDER_BY_SESSION_START_DESC + " LIMIT ?"; - return new QueryStatement(sql, limit) { + return new QueryStatement<>(sql, limit) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, serverUUID.toString()); @@ -303,7 +303,7 @@ public class SessionQueries { String sql = SELECT + SessionsTable.SESSION_START + FROM + SessionsTable.TABLE_NAME + ORDER_BY_SESSION_START_DESC + " LIMIT ?"; - return new QueryStatement(sql, limit) { + return new QueryStatement<>(sql, limit) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setInt(1, limit); @@ -372,7 +372,7 @@ public class SessionQueries { WHERE + SessionsTable.SERVER_ID + "=" + ServerTable.SELECT_SERVER_ID + AND + SessionsTable.SESSION_END + ">=?" + AND + SessionsTable.SESSION_START + "<=?"; - return new QueryStatement(sql) { + return new QueryStatement<>(sql) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, serverUUID.toString()); @@ -392,7 +392,7 @@ public class SessionQueries { FROM + SessionsTable.TABLE_NAME + WHERE + SessionsTable.SESSION_END + ">=?" + AND + SessionsTable.SESSION_START + "<=?"; - return new QueryStatement(sql) { + return new QueryStatement<>(sql) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setLong(1, after); @@ -455,7 +455,7 @@ public class SessionQueries { WHERE + SessionsTable.SERVER_ID + "=" + ServerTable.SELECT_SERVER_ID + AND + SessionsTable.SESSION_END + ">=?" + AND + SessionsTable.SESSION_START + "<=?"; - return new QueryStatement(sql) { + return new QueryStatement<>(sql) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, serverUUID.toString()); @@ -478,7 +478,7 @@ public class SessionQueries { AND + SessionsTable.SESSION_END + ">=?" + AND + SessionsTable.SESSION_START + "<=?" + GROUP_BY + SessionsTable.SERVER_ID; - return new QueryStatement>(sql) { + return new QueryStatement<>(sql) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, playerUUID.toString()); @@ -502,7 +502,7 @@ public class SessionQueries { FROM + SessionsTable.TABLE_NAME + WHERE + SessionsTable.SESSION_END + ">=?" + AND + SessionsTable.SESSION_START + "<=?"; - return new QueryStatement(sql) { + return new QueryStatement<>(sql) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setLong(1, after); @@ -718,7 +718,7 @@ public class SessionQueries { WHERE + SessionsTable.SERVER_ID + "=" + ServerTable.SELECT_SERVER_ID + AND + SessionsTable.SESSION_END + ">=?" + AND + SessionsTable.SESSION_START + "<=?"; - return new QueryStatement(sql) { + return new QueryStatement<>(sql) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, serverUUID.toString()); @@ -738,7 +738,7 @@ public class SessionQueries { FROM + SessionsTable.TABLE_NAME + WHERE + SessionsTable.SESSION_END + ">=?" + AND + SessionsTable.SESSION_START + "<=?"; - return new QueryStatement(sql) { + return new QueryStatement<>(sql) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setLong(1, after); @@ -762,7 +762,7 @@ public class SessionQueries { WHERE + SessionsTable.SESSION_END + ">=?" + AND + SessionsTable.SESSION_START + "<=?" + GROUP_BY + "s." + ServerTable.ID; - return new QueryStatement>(sql, 100) { + return new QueryStatement<>(sql, 100) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setLong(1, after); @@ -789,7 +789,7 @@ public class SessionQueries { FROM + SessionsTable.TABLE_NAME + WHERE + SessionsTable.USER_ID + "=" + UsersTable.SELECT_USER_ID + AND + SessionsTable.SERVER_ID + "=" + ServerTable.SELECT_SERVER_ID; - return new QueryStatement(sql) { + return new QueryStatement<>(sql) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, playerUUID.toString()); @@ -810,7 +810,7 @@ public class SessionQueries { WHERE + SessionsTable.SERVER_ID + "=" + ServerTable.SELECT_SERVER_ID + AND + SessionsTable.SESSION_END + ">=?" + AND + SessionsTable.SESSION_START + "<=?"; - return new QueryStatement(sql) { + return new QueryStatement<>(sql) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, serverUUID.toString()); @@ -836,7 +836,7 @@ public class SessionQueries { WHERE + SessionsTable.SESSION_END + ">=?" + AND + SessionsTable.SESSION_START + "<=?" + (serverUUIDs.isEmpty() ? "" : AND + SessionsTable.SERVER_ID + " IN (" + selectServerIds + ")"); - return new QueryStatement>(sql) { + return new QueryStatement<>(sql) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setLong(1, after); @@ -870,7 +870,7 @@ public class SessionQueries { AND + SessionsTable.USER_ID + uuidsInSet + (serverUUIDs.isEmpty() ? "" : AND + SessionsTable.SERVER_ID + " IN (" + selectServerIds + ")"); - return new QueryStatement>(selectAggregates) { + return new QueryStatement<>(selectAggregates) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setLong(1, after); @@ -905,7 +905,7 @@ public class SessionQueries { public static Query earliestSessionStart() { String sql = SELECT + "MIN(" + SessionsTable.SESSION_START + ") as m" + FROM + SessionsTable.TABLE_NAME; - return new QueryAllStatement(sql) { + return new QueryAllStatement<>(sql) { @Override public Long processResults(ResultSet set) throws SQLException { return set.next() ? set.getLong("m") : -1L; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/TPSQueries.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/TPSQueries.java index 749b2c382..bcf8f2700 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/TPSQueries.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/TPSQueries.java @@ -105,7 +105,7 @@ public class TPSQueries { AND + DATE + "<=?" + ORDER_BY + DATE; - return new QueryStatement>(sql, 50000) { + return new QueryStatement<>(sql, 50000) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, serverUUID.toString()); @@ -132,7 +132,7 @@ public class TPSQueries { WHERE + SERVER_ID + "=" + ServerTable.SELECT_SERVER_ID + GROUP_BY + floor(DATE + "/?"); - return new QueryStatement>>(sql) { + return new QueryStatement<>(sql) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, serverUUID.toString()); @@ -155,7 +155,7 @@ public class TPSQueries { WHERE + ServerTable.SERVER_UUID + "=?" + AND + DATE + "?"; - return new QueryStatement>>(sql, 1000) { + return new QueryStatement<>(sql, 1000) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, serverUUID.toString()); @@ -184,7 +184,7 @@ public class TPSQueries { AND + ServerTable.INSTALLED + "=?" + AND + DATE + "?"; - return new QueryStatement>>(sql, 5000) { + return new QueryStatement<>(sql, 5000) { @Override public void prepare(PreparedStatement statement) throws SQLException { if (leaveOut != null) { @@ -225,7 +225,7 @@ public class TPSQueries { AND + PLAYERS_ONLINE + "=" + subQuery + ORDER_BY + DATE + " DESC LIMIT 1"; - return new QueryStatement>>(sql) { + return new QueryStatement<>(sql) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, serverUUID.toString()); @@ -257,7 +257,7 @@ public class TPSQueries { WHERE + SERVER_ID + '=' + ServerTable.SELECT_SERVER_ID + ORDER_BY + DATE + " DESC LIMIT 1"; - return new QueryStatement>(sql) { + return new QueryStatement<>(sql) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, serverUUID.toString()); @@ -288,7 +288,7 @@ public class TPSQueries { AND + TPS + ">=0" + AND + DATE + "?"; - return new QueryStatement(sql) { + return new QueryStatement<>(sql) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, serverUUID.toString()); @@ -309,7 +309,7 @@ public class TPSQueries { AND + CPU_USAGE + ">=0" + AND + DATE + "?"; - return new QueryStatement(sql) { + return new QueryStatement<>(sql) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, serverUUID.toString()); @@ -330,7 +330,7 @@ public class TPSQueries { AND + RAM_USAGE + ">=0" + AND + DATE + "?"; - return new QueryStatement(sql) { + return new QueryStatement<>(sql) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, serverUUID.toString()); @@ -351,7 +351,7 @@ public class TPSQueries { AND + CHUNKS + ">=0" + AND + DATE + "?"; - return new QueryStatement(sql) { + return new QueryStatement<>(sql) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, serverUUID.toString()); @@ -372,7 +372,7 @@ public class TPSQueries { AND + ENTITIES + ">=0" + AND + DATE + "?"; - return new QueryStatement(sql) { + return new QueryStatement<>(sql) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, serverUUID.toString()); @@ -393,7 +393,7 @@ public class TPSQueries { AND + FREE_DISK + ">=0" + AND + DATE + "?"; - return new QueryStatement(sql) { + return new QueryStatement<>(sql) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, serverUUID.toString()); @@ -414,7 +414,7 @@ public class TPSQueries { AND + FREE_DISK + ">=0" + AND + DATE + "?"; - return new QueryStatement(sql) { + return new QueryStatement<>(sql) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, serverUUID.toString()); @@ -435,7 +435,7 @@ public class TPSQueries { AND + FREE_DISK + ">=0" + AND + DATE + "?"; - return new QueryStatement(sql) { + return new QueryStatement<>(sql) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, serverUUID.toString()); @@ -456,7 +456,7 @@ public class TPSQueries { AND + DATE + ">=?" + AND + DATE + "<=?" + ORDER_BY + DATE; - return new QueryStatement>>(sql, 50000) { + return new QueryStatement<>(sql, 50000) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setLong(1, after); @@ -503,7 +503,7 @@ public class TPSQueries { WHERE + "d1 - previous_date > ?" + UNION + selectFirstEntryDate; - return new QueryStatement>(selectStartTime) { + return new QueryStatement<>(selectStartTime) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, serverUUID.toString()); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/UserIdentifierQueries.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/UserIdentifierQueries.java index 49011495d..330d21345 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/UserIdentifierQueries.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/UserIdentifierQueries.java @@ -52,7 +52,7 @@ public class UserIdentifierQueries { public static Query> fetchAllPlayerUUIDs() { String sql = Select.from(UsersTable.TABLE_NAME, UsersTable.USER_UUID).toString(); - return new QueryAllStatement>(sql, 20000) { + return new QueryAllStatement<>(sql, 20000) { @Override public Set processResults(ResultSet set) throws SQLException { Set playerUUIDs = new HashSet<>(); @@ -78,7 +78,7 @@ public class UserIdentifierQueries { INNER_JOIN + UserInfoTable.TABLE_NAME + " on " + UsersTable.TABLE_NAME + '.' + UsersTable.ID + "=" + UserInfoTable.TABLE_NAME + '.' + UserInfoTable.USER_ID + WHERE + UserInfoTable.SERVER_ID + "=" + ServerTable.SELECT_SERVER_ID; - return new QueryStatement>(sql, 1000) { + return new QueryStatement<>(sql, 1000) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, serverUUID.toString()); @@ -104,7 +104,7 @@ public class UserIdentifierQueries { public static Query> fetchAllPlayerNames() { String sql = Select.from(UsersTable.TABLE_NAME, UsersTable.USER_UUID, UsersTable.USER_NAME).toString(); - return new QueryAllStatement>(sql, 20000) { + return new QueryAllStatement<>(sql, 20000) { @Override public Map processResults(ResultSet set) throws SQLException { Map names = new HashMap<>(); @@ -130,7 +130,7 @@ public class UserIdentifierQueries { .where("UPPER(" + UsersTable.USER_NAME + ")=UPPER(?)") .toString(); - return new QueryStatement>(sql) { + return new QueryStatement<>(sql) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, playerName); @@ -156,7 +156,7 @@ public class UserIdentifierQueries { public static Query> fetchPlayerNameOf(UUID playerUUID) { String sql = Select.from(UsersTable.TABLE_NAME, UsersTable.USER_NAME).where(UsersTable.USER_UUID + "=?").toString(); - return new QueryStatement>(sql) { + return new QueryStatement<>(sql) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, playerUUID.toString()); @@ -183,7 +183,7 @@ public class UserIdentifierQueries { UsersTable.TABLE_NAME + '.' + UsersTable.USER_UUID + "=" + NicknamesTable.TABLE_NAME + '.' + NicknamesTable.USER_UUID + WHERE + "LOWER(" + NicknamesTable.NICKNAME + ") LIKE LOWER(?)"; - return new QueryStatement>(sql, 5000) { + return new QueryStatement<>(sql, 5000) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, '%' + searchFor + '%'); @@ -207,7 +207,7 @@ public class UserIdentifierQueries { public static Query> fetchAllUserIds() { String sql = Select.from(UsersTable.TABLE_NAME, UsersTable.ID).toString(); - return new QueryAllStatement>(sql, 2000) { + return new QueryAllStatement<>(sql, 2000) { @Override public Set processResults(ResultSet set) throws SQLException { Set playerUUIDs = new HashSet<>(); @@ -222,7 +222,7 @@ public class UserIdentifierQueries { public static Query> fetchUserId(UUID playerUUID) { String sql = Select.from(UsersTable.TABLE_NAME, UsersTable.ID).where(UsersTable.USER_UUID + "=?").toString(); - return new QueryStatement>(sql) { + return new QueryStatement<>(sql) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, playerUUID.toString()); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/UserInfoQueries.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/UserInfoQueries.java index 78fd70d9c..cb8d64bb8 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/UserInfoQueries.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/UserInfoQueries.java @@ -64,7 +64,7 @@ public class UserInfoQueries { INNER_JOIN + UsersTable.TABLE_NAME + " u on u." + UsersTable.ID + '=' + "ux." + UserInfoTable.USER_ID + INNER_JOIN + ServerTable.TABLE_NAME + " s on s." + ServerTable.ID + '=' + "ux." + UserInfoTable.SERVER_ID; - return new QueryAllStatement>>(sql, 50000) { + return new QueryAllStatement<>(sql, 50000) { @Override public Map> processResults(ResultSet set) throws SQLException { Map> serverMap = new HashMap<>(); @@ -103,7 +103,7 @@ public class UserInfoQueries { INNER_JOIN + ServerTable.TABLE_NAME + " s on s." + ServerTable.ID + '=' + UserInfoTable.TABLE_NAME + '.' + UserInfoTable.SERVER_ID + WHERE + UserInfoTable.TABLE_NAME + '.' + UserInfoTable.USER_ID + "=" + UsersTable.SELECT_USER_ID; - return new QueryStatement>(sql) { + return new QueryStatement<>(sql) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, playerUUID.toString()); @@ -136,7 +136,7 @@ public class UserInfoQueries { AND + "ux." + UserInfoTable.REGISTERED + ">=?" + AND + "ux." + UserInfoTable.REGISTERED + "<=?"; - return new QueryStatement>(sql, 1000) { + return new QueryStatement<>(sql, 1000) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, serverUUID.toString()); @@ -167,7 +167,7 @@ public class UserInfoQueries { FROM + UserInfoTable.TABLE_NAME + INNER_JOIN + UsersTable.TABLE_NAME + " u on u." + UsersTable.ID + '=' + UserInfoTable.TABLE_NAME + '.' + UserInfoTable.USER_ID + WHERE + column + "=?"; - return new QueryStatement>(sql) { + return new QueryStatement<>(sql) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setBoolean(1, value); @@ -215,7 +215,7 @@ public class UserInfoQueries { INNER_JOIN + "(" + selectServerIds + ") sel_server on sel_server." + ServerTable.ID + "=ux." + UserInfoTable.SERVER_ID + WHERE + "ux." + UserInfoTable.REGISTERED + ">=?" + AND + "ux." + UserInfoTable.REGISTERED + "<=?"; - return new QueryStatement>(sql) { + return new QueryStatement<>(sql) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setLong(1, after); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/WorldTimesQueries.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/WorldTimesQueries.java index b322e82fb..868f8045d 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/WorldTimesQueries.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/WorldTimesQueries.java @@ -65,7 +65,7 @@ public class WorldTimesQueries { WHERE + WorldTimesTable.TABLE_NAME + '.' + WorldTimesTable.SERVER_ID + "=" + ServerTable.SELECT_SERVER_ID + GROUP_BY + WORLD_COLUMN; - return new QueryStatement(sql, 1000) { + return new QueryStatement<>(sql, 1000) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, serverUUID.toString()); @@ -100,7 +100,7 @@ public class WorldTimesQueries { WHERE + WorldTimesTable.USER_ID + "=" + UsersTable.SELECT_USER_ID + GROUP_BY + WORLD_COLUMN; - return new QueryStatement(sql) { + return new QueryStatement<>(sql) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, playerUUID.toString()); @@ -137,7 +137,7 @@ public class WorldTimesQueries { WHERE + WorldTimesTable.TABLE_NAME + '.' + WorldTimesTable.USER_ID + "=" + UsersTable.SELECT_USER_ID + GROUP_BY + WORLD_COLUMN + ',' + WorldTimesTable.TABLE_NAME + '.' + WorldTimesTable.SERVER_ID; - return new QueryStatement>(sql, 1000) { + return new QueryStatement<>(sql, 1000) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, playerUUID.toString()); @@ -183,7 +183,7 @@ public class WorldTimesQueries { AND + SessionsTable.SESSION_START + ">=?" + AND + SessionsTable.SESSION_END + "<=?"; - return new QueryStatement(sql) { + return new QueryStatement<>(sql) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, serverUUID.toString()); @@ -200,7 +200,7 @@ public class WorldTimesQueries { public static QueryStatement> fetchWorlds() { String worldNameSql = SELECT + '*' + FROM + WorldTable.TABLE_NAME; - return new QueryAllStatement>(worldNameSql) { + return new QueryAllStatement<>(worldNameSql) { @Override public Set processResults(ResultSet set) throws SQLException { Set worlds = new HashSet<>(); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/playertable/NetworkTablePlayersQuery.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/playertable/NetworkTablePlayersQuery.java index 20793bced..e0c67e12f 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/playertable/NetworkTablePlayersQuery.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/playertable/NetworkTablePlayersQuery.java @@ -93,7 +93,7 @@ public class NetworkTablePlayersQuery implements Query> { LEFT_JOIN + '(' + NetworkActivityIndexQueries.selectActivityIndexSQL() + ") act on u." + UsersTable.ID + "=act." + UserInfoTable.USER_ID + ORDER_BY + "ses.last_seen DESC LIMIT ?"; - return db.query(new QueryStatement>(selectBaseUsers, 1000) { + return db.query(new QueryStatement<>(selectBaseUsers, 1000) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setBoolean(1, true); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/playertable/QueryTablePlayersQuery.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/playertable/QueryTablePlayersQuery.java index d9707407f..cfc05342b 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/playertable/QueryTablePlayersQuery.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/playertable/QueryTablePlayersQuery.java @@ -118,7 +118,7 @@ public class QueryTablePlayersQuery implements Query> { WHERE + "u." + UsersTable.ID + userIdsInSet + ORDER_BY + "ses.last_seen DESC"; - return db.query(new QueryStatement>(selectBaseUsers, 1000) { + return db.query(new QueryStatement<>(selectBaseUsers, 1000) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setBoolean(1, true); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/playertable/ServerTablePlayersQuery.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/playertable/ServerTablePlayersQuery.java index effa159b3..5dee74c61 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/playertable/ServerTablePlayersQuery.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/playertable/ServerTablePlayersQuery.java @@ -99,7 +99,7 @@ public class ServerTablePlayersQuery implements Query> { WHERE + UserInfoTable.SERVER_ID + "=" + ServerTable.SELECT_SERVER_ID + ORDER_BY + "ses.last_seen DESC LIMIT ?"; - return db.query(new QueryStatement>(selectBaseUsers, 1000) { + return db.query(new QueryStatement<>(selectBaseUsers, 1000) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, serverUUID.toString()); // Session query diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/schema/MySQLSchemaQueries.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/schema/MySQLSchemaQueries.java index e9483417c..babdf39dc 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/schema/MySQLSchemaQueries.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/schema/MySQLSchemaQueries.java @@ -54,7 +54,7 @@ public class MySQLSchemaQueries { FROM + "INFORMATION_SCHEMA.KEY_COLUMN_USAGE" + WHERE + "REFERENCED_TABLE_SCHEMA = DATABASE()" + AND + "REFERENCED_TABLE_NAME = ?"; - return new QueryStatement>(keySQL) { + return new QueryStatement<>(keySQL) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, referencedTable); @@ -114,7 +114,7 @@ public class MySQLSchemaQueries { FROM + "information_schema.COLUMNS" + WHERE + "TABLE_NAME=? AND COLUMN_NAME=? AND TABLE_SCHEMA=DATABASE()"; - return new QueryStatement(sql) { + return new QueryStatement<>(sql) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, table); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/schema/SQLiteSchemaQueries.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/schema/SQLiteSchemaQueries.java index 06c6b8fdc..6f29f0df1 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/schema/SQLiteSchemaQueries.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/schema/SQLiteSchemaQueries.java @@ -49,7 +49,7 @@ public class SQLiteSchemaQueries { } public static Query doesColumnExist(String tableName, String columnName) { - return new QueryAllStatement("PRAGMA table_info(" + tableName + ')') { + return new QueryAllStatement<>("PRAGMA table_info(" + tableName + ')') { @Override public Boolean processResults(ResultSet set) throws SQLException { while (set.next()) { diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/KillsTable.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/KillsTable.java index ee6cdb604..c0e35861f 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/KillsTable.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/KillsTable.java @@ -88,7 +88,7 @@ public class KillsTable { ServerUUID serverUUID = session.getServerUUID(); Optional playerKills = session.getExtraData().get(PlayerKills.class); - if (!playerKills.isPresent()) return; + if (playerKills.isEmpty()) return; for (PlayerKill kill : playerKills.get().asList()) { // Session ID select statement parameters diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/WorldTimesTable.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/WorldTimesTable.java index 36bdebe96..941e694e4 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/WorldTimesTable.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/WorldTimesTable.java @@ -101,7 +101,7 @@ public class WorldTimesTable { UUID uuid = session.getPlayerUUID(); ServerUUID serverUUID = session.getServerUUID(); Optional worldTimes = session.getExtraData().get(WorldTimes.class); - if (!worldTimes.isPresent()) return; + if (worldTimes.isEmpty()) return; for (Map.Entry worldTimesEntry : worldTimes.get().getWorldTimes().entrySet()) { String worldName = worldTimesEntry.getKey(); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/ExecStatement.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/ExecStatement.java index b95d980f8..f6a4f78bd 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/ExecStatement.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/ExecStatement.java @@ -59,11 +59,9 @@ public abstract class ExecStatement implements Executable { } public boolean execute(PreparedStatement statement) throws SQLException { - try { + try (statement) { prepare(statement); return callExecute(statement); - } finally { - statement.close(); } } diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/init/RemoveDuplicateUserInfoTransaction.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/init/RemoveDuplicateUserInfoTransaction.java index ec2ef6653..a370b2330 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/init/RemoveDuplicateUserInfoTransaction.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/init/RemoveDuplicateUserInfoTransaction.java @@ -65,7 +65,7 @@ public class RemoveDuplicateUserInfoTransaction extends ThrowawayTransaction { } private Collection getDuplicates() { - return query(new QueryAllStatement>(STATEMENT_SELECT_DUPLICATE_IDS) { + return query(new QueryAllStatement<>(STATEMENT_SELECT_DUPLICATE_IDS) { @Override public Collection processResults(ResultSet set) throws SQLException { Set duplicateIDs = new HashSet<>(); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/init/RemoveOldExtensionsTransaction.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/init/RemoveOldExtensionsTransaction.java index 324248718..debc61c79 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/init/RemoveOldExtensionsTransaction.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/init/RemoveOldExtensionsTransaction.java @@ -129,7 +129,7 @@ public class RemoveOldExtensionsTransaction extends ThrowawayTransaction { FROM + ExtensionProviderTable.TABLE_NAME + " pr" + INNER_JOIN + ExtensionPluginTable.TABLE_NAME + " pl on pl." + ExtensionPluginTable.ID + "=pr." + ExtensionProviderTable.PLUGIN_ID + WHERE + ExtensionPluginTable.SERVER_UUID + "=?"; - return new QueryStatement>(sql, 100) { + return new QueryStatement<>(sql, 100) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, serverUUID.toString()); @@ -156,7 +156,7 @@ public class RemoveOldExtensionsTransaction extends ThrowawayTransaction { INNER_JOIN + ExtensionPluginTable.TABLE_NAME + " pl on pl." + ExtensionPluginTable.ID + "=pr." + ExtensionTableProviderTable.PLUGIN_ID + WHERE + ExtensionPluginTable.LAST_UPDATED + ">(sql, 100) { + return new QueryStatement<>(sql, 100) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setLong(1, deleteOlder); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/DeleteIPsPatch.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/DeleteIPsPatch.java index 3994e3262..c97a717a3 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/DeleteIPsPatch.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/DeleteIPsPatch.java @@ -72,13 +72,13 @@ public class DeleteIPsPatch extends Patch { } private boolean hasLessDataInPlanIPs() { - Integer inIPs = query(new QueryAllStatement(SELECT + "COUNT(1) as c" + FROM + oldTableName) { + Integer inIPs = query(new QueryAllStatement<>(SELECT + "COUNT(1) as c" + FROM + oldTableName) { @Override public Integer processResults(ResultSet set) throws SQLException { return set.next() ? set.getInt("c") : 0; } }); - Integer inGeoInfo = query(new QueryAllStatement(SELECT + "COUNT(1) as c" + FROM + GeoInfoTable.TABLE_NAME) { + Integer inGeoInfo = query(new QueryAllStatement<>(SELECT + "COUNT(1) as c" + FROM + GeoInfoTable.TABLE_NAME) { @Override public Integer processResults(ResultSet set) throws SQLException { return set.next() ? set.getInt("c") : 0; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/LinkUsersToPlayersSecurityTablePatch.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/LinkUsersToPlayersSecurityTablePatch.java index feb29a2ae..21cd30436 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/LinkUsersToPlayersSecurityTablePatch.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/LinkUsersToPlayersSecurityTablePatch.java @@ -60,7 +60,7 @@ public class LinkUsersToPlayersSecurityTablePatch extends Patch { String sql = "UPDATE " + SecurityTable.TABLE_NAME + " SET " + SecurityTable.LINKED_TO + "=?" + WHERE + SecurityTable.USERNAME + "=?"; - Map byUsername = query(new QueryAllStatement>(querySQL) { + Map byUsername = query(new QueryAllStatement<>(querySQL) { @Override public Map processResults(ResultSet set) throws SQLException { Map byUsername = new HashMap<>(); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/LitebansTableHeaderPatch.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/LitebansTableHeaderPatch.java index 16bc4938d..e5749b9dc 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/LitebansTableHeaderPatch.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/LitebansTableHeaderPatch.java @@ -50,7 +50,7 @@ public class LitebansTableHeaderPatch extends Patch { OR + "pr." + ExtensionTableProviderTable.PROVIDER_NAME + "=?" + OR + "pr." + ExtensionTableProviderTable.PROVIDER_NAME + "=?" + OR + "pr." + ExtensionTableProviderTable.PROVIDER_NAME + "=?)"; - found = query(new QueryStatement>(sql) { + found = query(new QueryStatement<>(sql) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, "Litebans"); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/NicknameLastSeenPatch.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/NicknameLastSeenPatch.java index 95b8f5e9c..048dba2d2 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/NicknameLastSeenPatch.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/NicknameLastSeenPatch.java @@ -81,7 +81,7 @@ public class NicknameLastSeenPatch extends Patch { ServerTable.ID, ServerTable.SERVER_UUID) .toString(); - return query(new QueryAllStatement>(sql) { + return query(new QueryAllStatement<>(sql) { @Override public Map processResults(ResultSet set) throws SQLException { Map uuids = new HashMap<>(); @@ -96,7 +96,7 @@ public class NicknameLastSeenPatch extends Patch { private Map> getNicknamesByUserID(Map serverUUIDsByID) { String fetchSQL = "SELECT * FROM plan_actions WHERE action_id=3 ORDER BY date DESC"; - return query(new QueryAllStatement>>(fetchSQL, 10000) { + return query(new QueryAllStatement<>(fetchSQL, 10000) { @Override public Map> processResults(ResultSet set) throws SQLException { Map> map = new HashMap<>(); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/Patch.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/Patch.java index 61f89f9cf..e77935f2f 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/Patch.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/Patch.java @@ -145,7 +145,7 @@ public abstract class Patch extends OperationCriticalTransaction { protected boolean allValuesHaveValueZero(String tableName, String column) { String sql = SELECT + '*' + FROM + tableName + WHERE + column + "=? LIMIT 1"; - return query(new QueryStatement(sql) { + return query(new QueryStatement<>(sql) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setInt(1, 0); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/PlayerTableRowPatch.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/PlayerTableRowPatch.java index 538a5f338..60d784376 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/PlayerTableRowPatch.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/PlayerTableRowPatch.java @@ -47,7 +47,7 @@ public class PlayerTableRowPatch extends Patch { FROM + TABLE_NAME + WHERE + TABLE_ROW + "=?" + GROUP_BY + TABLE_ID; - return query(new QueryStatement(columnCountPerTableSql) { + return query(new QueryStatement<>(columnCountPerTableSql) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setInt(1, 0); @@ -92,7 +92,7 @@ public class PlayerTableRowPatch extends Patch { public Map> fetchTableRowIds() { String columnCountPerTableSql = SELECT + TABLE_ID + ',' + ID + FROM + TABLE_NAME; - return query(new QueryAllStatement>>(columnCountPerTableSql) { + return query(new QueryAllStatement<>(columnCountPerTableSql) { @Override public Map> processResults(ResultSet set) throws SQLException { HashMap> rowsPerTableId = new HashMap<>(); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/RegisterDateMinimizationPatch.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/RegisterDateMinimizationPatch.java index 0393638bb..4e3dd092b 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/RegisterDateMinimizationPatch.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/RegisterDateMinimizationPatch.java @@ -62,7 +62,7 @@ public class RegisterDateMinimizationPatch extends Patch { INNER_JOIN + UsersTable.TABLE_NAME + " u1 on u1." + UsersTable.ID + "=u2." + UserInfoTable.USER_ID + WHERE + "u1." + UsersTable.REGISTERED + ">min_registered"; - return new QueryAllStatement>(sql, 500) { + return new QueryAllStatement<>(sql, 500) { @Override public Map processResults(ResultSet set) throws SQLException { Map dates = new HashMap<>(); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/RemoveDanglingServerDataPatch.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/RemoveDanglingServerDataPatch.java index a3e9a0d4c..9e57d3717 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/RemoveDanglingServerDataPatch.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/RemoveDanglingServerDataPatch.java @@ -103,7 +103,7 @@ public class RemoveDanglingServerDataPatch extends Patch { private Query> getServerUuids() { String sql = "SELECT uuid FROM " + ServerTable.TABLE_NAME; - return new QueryAllStatement>(sql) { + return new QueryAllStatement<>(sql) { @Override public Set processResults(ResultSet set) throws SQLException { HashSet uuids = new HashSet<>(); @@ -118,7 +118,7 @@ public class RemoveDanglingServerDataPatch extends Patch { private Query> getServerUuids(String tableName) { String sql = "SELECT DISTINCT server_uuid FROM " + tableName; - return new QueryAllStatement>(sql) { + return new QueryAllStatement<>(sql) { @Override public Set processResults(ResultSet set) throws SQLException { HashSet uuids = new HashSet<>(); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/RemoveDanglingUserDataPatch.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/RemoveDanglingUserDataPatch.java index e4bb5eef9..74ad1e007 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/RemoveDanglingUserDataPatch.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/RemoveDanglingUserDataPatch.java @@ -111,7 +111,7 @@ public class RemoveDanglingUserDataPatch extends Patch { private Query> getUuids(String tableName) { String sql = "SELECT DISTINCT uuid FROM " + tableName; - return new QueryAllStatement>(sql) { + return new QueryAllStatement<>(sql) { @Override public Set processResults(ResultSet set) throws SQLException { HashSet uuids = new HashSet<>(); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/ServerTableRowPatch.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/ServerTableRowPatch.java index 02bbf2600..bf2440980 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/ServerTableRowPatch.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/ServerTableRowPatch.java @@ -47,7 +47,7 @@ public class ServerTableRowPatch extends Patch { FROM + TABLE_NAME + WHERE + TABLE_ROW + "=?" + GROUP_BY + TABLE_ID; - return query(new QueryStatement(columnCountPerTableSql) { + return query(new QueryStatement<>(columnCountPerTableSql) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setInt(1, 0); @@ -92,7 +92,7 @@ public class ServerTableRowPatch extends Patch { public Map> fetchTableRowIds() { String columnCountPerTableSql = SELECT + TABLE_ID + ',' + ID + FROM + TABLE_NAME; - return query(new QueryAllStatement>>(columnCountPerTableSql) { + return query(new QueryAllStatement<>(columnCountPerTableSql) { @Override public Map> processResults(ResultSet set) throws SQLException { HashMap> rowsPerTableId = new HashMap<>(); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/SessionJoinAddressPatch.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/SessionJoinAddressPatch.java index 83960b425..ce3262cde 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/SessionJoinAddressPatch.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/SessionJoinAddressPatch.java @@ -46,7 +46,7 @@ public class SessionJoinAddressPatch extends Patch { String sql = SELECT + DISTINCT + "LOWER(COALESCE(" + UserInfoTable.JOIN_ADDRESS + ", ?)) as address" + FROM + UserInfoTable.TABLE_NAME + ORDER_BY + "address ASC"; - return new QueryStatement>(sql, 100) { + return new QueryStatement<>(sql, 100) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, JoinAddressTable.DEFAULT_VALUE_FOR_LOOKUP); @@ -76,7 +76,7 @@ public class SessionJoinAddressPatch extends Patch { } private Integer getDefaultAddressId() { - return query(new QueryStatement(SELECT + ID + + return query(new QueryStatement<>(SELECT + ID + FROM + JoinAddressTable.TABLE_NAME + WHERE + JoinAddressTable.JOIN_ADDRESS + "=LOWER(?)") { @Override @@ -115,7 +115,7 @@ public class SessionJoinAddressPatch extends Patch { INNER_JOIN + JoinAddressTable.TABLE_NAME + " j on j." + JoinAddressTable.JOIN_ADDRESS + "=u." + UserInfoTable.JOIN_ADDRESS + GROUP_BY + "u." + UserInfoTable.USER_ID + ",u." + UserInfoTable.SERVER_ID; - Map joinAddressIdsBySessionId = query(new QueryAllStatement>(sql) { + Map joinAddressIdsBySessionId = query(new QueryAllStatement<>(sql) { @Override public Map processResults(ResultSet set) throws SQLException { Map joinAddressBySessionId = new TreeMap<>(); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/WorldsServerIDPatch.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/WorldsServerIDPatch.java index 0522097ad..3def954d7 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/WorldsServerIDPatch.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/WorldsServerIDPatch.java @@ -86,7 +86,7 @@ public class WorldsServerIDPatch extends Patch { INNER_JOIN + ServerTable.TABLE_NAME + " on " + serverIDColumn + "=" + sessionServerIDColumn + WHERE + serverUUIDColumn + "=?"; - return query(new QueryStatement>(sql, 1000) { + return query(new QueryStatement<>(sql, 1000) { @Override public void prepare(PreparedStatement statement) throws SQLException { statement.setString(1, serverUUID.toString()); @@ -138,7 +138,7 @@ public class WorldsServerIDPatch extends Patch { public List getWorldObjects() { String sql = SELECT + '*' + FROM + WorldTable.TABLE_NAME; - return query(new QueryAllStatement>(sql, 100) { + return query(new QueryAllStatement<>(sql, 100) { @Override public List processResults(ResultSet set) throws SQLException { List objects = new ArrayList<>(); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/file/FileResource.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/file/FileResource.java index 11b91201b..964337d5f 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/file/FileResource.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/file/FileResource.java @@ -76,7 +76,7 @@ public class FileResource implements Resource { @Override public String asString() throws IOException { StringBuilder flat = new StringBuilder(); - try (Scanner scanner = new Scanner(file, "UTF-8")) { + try (Scanner scanner = new Scanner(file, StandardCharsets.UTF_8)) { while (scanner.hasNextLine()) { flat.append(scanner.nextLine()).append("\r\n"); } diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/file/JarResource.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/file/JarResource.java index 475cef309..3f5e923be 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/file/JarResource.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/file/JarResource.java @@ -22,6 +22,7 @@ import java.io.ByteArrayOutputStream; import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; import java.util.Scanner; @@ -61,7 +62,7 @@ public class JarResource implements Resource { List lines = new ArrayList<>(); try ( InputStream inputStream = asInputStream(); - Scanner scanner = new Scanner(inputStream, "UTF-8") + Scanner scanner = new Scanner(inputStream, StandardCharsets.UTF_8) ) { while (scanner.hasNextLine()) { lines.add(scanner.nextLine()); @@ -75,7 +76,7 @@ public class JarResource implements Resource { StringBuilder flat = new StringBuilder(); try ( InputStream inputStream = asInputStream(); - Scanner scanner = new Scanner(inputStream, "UTF-8") + Scanner scanner = new Scanner(inputStream, StandardCharsets.UTF_8) ) { while (scanner.hasNextLine()) { flat.append(scanner.nextLine()).append("\r\n"); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/upkeep/DBCleanTask.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/upkeep/DBCleanTask.java index eaa2db4ba..e2318653e 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/upkeep/DBCleanTask.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/upkeep/DBCleanTask.java @@ -178,7 +178,7 @@ public class DBCleanTask extends TaskSystem.Task { FROM + '(' + selectLastSeen + ") as q1" + INNER_JOIN + UsersTable.TABLE_NAME + " u on u." + UsersTable.ID + '=' + "q1." + SessionsTable.USER_ID + WHERE + "last_seen < ?"; - return new QueryStatement>(sql, 20000) { + return new QueryStatement<>(sql, 20000) { @Override public void prepare(PreparedStatement statement) throws SQLException { diff --git a/Plan/nukkit/src/main/java/com/djrapitops/plan/commands/use/NukkitMessageBuilder.java b/Plan/nukkit/src/main/java/com/djrapitops/plan/commands/use/NukkitMessageBuilder.java index a1e1fdf26..c8ff22d35 100644 --- a/Plan/nukkit/src/main/java/com/djrapitops/plan/commands/use/NukkitMessageBuilder.java +++ b/Plan/nukkit/src/main/java/com/djrapitops/plan/commands/use/NukkitMessageBuilder.java @@ -67,9 +67,7 @@ public class NukkitMessageBuilder implements MessageBuilder { @Override public MessageBuilder indent(int amount) { - for (int i = 0; i < amount; i++) { - builder.append(' '); - } + builder.append(" ".repeat(Math.max(0, amount))); return this; } diff --git a/Plan/nukkit/src/main/java/com/djrapitops/plan/gathering/listeners/nukkit/DeathEventListener.java b/Plan/nukkit/src/main/java/com/djrapitops/plan/gathering/listeners/nukkit/DeathEventListener.java index 9d19823ff..346be2f62 100644 --- a/Plan/nukkit/src/main/java/com/djrapitops/plan/gathering/listeners/nukkit/DeathEventListener.java +++ b/Plan/nukkit/src/main/java/com/djrapitops/plan/gathering/listeners/nukkit/DeathEventListener.java @@ -74,7 +74,7 @@ public class DeathEventListener implements Listener { try { Optional foundKiller = findKiller(dead); - if (!foundKiller.isPresent()) { + if (foundKiller.isEmpty()) { return; } Player killer = foundKiller.get(); @@ -99,7 +99,7 @@ public class DeathEventListener implements Listener { try { Optional foundKiller = findKiller(dead); - if (!foundKiller.isPresent()) { + if (foundKiller.isEmpty()) { return; } Player killer = foundKiller.get(); diff --git a/Plan/sponge/src/main/java/com/djrapitops/plan/gathering/listeners/SpongeListenerSystem.java b/Plan/sponge/src/main/java/com/djrapitops/plan/gathering/listeners/SpongeListenerSystem.java index a0db2cebb..33beebc99 100644 --- a/Plan/sponge/src/main/java/com/djrapitops/plan/gathering/listeners/SpongeListenerSystem.java +++ b/Plan/sponge/src/main/java/com/djrapitops/plan/gathering/listeners/SpongeListenerSystem.java @@ -22,7 +22,6 @@ import com.djrapitops.plan.SpongeServerShutdownSave; import com.djrapitops.plan.api.events.PlanSpongeEnableEvent; import com.djrapitops.plan.capability.CapabilitySvc; import com.djrapitops.plan.gathering.listeners.sponge.*; -import com.djrapitops.plan.gathering.listeners.sponge.SpongeGMChangeListener; import net.playeranalytics.plugin.server.Listeners; import org.spongepowered.api.Sponge; import org.spongepowered.api.event.Event; diff --git a/Plan/sponge/src/main/java/com/djrapitops/plan/modules/sponge/SpongeTaskModule.java b/Plan/sponge/src/main/java/com/djrapitops/plan/modules/sponge/SpongeTaskModule.java index 10c3d0aa6..5420446e7 100644 --- a/Plan/sponge/src/main/java/com/djrapitops/plan/modules/sponge/SpongeTaskModule.java +++ b/Plan/sponge/src/main/java/com/djrapitops/plan/modules/sponge/SpongeTaskModule.java @@ -34,7 +34,6 @@ import com.djrapitops.plan.storage.upkeep.OldDependencyCacheDeletionTask; import dagger.Binds; import dagger.Module; import dagger.multibindings.IntoSet; -import org.spongepowered.api.world.World; import org.spongepowered.api.world.server.ServerWorld; @Module