Remove exceptions from method signatures when not thrown

AuroraLS3 · AuroraLS3 · commit ebdbd9833b18 · 2026-02-20T18:44:48.000+02:00
diff --git a/Plan/bukkit/src/test/java/com/djrapitops/plan/BukkitSystemTest.java b/Plan/bukkit/src/test/java/com/djrapitops/plan/BukkitSystemTest.java
@@ -37,11 +37,11 @@
  */
 class BukkitSystemTest {
 
-    private final int TEST_PORT_NUMBER = RandomData.randomInt(9005, 9500);
+    private static final int TEST_PORT_NUMBER = RandomData.randomInt(9005, 9500);
     private PlanSystem system;
 
     @BeforeEach
-    void prepareSystem(@TempDir Path temp) throws Exception {
+    void prepareSystem(@TempDir Path temp) {
         system = new BukkitMockComponent(temp).getPlanSystem();
         system.getConfigSystem().getConfig()
                 .set(WebserverSettings.PORT, TEST_PORT_NUMBER);
diff --git a/Plan/bukkit/src/test/java/utilities/mocks/BukkitMockComponent.java b/Plan/bukkit/src/test/java/utilities/mocks/BukkitMockComponent.java
@@ -48,7 +48,7 @@ public BukkitMockComponent(Path tempDir) {
         SQLDB.setDownloadDriver(false);
     }
 
-    public PlanPlugin getPlanMock() throws Exception {
+    public PlanPlugin getPlanMock() {
         if (planMock == null) {
             planMock = PlanPluginMocker.setUp()
                     .withDataFolder(tempDir.resolve("data").toFile())
@@ -57,7 +57,7 @@ public PlanPlugin getPlanMock() throws Exception {
         return planMock;
     }
 
-    public PlanSystem getPlanSystem() throws Exception {
+    public PlanSystem getPlanSystem() {
         if (component == null) {
             PlanPlugin planMock = getPlanMock();
             component = DaggerPlanBukkitComponent.builder()
diff --git a/Plan/bungeecord/src/test/java/com/djrapitops/plan/BungeeSystemTest.java b/Plan/bungeecord/src/test/java/com/djrapitops/plan/BungeeSystemTest.java
@@ -43,7 +43,7 @@
  */
 class BungeeSystemTest {
 
-    private final int TEST_PORT_NUMBER = RandomData.randomInt(9005, 9500);
+    private static final int TEST_PORT_NUMBER = RandomData.randomInt(9005, 9500);
 
     private BungeeMockComponent component;
     private DBPreparer dbPreparer;
diff --git a/Plan/common/src/test/java/com/djrapitops/plan/commands/PlanCommandTest.java b/Plan/common/src/test/java/com/djrapitops/plan/commands/PlanCommandTest.java
@@ -46,7 +46,6 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
-import java.util.concurrent.ExecutionException;
 import java.util.stream.Stream;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -156,7 +155,7 @@ void serverCommandSendsLink() {
     }
 
     @Test
-    void networkCommandSendsLink(Database database) throws ExecutionException, InterruptedException {
+    void networkCommandSendsLink(Database database) {
         try {
             Server server = new Server(ServerUUID.randomUUID(), "Serve", "", "");
             server.setProxy(true);
diff --git a/Plan/common/src/test/java/com/djrapitops/plan/gathering/ShutdownDataPreservationTest.java b/Plan/common/src/test/java/com/djrapitops/plan/gathering/ShutdownDataPreservationTest.java
@@ -40,7 +40,7 @@ class ShutdownDataPreservationTest {
     private ShutdownDataPreservation underTest;
 
     @BeforeEach
-    void setupPreservation(@TempDir Path temporaryFolder) throws Exception {
+    void setupPreservation(@TempDir Path temporaryFolder) {
         PluginMockComponent pluginMockComponent = new PluginMockComponent(temporaryFolder);
         PlanSystem system = pluginMockComponent.getPlanSystem();
         PlatformAbstractionLayer abstractionLayer = pluginMockComponent.getAbstractionLayer();
diff --git a/Plan/common/src/test/java/com/djrapitops/plan/placeholder/PlanPlaceholdersTest.java b/Plan/common/src/test/java/com/djrapitops/plan/placeholder/PlanPlaceholdersTest.java
@@ -53,7 +53,7 @@ class PlanPlaceholdersTest {
     private static UUID playerUUID;
 
     @BeforeAll
-    static void prepareSystem(@TempDir Path tempDir) throws Exception {
+    static void prepareSystem(@TempDir Path tempDir) {
         PluginMockComponent mockComponent = new PluginMockComponent(tempDir);
         component = mockComponent.getComponent();
         mockComponent.getPlanSystem().enable();
diff --git a/Plan/common/src/test/java/com/djrapitops/plan/utilities/PassEncryptTest.java b/Plan/common/src/test/java/com/djrapitops/plan/utilities/PassEncryptTest.java
@@ -34,15 +34,15 @@ class PassEncryptTest {
     private static final Map<String, String> PASSWORD_MAP = new HashMap<>();
 
     @BeforeAll
-    static void setUpPasswords() throws Exception {
+    static void setUpPasswords() {
         for (int i = 0; i < RandomData.randomInt(1, 10); i++) {
             String password = RandomData.randomString(RandomData.randomInt(5, 16));
             PASSWORD_MAP.put(password, PassEncryptUtil.createHash(password));
         }
     }
 
     @Test
-    void testVerification() throws Exception {
+    void testVerification() {
         for (Map.Entry<String, String> entry : PASSWORD_MAP.entrySet()) {
             String password = entry.getKey();
             String hash = entry.getValue();
diff --git a/Plan/common/src/test/java/com/djrapitops/plan/utilities/logging/ErrorLoggerTest.java b/Plan/common/src/test/java/com/djrapitops/plan/utilities/logging/ErrorLoggerTest.java
@@ -45,7 +45,7 @@ class ErrorLoggerTest {
     private static PlanSystem SYSTEM;
 
     @BeforeAll
-    static void preparePlugin(@TempDir Path dir) throws Exception {
+    static void preparePlugin(@TempDir Path dir) {
         PluginMockComponent component = new PluginMockComponent(dir);
         SYSTEM = component.getPlanSystem();
         SYSTEM.enable();
diff --git a/Plan/common/src/test/java/extension/FullSystemExtension.java b/Plan/common/src/test/java/extension/FullSystemExtension.java
@@ -36,7 +36,6 @@
 import com.djrapitops.plan.storage.file.PlanFiles;
 import com.djrapitops.plan.storage.file.PublicHtmlFiles;
 import com.djrapitops.plan.utilities.java.Maps;
-import com.djrapitops.plan.utilities.java.ThrowingSupplier;
 import net.playeranalytics.plugin.server.PluginLogger;
 import org.junit.jupiter.api.extension.*;
 import utilities.RandomData;
@@ -58,12 +57,11 @@
 public class FullSystemExtension implements ParameterResolver, BeforeAllCallback, AfterAllCallback {
 
     private static final int TEST_PORT_NUMBER = RandomData.randomInt(9005, 9500);
+    private final Map<Class, Supplier> parameterResolvers;
     public PluginMockComponent component;
     private Path tempDir;
     private PlanSystem planSystem;
 
-    private final Map<Class, Supplier> parameterResolvers;
-
     public FullSystemExtension() {
         // You can't use method references here because planSystem is null when this method is initialized.
 
@@ -74,9 +72,9 @@ public FullSystemExtension() {
                 .put(Theme.class, () -> planSystem.getConfigSystem().getTheme())
                 .put(ConfigSystem.class, () -> planSystem.getConfigSystem())
                 .put(ServerUUID.class, () -> planSystem.getServerInfo().getServerUUID())
-                .put(PlanPluginComponent.class, catching(PlanPluginComponent.class, () -> component.getComponent()))
-                .put(PluginLogger.class, catching(PluginLogger.class, () -> component.getAbstractionLayer().getPluginLogger()))
-                .put(PlanCommand.class, catching(PlanCommand.class, () -> component.getComponent().planCommand()))
+                .put(PlanPluginComponent.class, () -> component.getComponent())
+                .put(PluginLogger.class, () -> component.getAbstractionLayer().getPluginLogger())
+                .put(PlanCommand.class, () -> component.getComponent().planCommand())
                 .put(Database.class, () -> planSystem.getDatabaseSystem().getDatabase())
                 .put(DeliveryUtilities.class, () -> planSystem.getDeliveryUtilities())
                 .put(Formatters.class, () -> planSystem.getDeliveryUtilities().getFormatters())
@@ -91,18 +89,8 @@ public FullSystemExtension() {
                 .build();
     }
 
-    private <T, E extends Exception> Supplier<T> catching(Class<T> type, ThrowingSupplier<T, E> throwingSupplier) {
-        return () -> {
-            try {
-                return throwingSupplier.get();
-            } catch (Exception e) {
-                throw new ParameterResolutionException("Error getting " + type, e);
-            }
-        };
-    }
-
     @Override
-    public void beforeAll(ExtensionContext context) throws Exception {
+    public void beforeAll(ExtensionContext context) throws IOException {
         tempDir = Files.createTempDirectory("plan-fullsystem-test");
         component = new PluginMockComponent(tempDir);
         planSystem = component.getPlanSystem();
@@ -111,7 +99,7 @@ public void beforeAll(ExtensionContext context) throws Exception {
     }
 
     @Override
-    public void afterAll(ExtensionContext context) throws Exception {
+    public void afterAll(ExtensionContext context) throws IOException {
         if (tempDir != null) deleteDirectory(tempDir);
     }
 
diff --git a/Plan/common/src/test/java/utilities/LocaleResourceUpdateUtility.java b/Plan/common/src/test/java/utilities/LocaleResourceUpdateUtility.java
@@ -23,6 +23,7 @@
 import utilities.mocks.PluginMockComponent;
 
 import java.io.File;
+import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
@@ -35,7 +36,7 @@
  */
 public class LocaleResourceUpdateUtility {
 
-    public static void main(String[] args) throws Exception {
+    public static void main(String[] args) throws IOException {
         PluginMockComponent mockComponent = new PluginMockComponent(Files.createTempDirectory("temp-plan-"));
         PlanPluginComponent component = mockComponent.getComponent();
 
diff --git a/Plan/common/src/test/java/utilities/mocks/PluginMockComponent.java b/Plan/common/src/test/java/utilities/mocks/PluginMockComponent.java
@@ -46,7 +46,7 @@ public PluginMockComponent(Path tempDir) {
         SQLDB.setDownloadDriver(false);
     }
 
-    public PlanPlugin getPlanMock() throws Exception {
+    public PlanPlugin getPlanMock() {
         if (planMock == null) {
             planMock = PlanPluginMocker.setUp()
                     .withDataFolder(tempDir.toFile())
@@ -55,15 +55,15 @@ public PlanPlugin getPlanMock() throws Exception {
         return planMock;
     }
 
-    public PlanSystem getPlanSystem() throws Exception {
+    public PlanSystem getPlanSystem() {
         initComponent();
         PlanSystem system = component.system();
         system.getConfigSystem().getConfig().set(WebserverSettings.PORT, ThreadLocalRandom.current()
                 .nextInt(10240) + 10240); // Random non-privileged port
         return system;
     }
 
-    private void initComponent() throws Exception {
+    private void initComponent() {
         if (component == null) {
             PlanPlugin planMock = getPlanMock();
             abstractionLayer = new TestPlatformAbstractionLayer(planMock);
@@ -75,17 +75,17 @@ private void initComponent() throws Exception {
         }
     }
 
-    public PluginErrorLogger getPluginErrorLogger() throws Exception {
+    public PluginErrorLogger getPluginErrorLogger() {
         initComponent();
         return component.pluginErrorLogger();
     }
 
-    public PlanPluginComponent getComponent() throws Exception {
+    public PlanPluginComponent getComponent() {
         initComponent();
         return component;
     }
 
-    public PlatformAbstractionLayer getAbstractionLayer() throws Exception {
+    public PlatformAbstractionLayer getAbstractionLayer() {
         initComponent();
         return abstractionLayer;
     }
diff --git a/Plan/fabric/src/test/java/net/playeranalytics/plan/FabricSystemTest.java b/Plan/fabric/src/test/java/net/playeranalytics/plan/FabricSystemTest.java
@@ -39,11 +39,11 @@
  */
 class FabricSystemTest {
 
-    private final int TEST_PORT_NUMBER = RandomData.randomInt(9005, 9500);
+    private static final int TEST_PORT_NUMBER = RandomData.randomInt(9005, 9500);
     private PlanSystem system;
 
     @BeforeEach
-    void prepareSystem(@TempDir Path temp) throws Exception {
+    void prepareSystem(@TempDir Path temp) {
         system = new FabricMockComponent(temp).getPlanSystem();
         system.getConfigSystem().getConfig()
                 .set(WebserverSettings.PORT, TEST_PORT_NUMBER);
diff --git a/Plan/nukkit/src/test/java/com/djrapitops/plan/NukkitSystemTest.java b/Plan/nukkit/src/test/java/com/djrapitops/plan/NukkitSystemTest.java
@@ -16,7 +16,6 @@
  */
 package com.djrapitops.plan;
 
-import com.djrapitops.plan.exceptions.EnableException;
 import com.djrapitops.plan.settings.config.PlanConfig;
 import com.djrapitops.plan.settings.config.paths.WebserverSettings;
 import com.djrapitops.plan.settings.config.paths.key.Setting;
@@ -39,18 +38,18 @@
  */
 class NukkitSystemTest {
 
-    private final int TEST_PORT_NUMBER = RandomData.randomInt(9005, 9500);
+    private static final int TEST_PORT_NUMBER = RandomData.randomInt(9005, 9500);
     private PlanSystem system;
 
     @BeforeEach
-    void prepareSystem(@TempDir Path temp) throws Exception {
+    void prepareSystem(@TempDir Path temp) {
         system = new NukkitMockComponent(temp).getPlanSystem();
         system.getConfigSystem().getConfig()
                 .set(WebserverSettings.PORT, TEST_PORT_NUMBER);
     }
 
     @Test
-    void nukkitSystemEnables() throws EnableException {
+    void nukkitSystemEnables() {
         try {
             system.enable();
             assertTrue(system.isEnabled());
@@ -60,7 +59,7 @@ void nukkitSystemEnables() throws EnableException {
     }
 
     @Test
-    void nukkitSystemHasDefaultConfigValuesAfterEnable() throws EnableException, IllegalAccessException {
+    void nukkitSystemHasDefaultConfigValuesAfterEnable() throws IllegalAccessException {
         try {
             system.enable();
             PlanConfig config = system.getConfigSystem().getConfig();
diff --git a/Plan/nukkit/src/test/java/utilities/mocks/NukkitMockComponent.java b/Plan/nukkit/src/test/java/utilities/mocks/NukkitMockComponent.java
@@ -41,7 +41,7 @@ public NukkitMockComponent(Path tempDir) {
         SQLDB.setDownloadDriver(false);
     }
 
-    public PlanNukkit getPlanMock() throws Exception {
+    public PlanNukkit getPlanMock() {
         if (planMock == null) {
             planMock = PlanNukkitMocker.setUp()
                     .withDataFolder(tempDir.toFile())
@@ -52,7 +52,7 @@ public PlanNukkit getPlanMock() throws Exception {
         return planMock;
     }
 
-    public PlanSystem getPlanSystem() throws Exception {
+    public PlanSystem getPlanSystem() {
         if (component == null) {
             PlanNukkit planMock = getPlanMock();
             component = DaggerPlanNukkitComponent.builder()
diff --git a/Plan/sponge/src/test/java/com/djrapitops/plan/SpongeSystemTest.java b/Plan/sponge/src/test/java/com/djrapitops/plan/SpongeSystemTest.java
@@ -40,19 +40,19 @@
  */
 class SpongeSystemTest {
 
-    private final int TEST_PORT_NUMBER = RandomData.randomInt(9005, 9500);
+    private static final int TEST_PORT_NUMBER = RandomData.randomInt(9005, 9500);
 
     private PlanSystem system;
 
     @BeforeEach
-    void prepareSpongeSystem(@TempDir Path temp) throws Exception {
+    void prepareSpongeSystem(@TempDir Path temp) {
         system = new SpongeMockComponent(temp).getPlanSystem();
         system.getConfigSystem().getConfig()
                 .set(WebserverSettings.PORT, TEST_PORT_NUMBER);
     }
 
     @Test
-    void spongeSystemEnables() throws EnableException {
+    void spongeSystemEnables() {
         try {
             system.enable();
             assertTrue(system.isEnabled());
diff --git a/Plan/sponge/src/test/java/utilities/mocks/SpongeMockComponent.java b/Plan/sponge/src/test/java/utilities/mocks/SpongeMockComponent.java
@@ -16,12 +16,12 @@
  */
 package utilities.mocks;
 
+import com.djrapitops.plan.DaggerPlanSpongeComponent;
 import com.djrapitops.plan.PlanPlugin;
 import com.djrapitops.plan.PlanSpongeComponent;
 import com.djrapitops.plan.PlanSystem;
-import com.djrapitops.plan.DaggerPlanSpongeComponent;
-import net.kyori.adventure.text.TextComponent;
 import com.djrapitops.plan.storage.database.SQLDB;
+import net.kyori.adventure.text.TextComponent;
 import org.mockito.Mockito;
 import org.spongepowered.api.Game;
 import org.spongepowered.api.MinecraftVersion;
@@ -54,7 +54,7 @@ public SpongeMockComponent(Path tempDir) {
         SQLDB.setDownloadDriver(false);
     }
 
-    public PlanPlugin getPlanMock() throws Exception {
+    public PlanPlugin getPlanMock() {
         if (planMock == null) {
             planMock = PlanPluginMocker.setUp()
                     .withLogging()
@@ -64,7 +64,7 @@ public PlanPlugin getPlanMock() throws Exception {
         return planMock;
     }
 
-    public PlanSystem getPlanSystem() throws Exception {
+    public PlanSystem getPlanSystem() {
         if (component == null) {
             PlanPlugin planMock = getPlanMock();
             component = DaggerPlanSpongeComponent.builder()
diff --git a/Plan/velocity/src/test/java/com/djrapitops/plan/VelocitySystemTest.java b/Plan/velocity/src/test/java/com/djrapitops/plan/VelocitySystemTest.java
@@ -39,10 +39,10 @@
  */
 class VelocitySystemTest {
 
-    private final int TEST_PORT_NUMBER = RandomData.randomInt(9005, 9500);
+    private static final int TEST_PORT_NUMBER = RandomData.randomInt(9005, 9500);
 
     @Test
-    void velocityEnables(@TempDir Path temp) throws Exception {
+    void velocityEnables(@TempDir Path temp) {
         PlanSystem velocitySystem = new VelocityMockComponent(temp).getPlanSystem();
         try {
             PlanConfig config = velocitySystem.getConfigSystem().getConfig();
diff --git a/Plan/velocity/src/test/java/utilities/mocks/VelocityMockComponent.java b/Plan/velocity/src/test/java/utilities/mocks/VelocityMockComponent.java
@@ -41,7 +41,7 @@ public VelocityMockComponent(Path tempDir) {
         SQLDB.setDownloadDriver(false);
     }
 
-    public PlanVelocity getPlanMock() throws Exception {
+    public PlanVelocity getPlanMock() {
         if (planMock == null) {
             planMock = PlanVelocityMocker.setUp()
                     .withDataFolder(tempDir.toFile())
@@ -51,7 +51,7 @@ public PlanVelocity getPlanMock() throws Exception {
         return planMock;
     }
 
-    public PlanSystem getPlanSystem() throws Exception {
+    public PlanSystem getPlanSystem() {
         if (component == null) {
             PlanVelocity planMock = getPlanMock();
             component = DaggerPlanVelocityComponent.builder()
