From 50efb7e26271bbe2bed709cf79dbb9e2706593bc Mon Sep 17 00:00:00 2001 From: Ben Woo <30431861+benwoo1110@users.noreply.github.com> Date: Fri, 8 May 2026 20:39:05 +0800 Subject: [PATCH] Remove use of jspecify annotation in favour of jetbrains --- .../core/utils/CaseInsensitiveStringMap.java | 12 ++++++------ .../mvplugins/multiverse/core/utils/FileUtils.java | 5 ++--- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/mvplugins/multiverse/core/utils/CaseInsensitiveStringMap.java b/src/main/java/org/mvplugins/multiverse/core/utils/CaseInsensitiveStringMap.java index 5b8c05646..1e1d51fd7 100644 --- a/src/main/java/org/mvplugins/multiverse/core/utils/CaseInsensitiveStringMap.java +++ b/src/main/java/org/mvplugins/multiverse/core/utils/CaseInsensitiveStringMap.java @@ -1,8 +1,8 @@ package org.mvplugins.multiverse.core.utils; import org.jetbrains.annotations.ApiStatus; -import org.jspecify.annotations.NonNull; -import org.jspecify.annotations.Nullable; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import java.util.Collection; import java.util.HashMap; @@ -62,7 +62,7 @@ public T remove(Object key) { } @Override - public void putAll(@NonNull Map m) { + public void putAll(@NotNull Map m) { m.forEach((key, value) -> map.put(normalizeKey(key), value)); } @@ -72,17 +72,17 @@ public void clear() { } @Override - public @NonNull Set keySet() { + public @NotNull Set keySet() { return map.keySet(); } @Override - public @NonNull Collection values() { + public @NotNull Collection values() { return map.values(); } @Override - public @NonNull Set> entrySet() { + public @NotNull Set> entrySet() { return map.entrySet(); } diff --git a/src/main/java/org/mvplugins/multiverse/core/utils/FileUtils.java b/src/main/java/org/mvplugins/multiverse/core/utils/FileUtils.java index d07aa7c69..6614c477e 100644 --- a/src/main/java/org/mvplugins/multiverse/core/utils/FileUtils.java +++ b/src/main/java/org/mvplugins/multiverse/core/utils/FileUtils.java @@ -26,7 +26,6 @@ import jakarta.inject.Inject; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jspecify.annotations.NonNull; import org.jvnet.hk2.annotations.Service; import org.mvplugins.multiverse.core.config.CoreConfig; @@ -224,7 +223,7 @@ private CopyDirFileVisitor(@NotNull Path sourceDir, @NotNull Path targetDir, @No } @Override - public @NotNull FileVisitResult preVisitDirectory(@NonNull Path dir, @NotNull BasicFileAttributes attrs) throws IOException { + public @NotNull FileVisitResult preVisitDirectory(@NotNull Path dir, @NotNull BasicFileAttributes attrs) throws IOException { Path newDir = targetDir.resolve(sourceDir.relativize(dir)); if (!Files.isDirectory(newDir)) { Files.createDirectory(newDir); @@ -233,7 +232,7 @@ private CopyDirFileVisitor(@NotNull Path sourceDir, @NotNull Path targetDir, @No } @Override - public @NotNull FileVisitResult visitFile(@NonNull Path file, @NotNull BasicFileAttributes attrs) throws IOException { + public @NotNull FileVisitResult visitFile(@NotNull Path file, @NotNull BasicFileAttributes attrs) throws IOException { // Pass files that are set to ignore if (excludeFiles.contains(file)) { Logging.finest("Ignoring file: " + file);