diff --git a/src/test/java/fr/xephi/authme/AntiBotTest.java b/src/test/java/fr/xephi/authme/AntiBotTest.java index 736e428c..2aee0c66 100644 --- a/src/test/java/fr/xephi/authme/AntiBotTest.java +++ b/src/test/java/fr/xephi/authme/AntiBotTest.java @@ -167,8 +167,7 @@ public class AntiBotTest { antiBot.handlePlayerJoin(player); // then - @SuppressWarnings("unchecked") - List playerList = (List) ReflectionTestUtils + List playerList = ReflectionTestUtils .getFieldValue(AntiBot.class, antiBot, "antibotPlayers"); assertThat(playerList, hasSize(1)); verify(bukkitService).scheduleSyncDelayedTask(any(Runnable.class), eq((long) 15 * TICKS_PER_SECOND)); @@ -197,8 +196,7 @@ public class AntiBotTest { antiBot.handlePlayerJoin(player); // then - @SuppressWarnings("rawtypes") - List playerList = (List) ReflectionTestUtils.getFieldValue(AntiBot.class, antiBot, "antibotPlayers"); + List playerList = ReflectionTestUtils.getFieldValue(AntiBot.class, antiBot, "antibotPlayers"); assertThat(playerList, empty()); verify(bukkitService, never()).scheduleSyncDelayedTask(any(Runnable.class), anyLong()); } diff --git a/src/test/java/fr/xephi/authme/ReflectionTestUtils.java b/src/test/java/fr/xephi/authme/ReflectionTestUtils.java index 887f443b..5724fb4e 100644 --- a/src/test/java/fr/xephi/authme/ReflectionTestUtils.java +++ b/src/test/java/fr/xephi/authme/ReflectionTestUtils.java @@ -64,11 +64,11 @@ public final class ReflectionTestUtils { } } - - public static Object getFieldValue(Class clazz, T instance, String fieldName) { + @SuppressWarnings("unchecked") + public static V getFieldValue(Class clazz, T instance, String fieldName) { Field field = getField(clazz, instance, fieldName); try { - return field.get(instance); + return (V) field.get(instance); } catch (IllegalAccessException e) { throw new UnsupportedOperationException("Could not get value of field '" + fieldName + "'", e); } diff --git a/src/test/java/fr/xephi/authme/cache/CaptchaManagerTest.java b/src/test/java/fr/xephi/authme/cache/CaptchaManagerTest.java index 0a9f3b39..e9d76cd9 100644 --- a/src/test/java/fr/xephi/authme/cache/CaptchaManagerTest.java +++ b/src/test/java/fr/xephi/authme/cache/CaptchaManagerTest.java @@ -154,7 +154,7 @@ public class CaptchaManagerTest { private static void assertHasCount(CaptchaManager manager, String player, Integer count) { @SuppressWarnings("unchecked") - Map playerCounts = (Map) ReflectionTestUtils + Map playerCounts = ReflectionTestUtils .getFieldValue(CaptchaManager.class, manager, "playerCounts"); assertThat(playerCounts.get(player.toLowerCase()), equalTo(count)); } diff --git a/src/test/java/fr/xephi/authme/cache/SessionManagerTest.java b/src/test/java/fr/xephi/authme/cache/SessionManagerTest.java index cfe8b2e8..80f9a409 100644 --- a/src/test/java/fr/xephi/authme/cache/SessionManagerTest.java +++ b/src/test/java/fr/xephi/authme/cache/SessionManagerTest.java @@ -161,10 +161,8 @@ public class SessionManagerTest { assertThat(sessions, aMapWithSize(4)); // map not changed -> no cleanup performed } - @SuppressWarnings("unchecked") private static Map getSessionsMap(SessionManager manager) { - return (Map) ReflectionTestUtils - .getFieldValue(SessionManager.class, manager, "sessions"); + return ReflectionTestUtils.getFieldValue(SessionManager.class, manager, "sessions"); } diff --git a/src/test/java/fr/xephi/authme/cache/TempbanManagerTest.java b/src/test/java/fr/xephi/authme/cache/TempbanManagerTest.java index 44eb4b0c..8e2091bf 100644 --- a/src/test/java/fr/xephi/authme/cache/TempbanManagerTest.java +++ b/src/test/java/fr/xephi/authme/cache/TempbanManagerTest.java @@ -196,18 +196,16 @@ public class TempbanManagerTest { return settings; } - @SuppressWarnings("unchecked") private static void assertHasNoEntries(TempbanManager manager, String address) { - Map> playerCounts = (Map>) ReflectionTestUtils + Map> playerCounts = ReflectionTestUtils .getFieldValue(TempbanManager.class, manager, "ipLoginFailureCounts"); Map map = playerCounts.get(address); assertThat(map == null || map.isEmpty(), equalTo(true)); } - @SuppressWarnings("unchecked") private static void assertHasCount(TempbanManager manager, String address, String name, int count) { - Map> playerCounts = (Map>) - ReflectionTestUtils.getFieldValue(TempbanManager.class, manager, "ipLoginFailureCounts"); + Map> playerCounts = ReflectionTestUtils + .getFieldValue(TempbanManager.class, manager, "ipLoginFailureCounts"); assertThat(playerCounts.get(address).get(name).getCount(10000L), equalTo(count)); } } diff --git a/src/test/java/fr/xephi/authme/cache/limbo/LimboCacheTest.java b/src/test/java/fr/xephi/authme/cache/limbo/LimboCacheTest.java index 26da8f7d..60059630 100644 --- a/src/test/java/fr/xephi/authme/cache/limbo/LimboCacheTest.java +++ b/src/test/java/fr/xephi/authme/cache/limbo/LimboCacheTest.java @@ -224,8 +224,7 @@ public class LimboCacheTest { assertThat(limboCache.hasPlayerData("someone_else"), equalTo(false)); } - @SuppressWarnings("unchecked") private Map getCache() { - return (Map) ReflectionTestUtils.getFieldValue(LimboCache.class, limboCache, "cache"); + return ReflectionTestUtils.getFieldValue(LimboCache.class, limboCache, "cache"); } } diff --git a/src/test/java/fr/xephi/authme/settings/properties/SettingsClassConsistencyTest.java b/src/test/java/fr/xephi/authme/settings/properties/SettingsClassConsistencyTest.java index 9e075200..2be46b72 100644 --- a/src/test/java/fr/xephi/authme/settings/properties/SettingsClassConsistencyTest.java +++ b/src/test/java/fr/xephi/authme/settings/properties/SettingsClassConsistencyTest.java @@ -73,7 +73,7 @@ public class SettingsClassConsistencyTest { for (Field field : fields) { if (Property.class.isAssignableFrom(field.getType())) { Property property = - (Property) ReflectionTestUtils.getFieldValue(clazz, null, field.getName()); + ReflectionTestUtils.getFieldValue(clazz, null, field.getName()); if (!paths.add(property.getPath())) { fail("Path '" + property.getPath() + "' should be used by only one constant"); } diff --git a/src/test/java/fr/xephi/authme/task/purge/PurgeServiceTest.java b/src/test/java/fr/xephi/authme/task/purge/PurgeServiceTest.java index 82da5f6e..842861d1 100644 --- a/src/test/java/fr/xephi/authme/task/purge/PurgeServiceTest.java +++ b/src/test/java/fr/xephi/authme/task/purge/PurgeServiceTest.java @@ -34,8 +34,8 @@ import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.not; import static org.junit.Assert.assertThat; import static org.mockito.BDDMockito.given; +import static org.mockito.Matchers.anyCollectionOf; import static org.mockito.Matchers.anyLong; -import static org.mockito.Matchers.anySet; import static org.mockito.Matchers.argThat; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; @@ -116,7 +116,6 @@ public class PurgeServiceTest { } @Test - @SuppressWarnings("unchecked") public void shouldRecognizeNoPlayersToPurge() { // given long delay = 123012301L; @@ -128,7 +127,7 @@ public class PurgeServiceTest { // then verify(dataSource).getRecordsToPurge(delay); - verify(dataSource, never()).purgeRecords(anySet()); + verify(dataSource, never()).purgeRecords(anyCollectionOf(String.class)); verify(sender).sendMessage("No players to purge"); verifyZeroInteractions(bukkitService, permissionsManager); } @@ -208,14 +207,13 @@ public class PurgeServiceTest { Math.abs(timestamp - expectedTimestamp), not(greaterThan(toleranceMillis))); } - @SuppressWarnings("unchecked") private void verifyScheduledPurgeTask(UUID senderUuid, Set names) { ArgumentCaptor captor = ArgumentCaptor.forClass(PurgeTask.class); verify(bukkitService).runTaskTimer(captor.capture(), eq(0L), eq(1L)); PurgeTask task = captor.getValue(); Object senderInTask = ReflectionTestUtils.getFieldValue(PurgeTask.class, task, "sender"); - Set namesInTask = (Set) ReflectionTestUtils.getFieldValue(PurgeTask.class, task, "toPurge"); + Set namesInTask = ReflectionTestUtils.getFieldValue(PurgeTask.class, task, "toPurge"); assertThat(senderInTask, Matchers.equalTo(senderUuid)); assertThat(namesInTask, containsInAnyOrder(names.toArray())); } diff --git a/src/test/java/fr/xephi/authme/util/BukkitServiceTest.java b/src/test/java/fr/xephi/authme/util/BukkitServiceTest.java index 7c848504..07b94243 100644 --- a/src/test/java/fr/xephi/authme/util/BukkitServiceTest.java +++ b/src/test/java/fr/xephi/authme/util/BukkitServiceTest.java @@ -34,7 +34,7 @@ public class BukkitServiceTest { BukkitService bukkitService = new BukkitService(authMe); // when - boolean doesMethodReturnCollection = (Boolean) ReflectionTestUtils + boolean doesMethodReturnCollection = ReflectionTestUtils .getFieldValue(BukkitService.class, bukkitService, "getOnlinePlayersIsCollection"); // then