From 72cbbd41481f8d82078772539d19ab42af31e1c7 Mon Sep 17 00:00:00 2001 From: Foulest <43710301+Foulest@users.noreply.github.com> Date: Fri, 31 Jan 2025 18:34:38 -0800 Subject: [PATCH] Improved null-safety --- src/main/java/net/foulest/repairkit/util/JunkFileUtil.java | 2 +- src/main/java/net/foulest/repairkit/util/WinGetUtil.java | 4 ++-- .../util/config/tasks/types/BloatwareTaskRunner.java | 2 +- .../util/config/tasks/types/CapabilitiesTaskRunner.java | 2 +- .../repairkit/util/config/tasks/types/FeaturesTaskRunner.java | 2 +- .../repairkit/util/config/tasks/types/RegistryTaskRunner.java | 2 +- .../repairkit/util/config/tasks/types/ServicesTaskRunner.java | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/net/foulest/repairkit/util/JunkFileUtil.java b/src/main/java/net/foulest/repairkit/util/JunkFileUtil.java index 08d3c06..c6c1978 100644 --- a/src/main/java/net/foulest/repairkit/util/JunkFileUtil.java +++ b/src/main/java/net/foulest/repairkit/util/JunkFileUtil.java @@ -123,7 +123,7 @@ public static void removeJunkFiles() { // Scans each drive for junk files. Iterable rootDirectories = FileSystems.getDefault().getRootDirectories(); - for (Path root : rootDirectories) { + for (@NotNull Path root : rootDirectories) { tasks.add(() -> pool.invoke(new DirectoryScanTask(root))); } diff --git a/src/main/java/net/foulest/repairkit/util/WinGetUtil.java b/src/main/java/net/foulest/repairkit/util/WinGetUtil.java index 5b37f3e..65b5bad 100644 --- a/src/main/java/net/foulest/repairkit/util/WinGetUtil.java +++ b/src/main/java/net/foulest/repairkit/util/WinGetUtil.java @@ -21,7 +21,7 @@ @SuppressWarnings("resource") public class WinGetUtil { - public static List excludedPrograms = new ArrayList<>(); + public static @NotNull List excludedPrograms = new ArrayList<>(); /** * Updates all outdated programs. @@ -140,7 +140,7 @@ private static void installDependencies() { DebugUtil.debug("Found " + programs.size() + " outdated programs."); DebugUtil.debug("Programs: " + programs); - StringBuilder builder = new StringBuilder(); + @NotNull StringBuilder builder = new StringBuilder(); builder.append("Make sure to close the following programs before proceeding:\n"); // Adds the programs to the builder. diff --git a/src/main/java/net/foulest/repairkit/util/config/tasks/types/BloatwareTaskRunner.java b/src/main/java/net/foulest/repairkit/util/config/tasks/types/BloatwareTaskRunner.java index 4d77f91..979fca2 100644 --- a/src/main/java/net/foulest/repairkit/util/config/tasks/types/BloatwareTaskRunner.java +++ b/src/main/java/net/foulest/repairkit/util/config/tasks/types/BloatwareTaskRunner.java @@ -37,7 +37,7 @@ public class BloatwareTaskRunner extends AbstractTaskRunner { * * @param config The JSON config instance */ - public BloatwareTaskRunner(Map> config) { + public BloatwareTaskRunner(@NotNull Map> config) { super(config); } diff --git a/src/main/java/net/foulest/repairkit/util/config/tasks/types/CapabilitiesTaskRunner.java b/src/main/java/net/foulest/repairkit/util/config/tasks/types/CapabilitiesTaskRunner.java index c46af30..efd4a30 100644 --- a/src/main/java/net/foulest/repairkit/util/config/tasks/types/CapabilitiesTaskRunner.java +++ b/src/main/java/net/foulest/repairkit/util/config/tasks/types/CapabilitiesTaskRunner.java @@ -38,7 +38,7 @@ public class CapabilitiesTaskRunner extends AbstractTaskRunner { * * @param config The JSON config instance */ - public CapabilitiesTaskRunner(Map> config) { + public CapabilitiesTaskRunner(@NotNull Map> config) { super(config); } diff --git a/src/main/java/net/foulest/repairkit/util/config/tasks/types/FeaturesTaskRunner.java b/src/main/java/net/foulest/repairkit/util/config/tasks/types/FeaturesTaskRunner.java index 55f11a3..66316c6 100644 --- a/src/main/java/net/foulest/repairkit/util/config/tasks/types/FeaturesTaskRunner.java +++ b/src/main/java/net/foulest/repairkit/util/config/tasks/types/FeaturesTaskRunner.java @@ -38,7 +38,7 @@ public class FeaturesTaskRunner extends AbstractTaskRunner { * * @param config The JSON config instance */ - public FeaturesTaskRunner(Map> config) { + public FeaturesTaskRunner(@NotNull Map> config) { super(config); } diff --git a/src/main/java/net/foulest/repairkit/util/config/tasks/types/RegistryTaskRunner.java b/src/main/java/net/foulest/repairkit/util/config/tasks/types/RegistryTaskRunner.java index a96e219..a46cc0c 100644 --- a/src/main/java/net/foulest/repairkit/util/config/tasks/types/RegistryTaskRunner.java +++ b/src/main/java/net/foulest/repairkit/util/config/tasks/types/RegistryTaskRunner.java @@ -39,7 +39,7 @@ public class RegistryTaskRunner extends AbstractTaskRunner { * * @param config The JSON config instance */ - public RegistryTaskRunner(Map> config) { + public RegistryTaskRunner(@NotNull Map> config) { super(config); } diff --git a/src/main/java/net/foulest/repairkit/util/config/tasks/types/ServicesTaskRunner.java b/src/main/java/net/foulest/repairkit/util/config/tasks/types/ServicesTaskRunner.java index a7ca1d1..9e9decd 100644 --- a/src/main/java/net/foulest/repairkit/util/config/tasks/types/ServicesTaskRunner.java +++ b/src/main/java/net/foulest/repairkit/util/config/tasks/types/ServicesTaskRunner.java @@ -38,7 +38,7 @@ public class ServicesTaskRunner extends AbstractTaskRunner { * * @param config The JSON config instance */ - public ServicesTaskRunner(Map> config) { + public ServicesTaskRunner(@NotNull Map> config) { super(config); }