From a64336803f366f1cb1fd1b28c65a9fe838240123 Mon Sep 17 00:00:00 2001 From: Rsl1122 Date: Thu, 20 Dec 2018 13:50:40 +0200 Subject: [PATCH] Bunch of things: - IntelliJ Inspection fixes. - Removed some unused code - Added ConfigNode#getStringMap - Removed usages of ConfigNode#getChildren --- .../utilities/mocks/PlanBungeeMocker.java | 1 + .../manage/ManageConDebugCommand.java | 3 -- .../commands/manage/ManageDisableCommand.java | 12 +++--- .../commands/manage/ManageRestoreCommand.java | 10 +---- .../plan/data/plugin/HookHandler.java | 8 ---- .../djrapitops/plan/system/PlanSystem.java | 2 +- .../plan/system/export/HtmlExport.java | 4 -- .../system/info/connection/ConnectionOut.java | 9 ++-- .../system/settings/config/ConfigNode.java | 17 +++++--- .../system/settings/config/ConfigWriter.java | 2 +- .../settings/config/WorldAliasSettings.java | 8 +--- .../utilities/html/pages/InspectPage.java | 5 +-- .../plan/BungeeBukkitConnectionTest.java | 7 +--- .../database/databases/CommonDBTest.java | 42 ++++++------------- 14 files changed, 45 insertions(+), 85 deletions(-) diff --git a/Plan/bungeecord/src/test/java/utilities/mocks/PlanBungeeMocker.java b/Plan/bungeecord/src/test/java/utilities/mocks/PlanBungeeMocker.java index 17636156f..f1b0680f8 100644 --- a/Plan/bungeecord/src/test/java/utilities/mocks/PlanBungeeMocker.java +++ b/Plan/bungeecord/src/test/java/utilities/mocks/PlanBungeeMocker.java @@ -85,6 +85,7 @@ public class PlanBungeeMocker extends Mocker { return this; } + @SuppressWarnings("deprecation") public PlanBungeeMocker withProxy() { ProxyServer proxyMock = Mockito.mock(ProxyServer.class); doReturn("1.12.2").when(proxyMock).getVersion(); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/command/commands/manage/ManageConDebugCommand.java b/Plan/common/src/main/java/com/djrapitops/plan/command/commands/manage/ManageConDebugCommand.java index 210111a71..bfaf5d26c 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/command/commands/manage/ManageConDebugCommand.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/command/commands/manage/ManageConDebugCommand.java @@ -95,9 +95,6 @@ public class ManageConDebugCommand extends CommandNode { try { connectionSystem.sendInfoRequest(infoRequestFactory.checkConnectionRequest(address), server); sender.sendMessage(getMsgFor(address, usingHttps, local, true, true)); - } catch (ForbiddenException | BadRequestException | InternalErrorException e) { - sender.sendMessage(getMsgFor(address, usingHttps, local, false, false)); - sender.sendMessage(locale.getString(ManageLang.CON_EXCEPTION, e.getClass().getSimpleName())); } catch (UnauthorizedServerException e) { sender.sendMessage(getMsgFor(address, usingHttps, local, true, false)); sender.sendMessage(locale.getString(ManageLang.CON_UNAUTHORIZED)); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/command/commands/manage/ManageDisableCommand.java b/Plan/common/src/main/java/com/djrapitops/plan/command/commands/manage/ManageDisableCommand.java index 5d0936fae..30ab4d9b5 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/command/commands/manage/ManageDisableCommand.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/command/commands/manage/ManageDisableCommand.java @@ -60,13 +60,11 @@ public class ManageDisableCommand extends CommandNode { Verify.isTrue(args.length >= 1, () -> new IllegalArgumentException(locale.getString(CommandLang.FAIL_REQ_ONE_ARG, Arrays.toString(this.getArguments())))); - switch (args[0].toLowerCase()) { - case "kickcount": - status.setCountKicks(false); - sender.sendMessage(locale.getString(CommandLang.FEATURE_DISABLED, "Kick Counting")); - break; - default: - sender.sendMessage(locale.getString(CommandLang.FAIL_NO_SUCH_FEATURE, "'kickcount'")); + if ("kickcount".equals(args[0].toLowerCase())) { + status.setCountKicks(false); + sender.sendMessage(locale.getString(CommandLang.FEATURE_DISABLED, "Kick Counting")); + } else { + sender.sendMessage(locale.getString(CommandLang.FAIL_NO_SUCH_FEATURE, "'kickcount'")); } } } diff --git a/Plan/common/src/main/java/com/djrapitops/plan/command/commands/manage/ManageRestoreCommand.java b/Plan/common/src/main/java/com/djrapitops/plan/command/commands/manage/ManageRestoreCommand.java index 304643bc5..e763bc994 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/command/commands/manage/ManageRestoreCommand.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/command/commands/manage/ManageRestoreCommand.java @@ -110,20 +110,14 @@ public class ManageRestoreCommand extends CommandNode { private void runRestoreTask(String backupDbName, Sender sender, Database database) { processing.submitCritical(() -> { try { - String backupDBName = backupDbName; - boolean containsDBFileExtension = backupDBName.endsWith(".db"); - - File backupDBFile = files.getFileFromPluginFolder(backupDBName + (containsDBFileExtension ? "" : ".db")); + boolean containsDBFileExtension = backupDbName.endsWith(".db"); + File backupDBFile = files.getFileFromPluginFolder(backupDbName + (containsDBFileExtension ? "" : ".db")); if (!backupDBFile.exists()) { sender.sendMessage(locale.getString(ManageLang.FAIL_FILE_NOT_FOUND, backupDBFile.getAbsolutePath())); return; } - if (containsDBFileExtension) { - backupDBName = backupDBName.substring(0, backupDBName.length() - 3); - } - SQLiteDB backupDB = sqliteFactory.usingFile(backupDBFile); backupDB.init(); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/data/plugin/HookHandler.java b/Plan/common/src/main/java/com/djrapitops/plan/data/plugin/HookHandler.java index a8246dd9f..01d2d5449 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/data/plugin/HookHandler.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/data/plugin/HookHandler.java @@ -26,7 +26,6 @@ import com.djrapitops.pluginbridge.plan.Bridge; import javax.inject.Inject; import javax.inject.Singleton; import java.util.*; -import java.util.stream.Collectors; /** * Class responsible for hooking to other plugins and managing the %plugins% @@ -115,13 +114,6 @@ public class HookHandler implements SubSystem { return additionalDataSources; } - public List getBanDataSources() { - return additionalDataSources.stream() - .filter(p -> p instanceof BanData) - .map(p -> (BanData) p) - .collect(Collectors.toList()); - } - public Map getInspectContainersFor(UUID uuid) { List plugins = getAdditionalDataSources(); Map containers = new HashMap<>(); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/PlanSystem.java b/Plan/common/src/main/java/com/djrapitops/plan/system/PlanSystem.java index ffebbda69..fd8da3b44 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/PlanSystem.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/system/PlanSystem.java @@ -246,6 +246,6 @@ public class PlanSystem implements SubSystem { } public boolean isEnabled() { - return false; + return enabled; } } \ No newline at end of file diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/export/HtmlExport.java b/Plan/common/src/main/java/com/djrapitops/plan/system/export/HtmlExport.java index cca9e117b..4b2f9e899 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/export/HtmlExport.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/system/export/HtmlExport.java @@ -24,7 +24,6 @@ import com.djrapitops.plan.system.database.DBSystem; import com.djrapitops.plan.system.file.PlanFiles; import com.djrapitops.plan.system.info.connection.ConnectionSystem; import com.djrapitops.plan.system.info.server.ServerInfo; -import com.djrapitops.plan.system.processing.Processing; import com.djrapitops.plan.system.settings.config.PlanConfig; import com.djrapitops.plan.system.settings.paths.ExportSettings; import com.djrapitops.plan.system.settings.theme.Theme; @@ -55,7 +54,6 @@ public class HtmlExport extends SpecificExport { private final PlanPlugin plugin; private final PlanConfig config; private final Theme theme; - private final Processing processing; private final PlanFiles files; private final DBSystem dbSystem; private final PageFactory pageFactory; @@ -68,7 +66,6 @@ public class HtmlExport extends SpecificExport { PlanFiles files, PlanConfig config, Theme theme, - Processing processing, DBSystem dbSystem, PageFactory pageFactory, ServerInfo serverInfo, @@ -79,7 +76,6 @@ public class HtmlExport extends SpecificExport { this.plugin = plugin; this.config = config; this.theme = theme; - this.processing = processing; this.files = files; this.dbSystem = dbSystem; this.pageFactory = pageFactory; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/info/connection/ConnectionOut.java b/Plan/common/src/main/java/com/djrapitops/plan/system/info/connection/ConnectionOut.java index 0d715fdef..89466bcda 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/info/connection/ConnectionOut.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/system/info/connection/ConnectionOut.java @@ -71,10 +71,11 @@ public class ConnectionOut { /** * Constructor. - * @param toServer Full address to another Plan webserver. (http://something:port) - * @param serverUUID UUID of server this outbound connection. - * @param infoRequest Type of the action this connection wants to be performed. - * @param connectionLog + * + * @param toServer Full address to another Plan webserver. (http://something:port) + * @param serverUUID UUID of server this outbound connection. + * @param infoRequest Type of the action this connection wants to be performed. + * @param connectionLog Where the connection should be logged. */ public ConnectionOut( Server toServer, UUID serverUUID, InfoRequest infoRequest, diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/settings/config/ConfigNode.java b/Plan/common/src/main/java/com/djrapitops/plan/system/settings/config/ConfigNode.java index 569402b37..57ca33196 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/settings/config/ConfigNode.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/system/settings/config/ConfigNode.java @@ -25,6 +25,7 @@ package com.djrapitops.plan.system.settings.config; import java.io.IOException; import java.util.*; +import java.util.stream.Collectors; /** * Represents a single node in a configuration file @@ -245,6 +246,17 @@ public class ConfigNode { return getNode(path).map(ConfigNode::getStringList).orElse(Collections.emptyList()); } + /** + * Return values in a Map. + * + * @param fullKeys Should the key be full keys of the Config node. + * @return Map with Config key - ConfigNode#getString. + */ + public Map getStringMap(boolean fullKeys) { + return childNodes.values().stream() + .collect(Collectors.toMap(node -> node.getKey(fullKeys), ConfigNode::getString)); + } + public Integer getInteger(String path) { return getNode(path).map(ConfigNode::getInteger).orElse(null); } @@ -300,11 +312,6 @@ public class ConfigNode { return parent != null ? parent.getNodeDepth() + 1 : -1; // Root node is -1 } - @Deprecated // Make protected - public Map getChildren() { - return childNodes; - } - public ConfigNode getParent() { return parent; } diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/settings/config/ConfigWriter.java b/Plan/common/src/main/java/com/djrapitops/plan/system/settings/config/ConfigWriter.java index f6af27d32..3895d3e69 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/settings/config/ConfigWriter.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/system/settings/config/ConfigWriter.java @@ -59,7 +59,7 @@ public class ConfigWriter { } private void dfsTreeTraverseLineResolve(ConfigNode writing, Collection lines) { - Map children = writing.getChildren(); + Map children = writing.childNodes; for (String key : writing.getNodeOrder()) { ConfigNode node = children.get(key); if (node.value == null && node.nodeOrder.isEmpty()) { diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/settings/config/WorldAliasSettings.java b/Plan/common/src/main/java/com/djrapitops/plan/system/settings/config/WorldAliasSettings.java index de8fc0034..5206f0f95 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/settings/config/WorldAliasSettings.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/system/settings/config/WorldAliasSettings.java @@ -74,13 +74,7 @@ public class WorldAliasSettings { * @return Map: Original name, Alias */ public Map getAliases() { - ConfigNode aliasSect = getAliasSection(); - - Map aliasMap = new HashMap<>(); - for (Map.Entry world : aliasSect.getChildren().entrySet()) { - aliasMap.put(world.getKey(), world.getValue().getString()); - } - return aliasMap; + return getAliasSection().getStringMap(false); } /** diff --git a/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/InspectPage.java b/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/InspectPage.java index eeb381b5b..f40c02eca 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/InspectPage.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/InspectPage.java @@ -152,9 +152,8 @@ public class InspectPage implements Page { String playerName = player.getValue(PlayerKeys.NAME).orElse("Unknown"); int timesKicked = player.getValue(PlayerKeys.KICK_COUNT).orElse(0); - replacer.addAllPlaceholdersFrom(player, yearLongFormatter, - PlayerKeys.REGISTERED, PlayerKeys.LAST_SEEN - ); + replacer.addPlaceholderFrom(player, yearLongFormatter, PlayerKeys.REGISTERED); + replacer.addPlaceholderFrom(player, yearLongFormatter, PlayerKeys.LAST_SEEN); replacer.put("playerName", playerName); replacer.put("kickCount", timesKicked); diff --git a/Plan/plugin/src/test/java/com/djrapitops/plan/BungeeBukkitConnectionTest.java b/Plan/plugin/src/test/java/com/djrapitops/plan/BungeeBukkitConnectionTest.java index 8c13781ac..f10485b7b 100644 --- a/Plan/plugin/src/test/java/com/djrapitops/plan/BungeeBukkitConnectionTest.java +++ b/Plan/plugin/src/test/java/com/djrapitops/plan/BungeeBukkitConnectionTest.java @@ -40,9 +40,6 @@ public class BungeeBukkitConnectionTest { private PlanSystem bukkitSystem; private PlanSystem bungeeSystem; - private UUID bukkitUUID; - private UUID bungeeUUID; - @After public void tearDown() { System.out.println("------------------------------"); @@ -69,8 +66,8 @@ public class BungeeBukkitConnectionTest { bukkitSystem.enable(); bungeeSystem.enable(); - bukkitUUID = bukkitSystem.getServerInfo().getServerUUID(); - bungeeUUID = bungeeSystem.getServerInfo().getServerUUID(); + UUID bukkitUUID = bukkitSystem.getServerInfo().getServerUUID(); + UUID bungeeUUID = bungeeSystem.getServerInfo().getServerUUID(); System.out.println("------------------------------"); System.out.println("Enable Complete"); diff --git a/Plan/plugin/src/test/java/com/djrapitops/plan/system/database/databases/CommonDBTest.java b/Plan/plugin/src/test/java/com/djrapitops/plan/system/database/databases/CommonDBTest.java index 7cdd8aea7..a91c1d061 100644 --- a/Plan/plugin/src/test/java/com/djrapitops/plan/system/database/databases/CommonDBTest.java +++ b/Plan/plugin/src/test/java/com/djrapitops/plan/system/database/databases/CommonDBTest.java @@ -42,6 +42,7 @@ import org.junit.rules.TemporaryFolder; import org.junit.rules.Timeout; import rules.BukkitComponentMocker; import rules.ComponentMocker; +import utilities.FieldFetcher; import utilities.OptionalAssert; import utilities.RandomData; import utilities.TestConstants; @@ -49,8 +50,6 @@ import utilities.TestConstants; import java.io.File; import java.lang.management.ManagementFactory; import java.lang.management.OperatingSystemMXBean; -import java.lang.reflect.Field; -import java.lang.reflect.Modifier; import java.security.NoSuchAlgorithmException; import java.util.*; import java.util.concurrent.TimeUnit; @@ -916,14 +915,10 @@ public abstract class CommonDBTest { playerContainer.putRawData(PlayerKeys.ACTIVE_SESSION, RandomData.randomSession()); List unsupported = new ArrayList<>(); - for (Field field : PlayerKeys.class.getDeclaredFields()) { - if (!Modifier.isPublic(field.getModifiers())) { - continue; - } - // the field is static and no object is needed for access. - Key key = (Key) field.get(null); + List keys = FieldFetcher.getPublicStaticFields(PlayerKeys.class, Key.class); + for (Key key : keys) { if (!playerContainer.supports(key)) { - unsupported.add(field.getName()); + unsupported.add(key.getKeyName()); } } @@ -937,14 +932,10 @@ public abstract class CommonDBTest { ServerContainer serverContainer = db.fetch().getServerContainer(serverUUID); List unsupported = new ArrayList<>(); - for (Field field : ServerKeys.class.getDeclaredFields()) { - if (!Modifier.isPublic(field.getModifiers())) { - continue; - } - // the field is static and no object is needed for access. - Key key = (Key) field.get(null); + List keys = FieldFetcher.getPublicStaticFields(ServerKeys.class, Key.class); + for (Key key : keys) { if (!serverContainer.supports(key)) { - unsupported.add(field.getName()); + unsupported.add(key.getKeyName()); } } @@ -959,14 +950,10 @@ public abstract class CommonDBTest { db.fetch().getServerContainer(serverUUID) ); Collection unsupported = new ArrayList<>(); - for (Field field : AnalysisKeys.class.getDeclaredFields()) { - if (!Modifier.isPublic(field.getModifiers())) { - continue; - } - // the field is static and no object is needed for access. - Key key = (Key) field.get(null); + List keys = FieldFetcher.getPublicStaticFields(AnalysisKeys.class, Key.class); + for (Key key : keys) { if (!analysisContainer.supports(key)) { - unsupported.add(field.getName()); + unsupported.add(key.getKeyName()); } } @@ -995,13 +982,10 @@ public abstract class CommonDBTest { NetworkContainer networkContainer = db.fetch().getNetworkContainer(); List unsupported = new ArrayList<>(); - for (Field field : NetworkKeys.class.getDeclaredFields()) { - if (!Modifier.isPublic(field.getModifiers())) { - continue; - } - Key key = (Key) field.get(null); + List keys = FieldFetcher.getPublicStaticFields(NetworkKeys.class, Key.class); + for (Key key : keys) { if (!networkContainer.supports(key)) { - unsupported.add(field.getName()); + unsupported.add(key.getKeyName()); } }