Move from findbugs jsr305 to checker-qual

This commit is contained in:
Luck
2018-09-19 20:40:18 +01:00
Unverified
parent 4987ca3ba2
commit 3941c77826
236 changed files with 1625 additions and 2231 deletions
@@ -38,6 +38,6 @@ public class VelocityClassLoader implements PluginClassLoader {
@Override
public void loadJar(Path file) {
this.bootstrap.getProxy().getPluginManager().addToClasspath(bootstrap, file);
this.bootstrap.getProxy().getPluginManager().addToClasspath(this.bootstrap, file);
}
}
@@ -33,7 +33,7 @@ import me.lucko.luckperms.api.context.MutableContextSet;
import me.lucko.luckperms.common.config.ConfigKeys;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import javax.annotation.Nonnull;
import org.checkerframework.checker.nullness.qual.NonNull;
public class BackendServerCalculator implements ContextCalculator<Player> {
@@ -47,9 +47,8 @@ public class BackendServerCalculator implements ContextCalculator<Player> {
this.plugin = plugin;
}
@Nonnull
@Override
public MutableContextSet giveApplicableContext(@Nonnull Player subject, @Nonnull MutableContextSet accumulator) {
public @NonNull MutableContextSet giveApplicableContext(@NonNull Player subject, @NonNull MutableContextSet accumulator) {
String server = getServer(subject);
while (server != null && !accumulator.has(Contexts.WORLD_KEY, server)) {
accumulator.add(Contexts.WORLD_KEY, server);
@@ -54,7 +54,7 @@ public class VelocityContextManager extends ContextManager<Player> {
throw new NullPointerException("subject");
}
return subjectCaches.get(subject);
return this.subjectCaches.get(subject);
}
@Override
@@ -41,9 +41,9 @@ import me.lucko.luckperms.api.messenger.Messenger;
import me.lucko.luckperms.api.messenger.message.OutgoingMessage;
import me.lucko.luckperms.velocity.LPVelocityPlugin;
import java.util.Optional;
import org.checkerframework.checker.nullness.qual.NonNull;
import javax.annotation.Nonnull;
import java.util.Optional;
/**
* An implementation of {@link Messenger} using the plugin messaging channels.
@@ -81,7 +81,7 @@ public class PluginMessageMessenger implements Messenger, MessageHandler {
}
@Override
public void sendOutgoingMessage(@Nonnull OutgoingMessage outgoingMessage) {
public void sendOutgoingMessage(@NonNull OutgoingMessage outgoingMessage) {
ByteArrayDataOutput out = ByteStreams.newDataOutput();
out.writeUTF(outgoingMessage.asEncodedString());
@@ -33,7 +33,7 @@ import me.lucko.luckperms.common.messaging.LuckPermsMessagingService;
import me.lucko.luckperms.common.messaging.MessagingFactory;
import me.lucko.luckperms.velocity.LPVelocityPlugin;
import javax.annotation.Nonnull;
import org.checkerframework.checker.nullness.qual.NonNull;
public class VelocityMessagingFactory extends MessagingFactory<LPVelocityPlugin> {
public VelocityMessagingFactory(LPVelocityPlugin plugin) {
@@ -55,15 +55,13 @@ public class VelocityMessagingFactory extends MessagingFactory<LPVelocityPlugin>
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;