From 700ab5f3e4378939ad4e305998b3e12906058687 Mon Sep 17 00:00:00 2001 From: Gabriele C Date: Sun, 9 Oct 2016 23:46:07 +0200 Subject: [PATCH] Cleanup --- .../authme/command/executable/authme/VersionCommand.java | 6 +----- src/main/java/fr/xephi/authme/util/StringUtils.java | 2 -- src/main/java/fr/xephi/authme/util/Utils.java | 3 --- src/test/java/fr/xephi/authme/ClassCollector.java | 2 +- .../xephi/authme/command/help/HelpMessagesServiceTest.java | 1 + .../java/fr/xephi/authme/listener/OnJoinVerifierTest.java | 2 +- .../xephi/authme/process/login/AsynchronousLoginTest.java | 2 +- .../java/fr/xephi/authme/service/AntiBotServiceTest.java | 2 +- src/test/java/fr/xephi/authme/util/PlayerUtilsTest.java | 2 -- .../tools/docs/permissions/PermissionNodesGatherer.java | 1 + 10 files changed, 7 insertions(+), 16 deletions(-) diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/VersionCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/VersionCommand.java index eb68cf3c..791cefe0 100644 --- a/src/main/java/fr/xephi/authme/command/executable/authme/VersionCommand.java +++ b/src/main/java/fr/xephi/authme/command/executable/authme/VersionCommand.java @@ -1,7 +1,6 @@ package fr.xephi.authme.command.executable.authme; import fr.xephi.authme.AuthMe; -import fr.xephi.authme.command.CommandService; import fr.xephi.authme.command.ExecutableCommand; import fr.xephi.authme.service.BukkitService; import org.bukkit.ChatColor; @@ -17,9 +16,6 @@ public class VersionCommand implements ExecutableCommand { @Inject private BukkitService bukkitService; - @Inject - private CommandService commandService; - @Override public void executeCommand(CommandSender sender, List arguments) { // Show some version info @@ -40,7 +36,7 @@ public class VersionCommand implements ExecutableCommand { sender.sendMessage(ChatColor.GOLD + "License: " + ChatColor.WHITE + "GNU GPL v3.0" + ChatColor.GRAY + ChatColor.ITALIC + " (See LICENSE file)"); sender.sendMessage(ChatColor.GOLD + "Copyright: " + ChatColor.WHITE - + "Copyright (c) Xephi 2015. All rights reserved."); + + "Copyright (c) AuthMe-Team 2016. All rights reserved."); } /** diff --git a/src/main/java/fr/xephi/authme/util/StringUtils.java b/src/main/java/fr/xephi/authme/util/StringUtils.java index cc85fe33..a4fc733e 100644 --- a/src/main/java/fr/xephi/authme/util/StringUtils.java +++ b/src/main/java/fr/xephi/authme/util/StringUtils.java @@ -4,8 +4,6 @@ import net.ricecode.similarity.LevenshteinDistanceStrategy; import net.ricecode.similarity.StringSimilarityService; import net.ricecode.similarity.StringSimilarityServiceImpl; -import java.io.File; - /** * Utility class for String operations. */ diff --git a/src/main/java/fr/xephi/authme/util/Utils.java b/src/main/java/fr/xephi/authme/util/Utils.java index f15d77c8..1136854d 100644 --- a/src/main/java/fr/xephi/authme/util/Utils.java +++ b/src/main/java/fr/xephi/authme/util/Utils.java @@ -1,9 +1,6 @@ package fr.xephi.authme.util; import fr.xephi.authme.ConsoleLogger; -import org.bukkit.OfflinePlayer; -import org.bukkit.entity.Player; - import java.util.regex.Pattern; /** diff --git a/src/test/java/fr/xephi/authme/ClassCollector.java b/src/test/java/fr/xephi/authme/ClassCollector.java index 9cb9cbb1..886201b0 100644 --- a/src/test/java/fr/xephi/authme/ClassCollector.java +++ b/src/test/java/fr/xephi/authme/ClassCollector.java @@ -52,7 +52,7 @@ public class ClassCollector { * @param the parent type * @return list of matching classes */ - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) public List> collectClasses(Class parent) { List> classes = collectClasses(parent::isAssignableFrom); return new ArrayList<>((List) classes); diff --git a/src/test/java/fr/xephi/authme/command/help/HelpMessagesServiceTest.java b/src/test/java/fr/xephi/authme/command/help/HelpMessagesServiceTest.java index ac346d24..a451ff4d 100644 --- a/src/test/java/fr/xephi/authme/command/help/HelpMessagesServiceTest.java +++ b/src/test/java/fr/xephi/authme/command/help/HelpMessagesServiceTest.java @@ -38,6 +38,7 @@ public class HelpMessagesServiceTest { @Mock private MessageFileHandlerProvider messageFileHandlerProvider; + @SuppressWarnings("unchecked") @BeforeInjecting public void initializeHandler() { MessageFileHandler handler = new MessageFileHandler(getJarFile(TEST_FILE), "messages/messages_en.yml"); diff --git a/src/test/java/fr/xephi/authme/listener/OnJoinVerifierTest.java b/src/test/java/fr/xephi/authme/listener/OnJoinVerifierTest.java index 92522eb5..6271f092 100644 --- a/src/test/java/fr/xephi/authme/listener/OnJoinVerifierTest.java +++ b/src/test/java/fr/xephi/authme/listener/OnJoinVerifierTest.java @@ -493,7 +493,7 @@ public class OnJoinVerifierTest { return player; } - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) private void returnOnlineListFromBukkitServer(Collection onlineList) { // Note ljacqu 20160529: The compiler gets lost in generics because Collection is returned // from getOnlinePlayers(). We need to uncheck onlineList to a simple Collection or it will refuse to compile. diff --git a/src/test/java/fr/xephi/authme/process/login/AsynchronousLoginTest.java b/src/test/java/fr/xephi/authme/process/login/AsynchronousLoginTest.java index 27582a59..33e8f05b 100644 --- a/src/test/java/fr/xephi/authme/process/login/AsynchronousLoginTest.java +++ b/src/test/java/fr/xephi/authme/process/login/AsynchronousLoginTest.java @@ -247,7 +247,7 @@ public class AsynchronousLoginTest { return player; } - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) private void mockOnlinePlayersInBukkitService() { // 127.0.0.4: albania (online), brazil (offline) Player playerA = mockPlayer("albania"); diff --git a/src/test/java/fr/xephi/authme/service/AntiBotServiceTest.java b/src/test/java/fr/xephi/authme/service/AntiBotServiceTest.java index 1ab74ec3..e40d5ca7 100644 --- a/src/test/java/fr/xephi/authme/service/AntiBotServiceTest.java +++ b/src/test/java/fr/xephi/authme/service/AntiBotServiceTest.java @@ -190,7 +190,7 @@ public class AntiBotServiceTest { } @Test - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) public void shouldInformPlayersOnActivation() { // given - listening antibot runSyncDelayedTaskWithDelay(bukkitService); diff --git a/src/test/java/fr/xephi/authme/util/PlayerUtilsTest.java b/src/test/java/fr/xephi/authme/util/PlayerUtilsTest.java index 14933a04..be5425c2 100644 --- a/src/test/java/fr/xephi/authme/util/PlayerUtilsTest.java +++ b/src/test/java/fr/xephi/authme/util/PlayerUtilsTest.java @@ -6,8 +6,6 @@ import org.junit.BeforeClass; import org.junit.Test; import java.util.UUID; -import java.util.regex.Pattern; - import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; import static org.mockito.BDDMockito.given; diff --git a/src/test/java/tools/docs/permissions/PermissionNodesGatherer.java b/src/test/java/tools/docs/permissions/PermissionNodesGatherer.java index 9c469e8e..f6221ac5 100644 --- a/src/test/java/tools/docs/permissions/PermissionNodesGatherer.java +++ b/src/test/java/tools/docs/permissions/PermissionNodesGatherer.java @@ -32,6 +32,7 @@ public class PermissionNodesGatherer { * * @return Ordered map whose keys are the permission nodes and the values the associated JavaDoc */ + @SuppressWarnings("unchecked") public & PermissionNode> Map gatherNodesWithJavaDoc() { Map result = new TreeMap<>(); result.put("authme.admin.*", "Give access to all admin commands.");