Move from findbugs jsr305 to checker-qual
This commit is contained in:
+2
-3
@@ -33,7 +33,7 @@ import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
|
||||
|
||||
import net.md_5.bungee.api.connection.ProxiedPlayer;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
public class BackendServerCalculator implements ContextCalculator<ProxiedPlayer> {
|
||||
|
||||
@@ -47,9 +47,8 @@ public class BackendServerCalculator implements ContextCalculator<ProxiedPlayer>
|
||||
this.plugin = plugin;
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public MutableContextSet giveApplicableContext(@Nonnull ProxiedPlayer subject, @Nonnull MutableContextSet accumulator) {
|
||||
public @NonNull MutableContextSet giveApplicableContext(@NonNull ProxiedPlayer subject, @NonNull MutableContextSet accumulator) {
|
||||
String server = getServer(subject);
|
||||
while (server != null && !accumulator.has(Contexts.WORLD_KEY, server)) {
|
||||
accumulator.add(Contexts.WORLD_KEY, server);
|
||||
|
||||
@@ -31,14 +31,13 @@ import com.imaginarycode.minecraft.redisbungee.RedisBungeeAPI;
|
||||
import me.lucko.luckperms.api.context.MutableContextSet;
|
||||
import me.lucko.luckperms.api.context.StaticContextCalculator;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
public class RedisBungeeCalculator implements StaticContextCalculator {
|
||||
private static final String PROXY_KEY = "proxy";
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public MutableContextSet giveApplicableContext(@Nonnull MutableContextSet accumulator) {
|
||||
public @NonNull MutableContextSet giveApplicableContext(@NonNull MutableContextSet accumulator) {
|
||||
RedisBungeeAPI redisBungee = RedisBungee.getApi();
|
||||
if (redisBungee != null) {
|
||||
accumulator.add(PROXY_KEY, redisBungee.getServerId());
|
||||
|
||||
+5
-9
@@ -33,7 +33,7 @@ import me.lucko.luckperms.common.messaging.InternalMessagingService;
|
||||
import me.lucko.luckperms.common.messaging.LuckPermsMessagingService;
|
||||
import me.lucko.luckperms.common.messaging.MessagingFactory;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
public class BungeeMessagingFactory extends MessagingFactory<LPBungeePlugin> {
|
||||
public BungeeMessagingFactory(LPBungeePlugin plugin) {
|
||||
@@ -65,15 +65,13 @@ public class BungeeMessagingFactory extends MessagingFactory<LPBungeePlugin> {
|
||||
|
||||
private class PluginMessageMessengerProvider implements MessengerProvider {
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public String getName() {
|
||||
public @NonNull String getName() {
|
||||
return "PluginMessage";
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public Messenger obtain(@Nonnull IncomingMessageConsumer incomingMessageConsumer) {
|
||||
public @NonNull Messenger obtain(@NonNull IncomingMessageConsumer incomingMessageConsumer) {
|
||||
PluginMessageMessenger messenger = new PluginMessageMessenger(getPlugin(), incomingMessageConsumer);
|
||||
messenger.init();
|
||||
return messenger;
|
||||
@@ -82,15 +80,13 @@ public class BungeeMessagingFactory extends MessagingFactory<LPBungeePlugin> {
|
||||
|
||||
private class RedisBungeeMessengerProvider implements MessengerProvider {
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public String getName() {
|
||||
public @NonNull String getName() {
|
||||
return "RedisBungee";
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public Messenger obtain(@Nonnull IncomingMessageConsumer incomingMessageConsumer) {
|
||||
public @NonNull Messenger obtain(@NonNull IncomingMessageConsumer incomingMessageConsumer) {
|
||||
RedisBungeeMessenger messenger = new RedisBungeeMessenger(getPlugin(), incomingMessageConsumer);
|
||||
messenger.init();
|
||||
return messenger;
|
||||
|
||||
+2
-2
@@ -40,7 +40,7 @@ import net.md_5.bungee.api.event.PluginMessageEvent;
|
||||
import net.md_5.bungee.api.plugin.Listener;
|
||||
import net.md_5.bungee.event.EventHandler;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
/**
|
||||
* An implementation of {@link Messenger} using the plugin messaging channels.
|
||||
@@ -67,7 +67,7 @@ public class PluginMessageMessenger implements Messenger, Listener {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void sendOutgoingMessage(@Nonnull OutgoingMessage outgoingMessage) {
|
||||
public void sendOutgoingMessage(@NonNull OutgoingMessage outgoingMessage) {
|
||||
ByteArrayDataOutput out = ByteStreams.newDataOutput();
|
||||
out.writeUTF(outgoingMessage.asEncodedString());
|
||||
|
||||
|
||||
@@ -37,7 +37,7 @@ import me.lucko.luckperms.bungee.LPBungeePlugin;
|
||||
import net.md_5.bungee.api.plugin.Listener;
|
||||
import net.md_5.bungee.event.EventHandler;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
/**
|
||||
* An implementation of {@link Messenger} using Redis, via RedisBungee's API.
|
||||
@@ -70,7 +70,7 @@ public class RedisBungeeMessenger implements Messenger, Listener {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void sendOutgoingMessage(@Nonnull OutgoingMessage outgoingMessage) {
|
||||
public void sendOutgoingMessage(@NonNull OutgoingMessage outgoingMessage) {
|
||||
this.redisBungee.sendChannelMessage(CHANNEL, outgoingMessage.asEncodedString());
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user