worldofcraft/LuckPerms-DBA
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move from findbugs jsr305 to checker-qual

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
sponge/src/main/java/me/lucko/luckperms/sponge/SpongeCommandExecutor.java
+8 -14
View File
@@ -30,6 +30,8 @@ import com.google.common.base.Splitter;
import me.lucko.luckperms.common.command.CommandManager;
import me.lucko.luckperms.common.sender.Sender;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable;
import org.spongepowered.api.command.CommandCallable;
import org.spongepowered.api.command.CommandResult;
import org.spongepowered.api.command.CommandSource;
@@ -43,9 +45,6 @@ import java.util.List;
import java.util.ListIterator;
import java.util.Optional;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
public class SpongeCommandExecutor extends CommandManager implements CommandCallable {
private static final Splitter TAB_COMPLETE_ARGUMENT_SPLITTER = Splitter.on(COMMAND_SEPARATOR_PATTERN);
private static final Splitter ARGUMENT_SPLITTER = Splitter.on(COMMAND_SEPARATOR_PATTERN).omitEmptyStrings();
@@ -57,9 +56,8 @@ public class SpongeCommandExecutor extends CommandManager implements CommandCall
this.plugin = plugin;
}
@Nonnull
@Override
public CommandResult process(@Nonnull CommandSource source, @Nonnull String s) {
public @NonNull CommandResult process(@NonNull CommandSource source, @NonNull String s) {
Sender lpSender = this.plugin.getSenderFactory().wrap(source);
List<String> arguments = processSelectors(source, CommandManager.stripQuotes(ARGUMENT_SPLITTER.splitToList(s)));
@@ -67,9 +65,8 @@ public class SpongeCommandExecutor extends CommandManager implements CommandCall
return CommandResult.success();
}
@Nonnull
@Override
public List<String> getSuggestions(@Nonnull CommandSource source, @Nonnull String s, @Nullable Location<World> location) {
public @NonNull List<String> getSuggestions(@NonNull CommandSource source, @NonNull String s, @Nullable Location<World> location) {
Sender lpSender = this.plugin.getSenderFactory().wrap(source);
List<String> arguments = processSelectors(source, CommandManager.stripQuotes(TAB_COMPLETE_ARGUMENT_SPLITTER.splitToList(s)));
@@ -77,25 +74,22 @@ public class SpongeCommandExecutor extends CommandManager implements CommandCall
}
@Override
public boolean testPermission(@Nonnull CommandSource source) {
public boolean testPermission(@NonNull CommandSource source) {
return true; // we run permission checks internally
}
@Nonnull
@Override
public Optional<Text> getShortDescription(@Nonnull CommandSource source) {
public @NonNull Optional<Text> getShortDescription(@NonNull CommandSource source) {
return Optional.of(Text.of("Manage permissions"));
}
@Nonnull
@Override
public Optional<Text> getHelp(@Nonnull CommandSource source) {
public @NonNull Optional<Text> getHelp(@NonNull CommandSource source) {
return Optional.of(Text.of("Run /luckperms to view usage."));
}
@Nonnull
@Override
public Text getUsage(@Nonnull CommandSource source) {
public @NonNull Text getUsage(@NonNull CommandSource source) {
return Text.of("/luckperms");
}
sponge/src/main/java/me/lucko/luckperms/sponge/commands/SpongeMainCommand.java
+3 -4
View File
@@ -46,6 +46,8 @@ import me.lucko.luckperms.sponge.service.model.LPSubject;
import me.lucko.luckperms.sponge.service.model.LPSubjectCollection;
import me.lucko.luckperms.sponge.service.model.LPSubjectData;
import org.checkerframework.checker.nullness.qual.NonNull;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -53,8 +55,6 @@ import java.util.Map;
import java.util.Optional;
import java.util.stream.Collectors;
import javax.annotation.Nonnull;
public class SpongeMainCommand extends Command<Void, LPSubjectData> {
private final LPSpongePlugin plugin;
@@ -227,9 +227,8 @@ public class SpongeMainCommand extends Command<Void, LPSubjectData> {
return this.subCommands.values().stream().flatMap(List::stream).collect(ImmutableCollectors.toList());
}
@Nonnull
@Override
public Optional<List<Command<LPSubjectData, ?>>> getChildren() {
public @NonNull Optional<List<Command<LPSubjectData, ?>>> getChildren() {
return Optional.of(getSubCommands());
}
}
sponge/src/main/java/me/lucko/luckperms/sponge/contexts/SpongeContextManager.java
+1 -1
View File
@@ -55,7 +55,7 @@ public class SpongeContextManager extends ContextManager<Subject> {
throw new NullPointerException("subject");
}
return subjectCaches.get(subject);
return this.subjectCaches.get(subject);
}
@Override
sponge/src/main/java/me/lucko/luckperms/sponge/contexts/SpongeProxiedContextCalculator.java
+2 -4
View File
@@ -29,14 +29,13 @@ import me.lucko.luckperms.api.context.MutableContextSet;
import me.lucko.luckperms.common.contexts.ProxiedContextCalculator;
import me.lucko.luckperms.sponge.service.context.DelegatingMutableContextSet;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.spongepowered.api.service.context.Context;
import org.spongepowered.api.service.context.ContextCalculator;
import org.spongepowered.api.service.permission.Subject;
import java.util.Set;
import javax.annotation.Nonnull;
public class SpongeProxiedContextCalculator implements ProxiedContextCalculator<Subject> {
private final ContextCalculator<Subject> delegate;
@@ -44,9 +43,8 @@ public class SpongeProxiedContextCalculator implements ProxiedContextCalculator<
this.delegate = delegate;
}
@Nonnull
@Override
public MutableContextSet giveApplicableContext(@Nonnull Subject subject, @Nonnull MutableContextSet accumulator) {
public @NonNull MutableContextSet giveApplicableContext(@NonNull Subject subject, @NonNull MutableContextSet accumulator) {
Set<Context> contexts = new DelegatingMutableContextSet(accumulator);
this.delegate.accumulateContexts(subject, contexts);
return accumulator;
sponge/src/main/java/me/lucko/luckperms/sponge/contexts/WorldCalculator.java
+2 -4
View File
@@ -31,12 +31,11 @@ import me.lucko.luckperms.api.context.MutableContextSet;
import me.lucko.luckperms.common.config.ConfigKeys;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.spongepowered.api.command.CommandSource;
import org.spongepowered.api.entity.living.player.Player;
import org.spongepowered.api.service.permission.Subject;
import javax.annotation.Nonnull;
public class WorldCalculator implements ContextCalculator<Subject> {
private final LuckPermsPlugin plugin;
@@ -44,9 +43,8 @@ public class WorldCalculator implements ContextCalculator<Subject> {
this.plugin = plugin;
}
@Nonnull
@Override
public MutableContextSet giveApplicableContext(@Nonnull Subject subject, @Nonnull MutableContextSet accumulator) {
public @NonNull MutableContextSet giveApplicableContext(@NonNull Subject subject, @NonNull MutableContextSet accumulator) {
CommandSource source = subject.getCommandSource().orElse(null);
if (source == null || !(source instanceof Player)) {
return accumulator;
sponge/src/main/java/me/lucko/luckperms/sponge/messaging/PluginMessageMessenger.java
+3 -4
View File
@@ -32,6 +32,7 @@ import me.lucko.luckperms.api.messenger.Messenger;
import me.lucko.luckperms.api.messenger.message.OutgoingMessage;
import me.lucko.luckperms.sponge.LPSpongePlugin;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.spongepowered.api.Platform;
import org.spongepowered.api.entity.living.player.Player;
import org.spongepowered.api.network.ChannelBinding;
@@ -42,8 +43,6 @@ import org.spongepowered.api.network.RemoteConnection;
import java.util.Collection;
import java.util.concurrent.TimeUnit;
import javax.annotation.Nonnull;
/**
* An implementation of {@link Messenger} using the plugin messaging channels.
*/
@@ -73,7 +72,7 @@ public class PluginMessageMessenger implements Messenger, RawDataListener {
}
@Override
public void sendOutgoingMessage(@Nonnull OutgoingMessage outgoingMessage) {
public void sendOutgoingMessage(@NonNull OutgoingMessage outgoingMessage) {
this.plugin.getBootstrap().getSpongeScheduler().createTaskBuilder().interval(10, TimeUnit.SECONDS).execute(task -> {
if (!this.plugin.getBootstrap().getGame().isServerAvailable()) {
return;
@@ -91,7 +90,7 @@ public class PluginMessageMessenger implements Messenger, RawDataListener {
}
@Override
public void handlePayload(@Nonnull ChannelBuf buf, @Nonnull RemoteConnection connection, @Nonnull Platform.Type type) {
public void handlePayload(@NonNull ChannelBuf buf, @NonNull RemoteConnection connection, Platform.@NonNull Type type) {
String msg = buf.readUTF();
this.consumer.consumeIncomingMessageAsString(msg);
}
sponge/src/main/java/me/lucko/luckperms/sponge/messaging/SpongeMessagingFactory.java
+3 -5
View File
@@ -33,7 +33,7 @@ import me.lucko.luckperms.common.messaging.LuckPermsMessagingService;
import me.lucko.luckperms.common.messaging.MessagingFactory;
import me.lucko.luckperms.sponge.LPSpongePlugin;
import javax.annotation.Nonnull;
import org.checkerframework.checker.nullness.qual.NonNull;
public class SpongeMessagingFactory extends MessagingFactory<LPSpongePlugin> {
public SpongeMessagingFactory(LPSpongePlugin plugin) {
@@ -55,15 +55,13 @@ public class SpongeMessagingFactory extends MessagingFactory<LPSpongePlugin> {
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;
sponge/src/main/java/me/lucko/luckperms/sponge/service/event/LPSubjectDataUpdateEvent.java
+2 -4
View File
@@ -28,6 +28,7 @@ package me.lucko.luckperms.sponge.service.event;
import me.lucko.luckperms.sponge.LPSpongePlugin;
import me.lucko.luckperms.sponge.service.model.LPSubjectData;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.spongepowered.api.event.cause.Cause;
import org.spongepowered.api.event.cause.EventContext;
import org.spongepowered.api.event.cause.EventContextKeys;
@@ -35,8 +36,6 @@ import org.spongepowered.api.event.impl.AbstractEvent;
import org.spongepowered.api.event.permission.SubjectDataUpdateEvent;
import org.spongepowered.api.service.permission.SubjectData;
import javax.annotation.Nonnull;
public class LPSubjectDataUpdateEvent extends AbstractEvent implements SubjectDataUpdateEvent {
private final LPSpongePlugin plugin;
private final LPSubjectData subjectData;
@@ -55,9 +54,8 @@ public class LPSubjectDataUpdateEvent extends AbstractEvent implements SubjectDa
return this.subjectData;
}
@Nonnull
@Override
public Cause getCause() {
public @NonNull Cause getCause() {
EventContext eventContext = EventContext.builder()
.add(EventContextKeys.PLUGIN, this.plugin.getBootstrap().getPluginContainer())
.build();
sponge/src/main/java/me/lucko/luckperms/sponge/service/misc/SimplePermissionDescription.java
+3 -4
View File
@@ -32,6 +32,7 @@ import me.lucko.luckperms.sponge.service.model.LPSubjectCollection;
import me.lucko.luckperms.sponge.service.model.LPSubjectReference;
import me.lucko.luckperms.sponge.service.proxy.ProxyFactory;
import org.checkerframework.checker.nullness.qual.Nullable;
import org.spongepowered.api.plugin.PluginContainer;
import org.spongepowered.api.service.permission.PermissionDescription;
import org.spongepowered.api.text.Text;
@@ -41,14 +42,12 @@ import java.util.Objects;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
import javax.annotation.Nullable;
public final class SimplePermissionDescription implements LPPermissionDescription {
private final LPPermissionService service;
private final String id;
@Nullable private final Text description;
@Nullable private final PluginContainer owner;
private final @Nullable Text description;
private final @Nullable PluginContainer owner;
private PermissionDescription spongeProxy = null;