From 6ee07160bb808a6dcba9ced252392db98269486c Mon Sep 17 00:00:00 2001 From: Gabriele C Date: Tue, 8 Dec 2015 20:07:10 +0100 Subject: [PATCH] cleanup and update deps --- pom.xml | 2 +- .../authme/command/CommandPermissions.java | 1 - .../fr/xephi/authme/command/CommandUtils.java | 5 ++--- .../xephi/authme/command/help/HelpPrinter.java | 18 +++++++++--------- .../ChangePasswordCommandTest.java | 3 --- 5 files changed, 12 insertions(+), 17 deletions(-) diff --git a/pom.xml b/pom.xml index c928c9a6..f308569e 100644 --- a/pom.xml +++ b/pom.xml @@ -285,7 +285,7 @@ com.zaxxer HikariCP - 2.4.2 + 2.4.3 compile diff --git a/src/main/java/fr/xephi/authme/command/CommandPermissions.java b/src/main/java/fr/xephi/authme/command/CommandPermissions.java index 71649f3b..2c52f85a 100644 --- a/src/main/java/fr/xephi/authme/command/CommandPermissions.java +++ b/src/main/java/fr/xephi/authme/command/CommandPermissions.java @@ -7,7 +7,6 @@ import fr.xephi.authme.permission.PermissionNode; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import java.util.ArrayList; import java.util.List; /** diff --git a/src/main/java/fr/xephi/authme/command/CommandUtils.java b/src/main/java/fr/xephi/authme/command/CommandUtils.java index 6903ff7a..6025a5d9 100644 --- a/src/main/java/fr/xephi/authme/command/CommandUtils.java +++ b/src/main/java/fr/xephi/authme/command/CommandUtils.java @@ -1,11 +1,10 @@ package fr.xephi.authme.command; +import java.util.List; + import fr.xephi.authme.util.CollectionUtils; import fr.xephi.authme.util.StringUtils; -import java.util.ArrayList; -import java.util.List; - public final class CommandUtils { public static int getMinNumberOfArguments(CommandDescription command) { diff --git a/src/main/java/fr/xephi/authme/command/help/HelpPrinter.java b/src/main/java/fr/xephi/authme/command/help/HelpPrinter.java index 5b520ea2..56ad48d8 100644 --- a/src/main/java/fr/xephi/authme/command/help/HelpPrinter.java +++ b/src/main/java/fr/xephi/authme/command/help/HelpPrinter.java @@ -1,5 +1,14 @@ package fr.xephi.authme.command.help; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; + +import org.bukkit.ChatColor; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; + import fr.xephi.authme.AuthMe; import fr.xephi.authme.command.CommandArgumentDescription; import fr.xephi.authme.command.CommandDescription; @@ -8,15 +17,6 @@ import fr.xephi.authme.command.CommandPermissions; import fr.xephi.authme.permission.PermissionNode; import fr.xephi.authme.util.CollectionUtils; import fr.xephi.authme.util.StringUtils; -import org.bukkit.ChatColor; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -import java.util.List; /** */ diff --git a/src/test/java/fr/xephi/authme/command/executable/changepassword/ChangePasswordCommandTest.java b/src/test/java/fr/xephi/authme/command/executable/changepassword/ChangePasswordCommandTest.java index 9092205a..5c9c295c 100644 --- a/src/test/java/fr/xephi/authme/command/executable/changepassword/ChangePasswordCommandTest.java +++ b/src/test/java/fr/xephi/authme/command/executable/changepassword/ChangePasswordCommandTest.java @@ -13,19 +13,16 @@ import org.bukkit.Server; import org.bukkit.command.BlockCommandSender; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import org.bukkit.scheduler.BukkitScheduler; import org.junit.Before; import org.junit.Test; import org.mockito.ArgumentCaptor; -import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import static java.util.Arrays.asList; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; -import static org.mockito.BDDMockito.given; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.*;