From 7f2216da8a4b5d4bfe011ab09eaeda5b6a57036e Mon Sep 17 00:00:00 2001 From: tastybento Date: Sat, 12 Sep 2020 12:06:49 -0700 Subject: [PATCH] Code smell reduction (#100) --- .../java/world/bentobox/acidisland/AcidIsland.java | 2 +- .../java/world/bentobox/acidisland/world/AcidTask.java | 6 +++--- .../bentobox/acidisland/world/ChunkGeneratorWorld.java | 4 ++-- .../bentobox/acidisland/events/AcidEventTest.java | 5 ++--- .../bentobox/acidisland/events/AcidRainEventTest.java | 5 ++--- .../bentobox/acidisland/listeners/AcidEffectTest.java | 6 ++---- .../bentobox/acidisland/listeners/LavaCheckTest.java | 6 ++---- .../world/bentobox/acidisland/world/AcidTaskTest.java | 10 +++------- .../acidisland/world/ChunkGeneratorWorldTest.java | 6 ++---- 9 files changed, 19 insertions(+), 31 deletions(-) diff --git a/src/main/java/world/bentobox/acidisland/AcidIsland.java b/src/main/java/world/bentobox/acidisland/AcidIsland.java index 92e05d1..fa29337 100644 --- a/src/main/java/world/bentobox/acidisland/AcidIsland.java +++ b/src/main/java/world/bentobox/acidisland/AcidIsland.java @@ -30,7 +30,7 @@ public class AcidIsland extends GameModeAddon { private @Nullable AISettings settings; private @Nullable AcidTask acidTask; private @Nullable ChunkGenerator chunkGenerator; - private Config config = new Config<>(this, AISettings.class); + private final Config config = new Config<>(this, AISettings.class); private static final String NETHER = "_nether"; private static final String THE_END = "_the_end"; diff --git a/src/main/java/world/bentobox/acidisland/world/AcidTask.java b/src/main/java/world/bentobox/acidisland/world/AcidTask.java index 1407e39..baa9720 100644 --- a/src/main/java/world/bentobox/acidisland/world/AcidTask.java +++ b/src/main/java/world/bentobox/acidisland/world/AcidTask.java @@ -27,7 +27,7 @@ public class AcidTask { private final AcidIsland addon; private static final List IMMUNE = Arrays.asList(EntityType.TURTLE, EntityType.POLAR_BEAR, EntityType.DROWNED); private Map itemsInWater = new ConcurrentHashMap<>(); - private BukkitTask findMobsTask; + private final BukkitTask findMobsTask; /** * Runs repeating tasks to deliver acid damage to mobs, etc. @@ -35,7 +35,7 @@ public class AcidTask { */ public AcidTask(AcidIsland addon) { this.addon = addon; - findMobsTask = Bukkit.getScheduler().runTaskTimerAsynchronously(addon.getPlugin(), () -> findEntities(), 0L, 20L); + findMobsTask = Bukkit.getScheduler().runTaskTimerAsynchronously(addon.getPlugin(), this::findEntities, 0L, 20L); } void findEntities() { @@ -60,7 +60,7 @@ public class AcidTask { } } // Remove any entities not on the burn list - itemsInWater.keySet().removeIf(i -> !burnList.keySet().contains(i)); + itemsInWater.keySet().removeIf(i -> !burnList.containsKey(i)); if (!burnList.isEmpty()) { Bukkit.getScheduler().runTask(addon.getPlugin(), () -> diff --git a/src/main/java/world/bentobox/acidisland/world/ChunkGeneratorWorld.java b/src/main/java/world/bentobox/acidisland/world/ChunkGeneratorWorld.java index 6704ba0..69e094d 100644 --- a/src/main/java/world/bentobox/acidisland/world/ChunkGeneratorWorld.java +++ b/src/main/java/world/bentobox/acidisland/world/ChunkGeneratorWorld.java @@ -27,8 +27,8 @@ public class ChunkGeneratorWorld extends ChunkGenerator { private final AcidIsland addon; private final Random rand = new Random(); - private Map seaHeight = new EnumMap<>(Environment.class); - private Map roofChunk = new HashMap<>(); + private final Map seaHeight = new EnumMap<>(Environment.class); + private final Map roofChunk = new HashMap<>(); /** * @param addon - addon diff --git a/src/test/java/world/bentobox/acidisland/events/AcidEventTest.java b/src/test/java/world/bentobox/acidisland/events/AcidEventTest.java index cef6f3d..d049cfa 100644 --- a/src/test/java/world/bentobox/acidisland/events/AcidEventTest.java +++ b/src/test/java/world/bentobox/acidisland/events/AcidEventTest.java @@ -21,12 +21,11 @@ public class AcidEventTest { @Mock private Player player; - private List effects; private AcidEvent e; @Before - public void setUp() throws Exception { - effects = Arrays.asList(PotionEffectType.values()); + public void setUp() { + List effects = Arrays.asList(PotionEffectType.values()); e = new AcidEvent(player, 10, 5, effects); } diff --git a/src/test/java/world/bentobox/acidisland/events/AcidRainEventTest.java b/src/test/java/world/bentobox/acidisland/events/AcidRainEventTest.java index c8899a6..d4c28db 100644 --- a/src/test/java/world/bentobox/acidisland/events/AcidRainEventTest.java +++ b/src/test/java/world/bentobox/acidisland/events/AcidRainEventTest.java @@ -21,12 +21,11 @@ public class AcidRainEventTest { @Mock private Player player; - private List effects; private AcidRainEvent e; @Before - public void setUp() throws Exception { - effects = Arrays.asList(PotionEffectType.values()); + public void setUp() { + List effects = Arrays.asList(PotionEffectType.values()); e = new AcidRainEvent(player, 10, 5, effects); } diff --git a/src/test/java/world/bentobox/acidisland/listeners/AcidEffectTest.java b/src/test/java/world/bentobox/acidisland/listeners/AcidEffectTest.java index 5027fd5..99aab9d 100644 --- a/src/test/java/world/bentobox/acidisland/listeners/AcidEffectTest.java +++ b/src/test/java/world/bentobox/acidisland/listeners/AcidEffectTest.java @@ -115,10 +115,9 @@ public class AcidEffectTest { /** - * @throws java.lang.Exception */ @Before - public void setUp() throws Exception { + public void setUp() { PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); when(Bukkit.getScheduler()).thenReturn(scheduler); when(addon.getSettings()).thenReturn(settings); @@ -189,10 +188,9 @@ public class AcidEffectTest { } /** - * @throws java.lang.Exception */ @After - public void tearDown() throws Exception { + public void tearDown() { } /** diff --git a/src/test/java/world/bentobox/acidisland/listeners/LavaCheckTest.java b/src/test/java/world/bentobox/acidisland/listeners/LavaCheckTest.java index fbec17e..c23c29a 100644 --- a/src/test/java/world/bentobox/acidisland/listeners/LavaCheckTest.java +++ b/src/test/java/world/bentobox/acidisland/listeners/LavaCheckTest.java @@ -88,10 +88,9 @@ public class LavaCheckTest { private LavaCheck lc; /** - * @throws java.lang.Exception */ @Before - public void setUp() throws Exception { + public void setUp() { PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); when(Bukkit.getScheduler()).thenReturn(scheduler); settings = new AISettings(); @@ -107,10 +106,9 @@ public class LavaCheckTest { } /** - * @throws java.lang.Exception */ @After - public void tearDown() throws Exception { + public void tearDown() { } /** diff --git a/src/test/java/world/bentobox/acidisland/world/AcidTaskTest.java b/src/test/java/world/bentobox/acidisland/world/AcidTaskTest.java index 00a0a8d..057e381 100644 --- a/src/test/java/world/bentobox/acidisland/world/AcidTaskTest.java +++ b/src/test/java/world/bentobox/acidisland/world/AcidTaskTest.java @@ -64,8 +64,6 @@ public class AcidTaskTest { @Mock private World world; - private List mob; - @Mock private @Nullable World nether; @Mock @@ -81,10 +79,9 @@ public class AcidTaskTest { /** - * @throws java.lang.Exception */ @Before - public void setUp() throws Exception { + public void setUp() { PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS); when(Bukkit.getScheduler()).thenReturn(scheduler); when(scheduler.runTaskTimerAsynchronously(any(), any(Runnable.class), anyLong(), anyLong())).thenReturn(task); @@ -101,7 +98,7 @@ public class AcidTaskTest { // Default squid - mob = new ArrayList<>(); + List mob = new ArrayList<>(); Squid squid = mock(Squid.class); when(squid.getType()).thenReturn(EntityType.SQUID); when(squid.getLocation()).thenReturn(l); @@ -141,10 +138,9 @@ public class AcidTaskTest { } /** - * @throws java.lang.Exception */ @After - public void tearDown() throws Exception { + public void tearDown() { } /** diff --git a/src/test/java/world/bentobox/acidisland/world/ChunkGeneratorWorldTest.java b/src/test/java/world/bentobox/acidisland/world/ChunkGeneratorWorldTest.java index 2f02b53..9decf0e 100644 --- a/src/test/java/world/bentobox/acidisland/world/ChunkGeneratorWorldTest.java +++ b/src/test/java/world/bentobox/acidisland/world/ChunkGeneratorWorldTest.java @@ -54,10 +54,9 @@ public class ChunkGeneratorWorldTest { private ChunkData data; /** - * @throws java.lang.Exception */ @Before - public void setUp() throws Exception { + public void setUp() { // Bukkit PowerMockito.mockStatic(Bukkit.class); Server server = mock(Server.class); @@ -76,10 +75,9 @@ public class ChunkGeneratorWorldTest { } /** - * @throws java.lang.Exception */ @After - public void tearDown() throws Exception { + public void tearDown() { } /**