Skip to content

Remove use of jspecify annotation in favour of jetbrains #3471

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
benwoo1110 merged 1 commit into from
May 8, 2026
+8 −9
Merged

Remove use of jspecify annotation in favour of jetbrains #3471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/main/java/org/mvplugins/multiverse/core/utils/CaseInsensitiveStringMap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -62,7 +62,7 @@ public T remove(Object key) {
}

@Override
public void putAll(@NonNull Map<? extends String, ? extends T> m) {
public void putAll(@NotNull Map<? extends String, ? extends T> m) {
m.forEach((key, value) -> map.put(normalizeKey(key), value));
}

Expand All @@ -72,17 +72,17 @@ public void clear() {
}

@Override
public @NonNull Set<String> keySet() {
public @NotNull Set<String> keySet() {
return map.keySet();
}

@Override
public @NonNull Collection<T> values() {
public @NotNull Collection<T> values() {
return map.values();
}

@Override
public @NonNull Set<Entry<String, T>> entrySet() {
public @NotNull Set<Entry<String, T>> entrySet() {
return map.entrySet();
}

Expand Down
5 changes: 2 additions & 3 deletions src/main/java/org/mvplugins/multiverse/core/utils/FileUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -224,7 +223,7 @@
}

@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 {

Check warning on line 226 in src/main/java/org/mvplugins/multiverse/core/utils/FileUtils.java

View workflow job for this annotation

GitHub Actions / checkstyle / checkstyle 

[checkstyle] reported by reviewdog 🐶
Line is longer than 120 characters (found 133).

Raw Output:
/github/workspace/src/main/java/org/mvplugins/multiverse/core/utils/FileUtils.java:226:0: warning: Line is longer than 120 characters (found 133). (com.puppycrawl.tools.checkstyle.checks.sizes.LineLengthCheck)
Path newDir = targetDir.resolve(sourceDir.relativize(dir));
if (!Files.isDirectory(newDir)) {
Files.createDirectory(newDir);
Expand All @@ -233,7 +232,7 @@
}

@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 {

Check warning on line 235 in src/main/java/org/mvplugins/multiverse/core/utils/FileUtils.java

View workflow job for this annotation

GitHub Actions / checkstyle / checkstyle 

[checkstyle] reported by reviewdog 🐶
Line is longer than 120 characters (found 126).

Raw Output:
/github/workspace/src/main/java/org/mvplugins/multiverse/core/utils/FileUtils.java:235:0: warning: Line is longer than 120 characters (found 126). (com.puppycrawl.tools.checkstyle.checks.sizes.LineLengthCheck)
// Pass files that are set to ignore
if (excludeFiles.contains(file)) {
Logging.finest("Ignoring file: " + file);
Expand Down
Loading