Skip to content

Commit f39059c

Browse files
committed
chore: migrate to JSpecify
1 parent f0735a5 commit f39059c

File tree

318 files changed

+3114
-2826
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

318 files changed

+3114
-2826
lines changed

api/build.gradle.kts

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ dependencies {
1414
api(libs.examination.api)
1515
api(libs.examination.string)
1616
compileOnlyApi(libs.jetbrainsAnnotations)
17+
compileOnlyApi(libs.jspecify)
1718
testImplementation(libs.guava)
1819
annotationProcessor(projects.adventureAnnotationProcessors)
1920
}

api/src/main/java/net/kyori/adventure/audience/Audience.java

+44-43
Large diffs are not rendered by default.

api/src/main/java/net/kyori/adventure/audience/Audiences.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,14 @@
2929
import java.util.stream.Collector;
3030
import java.util.stream.Collectors;
3131
import net.kyori.adventure.text.ComponentLike;
32-
import org.jetbrains.annotations.NotNull;
32+
import org.jspecify.annotations.NullMarked;
3333

3434
/**
3535
* {@link Audience}-related utilities.
3636
*
3737
* @since 4.13.0
3838
*/
39+
@NullMarked
3940
public final class Audiences {
4041
static final Collector<? super Audience, ?, ForwardingAudience> COLLECTOR = Collectors.collectingAndThen(
4142
Collectors.toCollection(ArrayList::new),
@@ -52,7 +53,7 @@ private Audiences() {
5253
* @return an action to send a message
5354
* @since 4.13.0
5455
*/
55-
public static @NotNull Consumer<? super Audience> sendingMessage(final @NotNull ComponentLike message) {
56+
public static Consumer<? super Audience> sendingMessage(final ComponentLike message) {
5657
return audience -> audience.sendMessage(message);
5758
}
5859
}

api/src/main/java/net/kyori/adventure/audience/EmptyAudience.java

+20-20
Original file line numberDiff line numberDiff line change
@@ -36,86 +36,86 @@
3636
import net.kyori.adventure.text.Component;
3737
import net.kyori.adventure.text.ComponentLike;
3838
import org.jetbrains.annotations.Contract;
39-
import org.jetbrains.annotations.NotNull;
40-
import org.jetbrains.annotations.Nullable;
41-
import org.jetbrains.annotations.UnknownNullability;
39+
import org.jspecify.annotations.NullMarked;
40+
import org.jspecify.annotations.Nullable;
4241

42+
@NullMarked
4343
final class EmptyAudience implements Audience {
4444
static final EmptyAudience INSTANCE = new EmptyAudience();
4545

4646
@Override
47-
public @NotNull <T> Optional<T> get(final @NotNull Pointer<T> pointer) {
47+
public <T> Optional<T> get(final Pointer<T> pointer) {
4848
return Optional.empty();
4949
}
5050

5151
@Contract("_, null -> null; _, !null -> !null")
5252
@Override
53-
public <T> @Nullable T getOrDefault(final @NotNull Pointer<T> pointer, final @Nullable T defaultValue) {
53+
public <T> @Nullable T getOrDefault(final Pointer<T> pointer, final @Nullable T defaultValue) {
5454
return defaultValue;
5555
}
5656

5757
@Override
58-
public <T> @UnknownNullability T getOrDefaultFrom(final @NotNull Pointer<T> pointer, final @NotNull Supplier<? extends T> defaultValue) {
58+
public <T> @Nullable T getOrDefaultFrom(final Pointer<T> pointer, final Supplier<? extends T> defaultValue) {
5959
return defaultValue.get();
6060
}
6161

6262
@Override
63-
public @NotNull Audience filterAudience(final @NotNull Predicate<? super Audience> filter) {
63+
public Audience filterAudience(final Predicate<? super Audience> filter) {
6464
return this;
6565
}
6666

6767
@Override
68-
public void forEachAudience(final @NotNull Consumer<? super Audience> action) {
68+
public void forEachAudience(final Consumer<? super Audience> action) {
6969
}
7070

7171
@Override
72-
public void sendMessage(final @NotNull ComponentLike message) {
72+
public void sendMessage(final ComponentLike message) {
7373
}
7474

7575
@Override
76-
public void sendMessage(final @NotNull Component message) {
76+
public void sendMessage(final Component message) {
7777
}
7878

7979
@Override
8080
@Deprecated
81-
public void sendMessage(final @NotNull Identified source, final @NotNull Component message, final @NotNull MessageType type) {
81+
public void sendMessage(final Identified source, final Component message, final MessageType type) {
8282
}
8383

8484
@Override
8585
@Deprecated
86-
public void sendMessage(final @NotNull Identity source, final @NotNull Component message, final @NotNull MessageType type) {
86+
public void sendMessage(final Identity source, final Component message, final MessageType type) {
8787
}
8888

8989
@Override
90-
public void sendMessage(final @NotNull Component message, final ChatType.@NotNull Bound boundChatType) {
90+
public void sendMessage(final Component message, final ChatType.Bound boundChatType) {
9191
}
9292

9393
@Override
94-
public void sendMessage(final @NotNull SignedMessage signedMessage, final ChatType.@NotNull Bound boundChatType) {
94+
public void sendMessage(final SignedMessage signedMessage, final ChatType.Bound boundChatType) {
9595
}
9696

9797
@Override
98-
public void deleteMessage(final SignedMessage.@NotNull Signature signature) {
98+
public void deleteMessage(final SignedMessage.Signature signature) {
9999
}
100100

101101
@Override
102-
public void sendActionBar(final @NotNull ComponentLike message) {
102+
public void sendActionBar(final ComponentLike message) {
103103
}
104104

105105
@Override
106-
public void sendPlayerListHeader(final @NotNull ComponentLike header) {
106+
public void sendPlayerListHeader(final ComponentLike header) {
107107
}
108108

109109
@Override
110-
public void sendPlayerListFooter(final @NotNull ComponentLike footer) {
110+
public void sendPlayerListFooter(final ComponentLike footer) {
111111
}
112112

113113
@Override
114-
public void sendPlayerListHeaderAndFooter(final @NotNull ComponentLike header, final @NotNull ComponentLike footer) {
114+
public void sendPlayerListHeaderAndFooter(final ComponentLike header, final ComponentLike footer) {
115115
}
116116

117117
@Override
118-
public void openBook(final Book.@NotNull Builder book) {
118+
public void openBook(final Book.Builder book) {
119119
}
120120

121121
@Override

0 commit comments

Comments
 (0)