Skip to content

Commit 570a6e2

Browse files
RakambdaRakambda
committed
Use JSpecify
1 parent 2973c1c commit 570a6e2

285 files changed

Lines changed: 1332 additions & 1349 deletions

File tree

Some content is hidden

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

‎gradle/libs.versions.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jsonschema-generator-version = "4.38.0"
88
httpclient-version = "4.5.14"
99
lang3-version = "3.18.0"
1010
commons-text-version = "1.14.0"
11-
jetbrains-annotations-version = "26.0.2"
11+
jspecify-version = "1.0.0"
1212
websocket-version = "1.6.0"
1313
junitVersion = "5.13.4"
1414
assertj-core-version = "3.27.4"
@@ -57,7 +57,7 @@ jsonschema-module-jackson = { group = "com.github.victools", name = "jsonschema-
5757
httpclient = { group = "org.apache.httpcomponents", name = "httpclient", version.ref = "httpclient-version" }
5858
lang3 = { group = "org.apache.commons", name = "commons-lang3", version.ref = "lang3-version" }
5959
commonsText = { group = "org.apache.commons", name = "commons-text", version.ref = "commons-text-version" }
60-
jetbrainsAnnotations = { group = "org.jetbrains", name = "annotations", version.ref = "jetbrains-annotations-version" }
60+
jSpecify = { group = "org.jspecify", name = "jspecify", version.ref = "jspecify-version" }
6161
websocket = { group = "org.java-websocket", name = "Java-WebSocket", version.ref = "websocket-version" }
6262
kittehIrc = { group = "org.kitteh.irc", name = "client-lib", version.ref = "kitteh-irc-version" }
6363
hikaricp = { group = "com.zaxxer", name = "HikariCP", version.ref = "hikari-cp-version" }

‎miner/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ dependencies {
3333
implementation(libs.sqlite)
3434
implementation(libs.mysql)
3535
implementation(libs.bundles.flyway)
36+
implementation(libs.jSpecify)
3637

37-
compileOnly(libs.jetbrainsAnnotations)
3838
compileOnly(libs.lombok)
3939

4040
annotationProcessor(libs.lombok)

‎miner/src/main/java/fr/rakambda/channelpointsminer/miner/MinerApplication.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import kong.unirest.modules.jackson.JacksonObjectMapper;
1515
import lombok.SneakyThrows;
1616
import lombok.extern.log4j.Log4j2;
17-
import org.jetbrains.annotations.NotNull;
17+
import org.jspecify.annotations.NonNull;
1818
import picocli.CommandLine;
1919
import java.nio.file.Path;
2020
import java.nio.file.Paths;
@@ -52,8 +52,8 @@ public static void main(String[] args){
5252
}
5353
}
5454

55-
@NotNull
56-
private static CLIParameters parseCLIParameters(@NotNull String[] args){
55+
@NonNull
56+
private static CLIParameters parseCLIParameters(@NonNull String[] args){
5757
var parameters = new CLIParameters();
5858
var cli = new CommandLine(parameters);
5959
cli.registerConverter(Path.class, Paths::get);

‎miner/src/main/java/fr/rakambda/channelpointsminer/miner/api/chat/ITwitchChatClient.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
package fr.rakambda.channelpointsminer.miner.api.chat;
22

3-
import org.jetbrains.annotations.NotNull;
3+
import org.jspecify.annotations.NonNull;
44

55
public interface ITwitchChatClient extends AutoCloseable{
6-
void join(@NotNull String channel);
6+
void join(@NonNull String channel);
77

88
void joinPending();
99

10-
void leave(@NotNull String channel);
10+
void leave(@NonNull String channel);
1111

1212
void ping();
1313

1414
@Override
1515
void close();
1616

17-
void addChatMessageListener(@NotNull ITwitchChatMessageListener listener);
17+
void addChatMessageListener(@NonNull ITwitchChatMessageListener listener);
1818
}

‎miner/src/main/java/fr/rakambda/channelpointsminer/miner/api/chat/ITwitchChatMessageListener.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package fr.rakambda.channelpointsminer.miner.api.chat;
22

3-
import org.jetbrains.annotations.NotNull;
3+
import org.jspecify.annotations.NonNull;
44

55
public interface ITwitchChatMessageListener{
66

7-
void onChatMessage(@NotNull String streamer, @NotNull String actor, @NotNull String message);
7+
void onChatMessage(@NonNull String streamer, @NonNull String actor, @NonNull String message);
88

9-
void onChatMessage(@NotNull String streamer, @NotNull String actor, @NotNull String message, @NotNull String badges);
9+
void onChatMessage(@NonNull String streamer, @NonNull String actor, @NonNull String message, @NonNull String badges);
1010
}

‎miner/src/main/java/fr/rakambda/channelpointsminer/miner/api/chat/TwitchChatEventProducer.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@
44
import fr.rakambda.channelpointsminer.miner.event.manager.IEventManager;
55
import fr.rakambda.channelpointsminer.miner.factory.TimeFactory;
66
import lombok.RequiredArgsConstructor;
7-
import org.jetbrains.annotations.NotNull;
7+
import org.jspecify.annotations.NonNull;
88

99
@RequiredArgsConstructor
1010
public class TwitchChatEventProducer implements ITwitchChatMessageListener{
11-
@NotNull
11+
@NonNull
1212
private final IEventManager eventManager;
1313

1414
@Override
15-
public void onChatMessage(@NotNull String streamer, @NotNull String actor, @NotNull String message){
15+
public void onChatMessage(@NonNull String streamer, @NonNull String actor, @NonNull String message){
1616
onChatMessage(streamer, actor, message, "");
1717
}
1818

1919
@Override
20-
public void onChatMessage(@NotNull String streamer, @NotNull String actor, @NotNull String message, @NotNull String badges){
20+
public void onChatMessage(@NonNull String streamer, @NonNull String actor, @NonNull String message, @NonNull String badges){
2121
var event = new ChatMessageEvent(TimeFactory.now(), streamer, actor, message, badges);
2222
eventManager.onEvent(event);
2323
}

‎miner/src/main/java/fr/rakambda/channelpointsminer/miner/api/chat/irc/TwitchIrcChatClient.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import fr.rakambda.channelpointsminer.miner.api.passport.TwitchLogin;
66
import lombok.RequiredArgsConstructor;
77
import lombok.extern.log4j.Log4j2;
8-
import org.jetbrains.annotations.NotNull;
9-
import org.jetbrains.annotations.Nullable;
8+
import org.jspecify.annotations.NonNull;
9+
import org.jspecify.annotations.Nullable;
1010
import org.kitteh.irc.client.library.Client;
1111
import org.kitteh.irc.client.library.defaults.element.messagetag.DefaultMessageTagLabel;
1212
import java.util.Collection;
@@ -22,7 +22,7 @@ public class TwitchIrcChatClient implements ITwitchChatClient{
2222
private static final String TAGS_CAPABILITY = "twitch.tv/tags";
2323
private static final String EMOTE_SETS_TAG_NAME = "emote-sets";
2424

25-
@NotNull
25+
@NonNull
2626
private final TwitchLogin twitchLogin;
2727
private final boolean listenMessages;
2828
private final Collection<ITwitchChatMessageListener> chatMessageListeners = new LinkedList<>();
@@ -33,7 +33,7 @@ public class TwitchIrcChatClient implements ITwitchChatClient{
3333
private TwitchIrcMessageHandler ircMessageHandler;
3434

3535
@Override
36-
public void join(@NotNull String channel){
36+
public void join(@NonNull String channel){
3737
var client = getIrcClient();
3838
var ircChannelName = "#%s".formatted(channel.toLowerCase(Locale.ROOT));
3939
if(client.getChannel(ircChannelName).isPresent()){
@@ -50,13 +50,13 @@ public void joinPending(){
5050
}
5151

5252
@Override
53-
public void addChatMessageListener(@NotNull ITwitchChatMessageListener listener){
53+
public void addChatMessageListener(@NonNull ITwitchChatMessageListener listener){
5454
chatMessageListeners.add(listener);
5555
Optional.ofNullable(ircMessageHandler).ifPresent(i -> i.addListener(listener));
5656
}
5757

5858
@Override
59-
public void leave(@NotNull String channel){
59+
public void leave(@NonNull String channel){
6060
if(Objects.isNull(ircClient)){
6161
log.debug("Didn't leave irc channel #{} as no connection has been made", channel);
6262
return;
@@ -81,7 +81,7 @@ public void close(){
8181
Optional.ofNullable(ircClient).ifPresent(Client::shutdown);
8282
}
8383

84-
@NotNull
84+
@NonNull
8585
private synchronized Client getIrcClient(){
8686
if(Objects.isNull(ircClient)){
8787
log.info("Creating new Twitch IRC client");

‎miner/src/main/java/fr/rakambda/channelpointsminer/miner/api/chat/irc/TwitchIrcConnectionHandler.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import lombok.RequiredArgsConstructor;
55
import lombok.extern.log4j.Log4j2;
66
import net.engio.mbassy.listener.Handler;
7-
import org.jetbrains.annotations.NotNull;
7+
import org.jspecify.annotations.NonNull;
88
import org.kitteh.irc.client.library.event.channel.RequestedChannelJoinCompleteEvent;
99
import org.kitteh.irc.client.library.event.client.ClientNegotiationCompleteEvent;
1010
import org.kitteh.irc.client.library.event.connection.ClientConnectionClosedEvent;
@@ -13,7 +13,7 @@
1313
@Log4j2
1414
public class TwitchIrcConnectionHandler{
1515

16-
@NotNull
16+
@NonNull
1717
private final String accountName;
1818

1919
@Handler
@@ -37,7 +37,7 @@ public void onClientConnectionCLoseEvent(ClientConnectionClosedEvent event){
3737
}
3838

3939
@Handler
40-
public void onChannelJoinEvent(@NotNull RequestedChannelJoinCompleteEvent event){
40+
public void onChannelJoinEvent(@NonNull RequestedChannelJoinCompleteEvent event){
4141
try(var ignored = LogContext.with(accountName)){
4242
log.info("Joined IRC channel {}", event.getChannel().getName());
4343
}

‎miner/src/main/java/fr/rakambda/channelpointsminer/miner/api/chat/irc/TwitchIrcFactory.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import fr.rakambda.channelpointsminer.miner.api.passport.TwitchLogin;
44
import lombok.AccessLevel;
55
import lombok.NoArgsConstructor;
6-
import org.jetbrains.annotations.NotNull;
7-
import org.jetbrains.annotations.Nullable;
6+
import org.jspecify.annotations.NonNull;
7+
import org.jspecify.annotations.Nullable;
88
import org.kitteh.irc.client.library.Client;
99
import org.kitteh.irc.client.library.feature.twitch.TwitchSupport;
1010
import static org.kitteh.irc.client.library.Client.Builder.Server.SecurityType.SECURE;
@@ -13,13 +13,13 @@
1313
public class TwitchIrcFactory{
1414
private static final String TWITCH_IRC_HOST = "irc.chat.twitch.tv";
1515

16-
@NotNull
17-
public static Client createIrcClient(@NotNull TwitchLogin twitchLogin){
16+
@NonNull
17+
public static Client createIrcClient(@NonNull TwitchLogin twitchLogin){
1818
return createIrcClient(twitchLogin.getUsername(), "oauth:%s".formatted(twitchLogin.getAccessToken()));
1919
}
2020

21-
@NotNull
22-
private static Client createIrcClient(@NotNull String username, @Nullable String password){
21+
@NonNull
22+
private static Client createIrcClient(@NonNull String username, @Nullable String password){
2323
var client = Client.builder()
2424
.server()
2525
.host(TWITCH_IRC_HOST).port(443, SECURE)
@@ -30,13 +30,13 @@ private static Client createIrcClient(@NotNull String username, @Nullable String
3030
return client;
3131
}
3232

33-
@NotNull
34-
public static TwitchIrcConnectionHandler createIrcConnectionHandler(@NotNull String accountName){
33+
@NonNull
34+
public static TwitchIrcConnectionHandler createIrcConnectionHandler(@NonNull String accountName){
3535
return new TwitchIrcConnectionHandler(accountName);
3636
}
3737

38-
@NotNull
39-
public static TwitchIrcMessageHandler createIrcMessageHandler(@NotNull String accountName){
38+
@NonNull
39+
public static TwitchIrcMessageHandler createIrcMessageHandler(@NonNull String accountName){
4040
return new TwitchIrcMessageHandler(accountName);
4141
}
4242
}

‎miner/src/main/java/fr/rakambda/channelpointsminer/miner/api/chat/irc/TwitchIrcMessageHandler.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import lombok.RequiredArgsConstructor;
66
import lombok.extern.log4j.Log4j2;
77
import net.engio.mbassy.listener.Handler;
8-
import org.jetbrains.annotations.NotNull;
8+
import org.jspecify.annotations.NonNull;
99
import org.kitteh.irc.client.library.event.channel.ChannelMessageEvent;
1010
import java.util.Collection;
1111
import java.util.LinkedList;
@@ -14,14 +14,14 @@
1414
@Log4j2
1515
public class TwitchIrcMessageHandler{
1616

17-
@NotNull
17+
@NonNull
1818
private final String accountName;
1919

20-
@NotNull
20+
@NonNull
2121
private final Collection<ITwitchChatMessageListener> listeners = new LinkedList<>();
2222

2323
@Handler
24-
public void onMessageEvent(@NotNull ChannelMessageEvent event){
24+
public void onMessageEvent(@NonNull ChannelMessageEvent event){
2525
try(var ignored = LogContext.with(accountName)){
2626
log.trace("Received Irc Chat Message");
2727
var badges = event.getTag("badges");

0 commit comments

Comments
 (0)