Updated log4j and Checker Framework

Updating Checker Framework flagged numerous warnings, which have been
corrected. These probably involve type declarations lacking a nullness
annotation that appeared elsewhere.

api/src/main/java/com/velocitypowered/api/event/query/ProxyQueryEvent.java

@@ -3,7 +3,6 @@ package com.velocitypowered.api.event.query;
 import com.google.common.base.Preconditions;
 import com.velocitypowered.api.proxy.server.QueryResponse;
 import java.net.InetAddress;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * This event is fired if proxy is getting queried over GS4 Query protocol.
@@ -32,7 +31,6 @@ public final class ProxyQueryEvent {
    *
    * @return query type
    */
-  @NonNull
   public QueryType getQueryType() {
     return queryType;
   }
@@ -42,7 +40,6 @@ public final class ProxyQueryEvent {
    *
    * @return querier address
    */
-  @NonNull
   public InetAddress getQuerierAddress() {
     return querierAddress;
   }
@@ -52,7 +49,6 @@ public final class ProxyQueryEvent {
    *
    * @return the current query response
    */
-  @NonNull
   public QueryResponse getResponse() {
     return response;
   }
@@ -62,7 +58,7 @@ public final class ProxyQueryEvent {
    *
    * @param response the new non-null query response
    */
-  public void setResponse(@NonNull QueryResponse response) {
+  public void setResponse(QueryResponse response) {
     this.response = Preconditions.checkNotNull(response, "response");
   }
 

api/src/main/java/com/velocitypowered/api/plugin/meta/PluginDependency.java

@@ -14,8 +14,7 @@ import org.checkerframework.checker.nullness.qual.Nullable;
 public final class PluginDependency {
 
   private final String id;
-  @Nullable
+  private final @Nullable String version;
-  private final String version;
 
   private final boolean optional;
 

api/src/main/java/com/velocitypowered/api/proxy/server/QueryResponse.java

@@ -219,21 +219,11 @@ public final class QueryResponse {
    * A builder for {@link QueryResponse} objects.
    */
   public static final class Builder {
-
+    private @MonotonicNonNull String hostname;
-    @MonotonicNonNull
+    private @MonotonicNonNull String gameVersion;
-    private String hostname;
+    private @MonotonicNonNull String map;
-
+    private @MonotonicNonNull String proxyHost;
-    @MonotonicNonNull
+    private @MonotonicNonNull String proxyVersion;
-    private String gameVersion;
-
-    @MonotonicNonNull
-    private String map;
-
-    @MonotonicNonNull
-    private String proxyHost;
-
-    @MonotonicNonNull
-    private String proxyVersion;
 
     private int currentPlayers;
     private int maxPlayers;

build.gradle

@@ -22,10 +22,10 @@ allprojects {
         // dependency versions
         junitVersion = '5.3.0-M1'
         slf4jVersion = '1.7.25'
-        log4jVersion = '2.11.1'
+        log4jVersion = '2.11.2'
         nettyVersion = '4.1.34.Final'
         guavaVersion = '25.1-jre'
-        checkerFrameworkVersion = '2.5.6'
+        checkerFrameworkVersion = '2.7.0'
 
         getCurrentShortRevision = {
             new ByteArrayOutputStream().withStream { os ->

proxy/build.gradle

@@ -52,7 +52,7 @@ dependencies {
     runtime 'net.java.dev.jna:jna:4.5.2' // Needed for JLine
     runtime 'com.lmax:disruptor:3.4.2' // Async loggers
 
-    compile 'it.unimi.dsi:fastutil:8.2.1'
+    compile 'it.unimi.dsi:fastutil:8.2.2'
     compile 'net.kyori:event-method-asm:3.0.0'
 
     compile 'com.mojang:brigadier:1.0.15'

proxy/src/main/java/com/velocitypowered/proxy/command/VelocityCommandManager.java

@@ -20,7 +20,7 @@ public class VelocityCommandManager implements CommandManager {
   private final Map<String, Command> commands = new HashMap<>();
 
   @Override
-  public void register(@NonNull final Command command, final String... aliases) {
+  public void register(final Command command, final String... aliases) {
     Preconditions.checkNotNull(aliases, "aliases");
     Preconditions.checkNotNull(command, "executor");
     for (int i = 0, length = aliases.length; i < length; i++) {
@@ -31,13 +31,13 @@ public class VelocityCommandManager implements CommandManager {
   }
 
   @Override
-  public void unregister(@NonNull final String alias) {
+  public void unregister(final String alias) {
     Preconditions.checkNotNull(alias, "name");
     this.commands.remove(alias.toLowerCase(Locale.ENGLISH));
   }
 
   @Override
-  public boolean execute(@NonNull CommandSource source, @NonNull String cmdLine) {
+  public boolean execute(CommandSource source, String cmdLine) {
     Preconditions.checkNotNull(source, "invoker");
     Preconditions.checkNotNull(cmdLine, "cmdLine");
 

proxy/src/main/java/com/velocitypowered/proxy/connection/MinecraftConnection.java

@@ -255,8 +255,7 @@ public class MinecraftConnection extends ChannelInboundHandlerAdapter {
     }
   }
 
-  @Nullable
+  public @Nullable MinecraftSessionHandler getSessionHandler() {
-  public MinecraftSessionHandler getSessionHandler() {
     return sessionHandler;
   }
 
@@ -318,8 +317,7 @@ public class MinecraftConnection extends ChannelInboundHandlerAdapter {
         .addBefore(FRAME_ENCODER, CIPHER_ENCODER, new MinecraftCipherEncoder(encryptionCipher));
   }
 
-  @Nullable
+  public @Nullable MinecraftConnectionAssociation getAssociation() {
-  public MinecraftConnectionAssociation getAssociation() {
     return association;
   }
 

proxy/src/main/java/com/velocitypowered/proxy/connection/backend/VelocityServerConnection.java

@@ -160,8 +160,7 @@ public class VelocityServerConnection implements MinecraftConnectionAssociation,
     mc.write(new ServerLogin(proxyPlayer.getUsername()));
   }
 
-  @Nullable
+  public @Nullable MinecraftConnection getConnection() {
-  public MinecraftConnection getConnection() {
     return connection;
   }
 

proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java

@@ -86,8 +86,7 @@ public class ConnectedPlayer implements MinecraftConnectionAssociation, Player {
   private final VelocityServer server;
   private ClientConnectionPhase connectionPhase;
 
-  @MonotonicNonNull
+  private @MonotonicNonNull List<String> serversToTry = null;
-  private List<String> serversToTry = null;
 
   ConnectedPlayer(VelocityServer server, GameProfile profile,
       MinecraftConnection minecraftConnection, @Nullable InetSocketAddress virtualHost) {
@@ -289,8 +288,7 @@ public class ConnectedPlayer implements MinecraftConnectionAssociation, Player {
 
   }
 
-  @Nullable
+  public @Nullable VelocityServerConnection getConnectedServer() {
-  public VelocityServerConnection getConnectedServer() {
     return connectedServer;
   }
 

proxy/src/main/java/com/velocitypowered/proxy/protocol/netty/GS4QueryHandler.java

@@ -60,8 +60,8 @@ public class GS4QueryHandler extends SimpleChannelInboundHandler<DatagramPacket>
       .expireAfterWrite(30, TimeUnit.SECONDS)
       .build();
 
-  @MonotonicNonNull
+  private volatile @MonotonicNonNull List<QueryResponse.PluginInformation> pluginInformationList
-  private volatile List<QueryResponse.PluginInformation> pluginInformationList = null;
+      = null;
 
   private final VelocityServer server;
 

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/AvailableCommands.java

@@ -45,8 +45,7 @@ public class AvailableCommands implements MinecraftPacket {
   private static final byte FLAG_HAS_SUGGESTIONS = 0x10;
 
   // Note: Velocity doesn't use Brigadier for command handling. This may change in Velocity 2.0.0.
-  @MonotonicNonNull
+  private @MonotonicNonNull RootCommandNode<Object> rootNode;
-  private RootCommandNode<Object> rootNode;
 
   /**
    * Returns the root node.
@@ -206,10 +205,8 @@ public class AvailableCommands implements MinecraftPacket {
     private final byte flags;
     private final int[] children;
     private final int redirectTo;
-    @Nullable
+    private final @Nullable ArgumentBuilder<Object, ?> args;
-    private final ArgumentBuilder<Object, ?> args;
+    private @MonotonicNonNull CommandNode<Object> built;
-    @MonotonicNonNull
-    private CommandNode<Object> built;
 
     private WireNode(int idx, byte flags, int[] children, int redirectTo,
         @Nullable ArgumentBuilder<Object, ?> args) {

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/LegacyPing.java

@@ -12,8 +12,7 @@ import org.checkerframework.checker.nullness.qual.Nullable;
 public class LegacyPing implements MinecraftPacket {
 
   private final LegacyMinecraftPingVersion version;
-  @Nullable
+  private final @Nullable InetSocketAddress vhost;
-  private final InetSocketAddress vhost;
 
   public LegacyPing(LegacyMinecraftPingVersion version) {
     this.version = version;
@@ -29,8 +28,7 @@ public class LegacyPing implements MinecraftPacket {
     return version;
   }
 
-  @Nullable
+  public @Nullable InetSocketAddress getVhost() {
-  public InetSocketAddress getVhost() {
     return vhost;
   }
 

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/PlayerListItem.java

@@ -75,8 +75,7 @@ public class PlayerListItem implements MinecraftPacket {
     }
   }
 
-  @Nullable
+  private static @Nullable Component readOptionalComponent(ByteBuf buf) {
-  private static Component readOptionalComponent(ByteBuf buf) {
     if (buf.readBoolean()) {
       return ComponentSerializers.JSON.deserialize(ProtocolUtils.readString(buf));
     }

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/ResourcePackRequest.java

@@ -11,13 +11,10 @@ import org.checkerframework.checker.nullness.qual.Nullable;
 
 public class ResourcePackRequest implements MinecraftPacket {
 
-  @MonotonicNonNull
+  private @MonotonicNonNull String url;
-  private String url;
+  private @MonotonicNonNull String hash;
-  @MonotonicNonNull
-  private String hash;
 
-  @Nullable
+  public @Nullable String getUrl() {
-  public String getUrl() {
     return url;
   }
 
@@ -25,8 +22,7 @@ public class ResourcePackRequest implements MinecraftPacket {
     this.url = url;
   }
 
-  @Nullable
+  public @Nullable String getHash() {
-  public String getHash() {
     return hash;
   }
 

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/ResourcePackResponse.java

@@ -12,8 +12,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 public class ResourcePackResponse implements MinecraftPacket {
 
   private String hash = "";
-  @MonotonicNonNull
+  private @MonotonicNonNull Status status;
-  private Status status;
 
   public Status getStatus() {
     if (status == null) {

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/TabCompleteResponse.java

@@ -109,8 +109,7 @@ public class TabCompleteResponse implements MinecraftPacket {
 
   public static class Offer implements Comparable<Offer> {
     private final String text;
-    @Nullable
+    private final @Nullable Component tooltip;
-    private final Component tooltip;
 
     public Offer(String text) {
       this(text, null);

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/brigadier/ByteArgumentPropertySerializer.java

@@ -1,7 +1,6 @@
 package com.velocitypowered.proxy.protocol.packet.brigadier;
 
 import io.netty.buffer.ByteBuf;
-import org.checkerframework.checker.nullness.qual.Nullable;
 
 class ByteArgumentPropertySerializer implements ArgumentPropertySerializer<Byte> {
 
@@ -11,7 +10,6 @@ class ByteArgumentPropertySerializer implements ArgumentPropertySerializer<Byte>
 
   }
 
-  @Nullable
   @Override
   public Byte deserialize(ByteBuf buf) {
     return buf.readByte();

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/brigadier/DoubleArgumentPropertySerializer.java

@@ -6,7 +6,6 @@ import static com.velocitypowered.proxy.protocol.packet.brigadier.IntegerArgumen
 
 import com.mojang.brigadier.arguments.DoubleArgumentType;
 import io.netty.buffer.ByteBuf;
-import org.checkerframework.checker.nullness.qual.Nullable;
 
 class DoubleArgumentPropertySerializer implements ArgumentPropertySerializer<DoubleArgumentType> {
 
@@ -15,7 +14,6 @@ class DoubleArgumentPropertySerializer implements ArgumentPropertySerializer<Dou
   private DoubleArgumentPropertySerializer() {
   }
 
-  @Nullable
   @Override
   public DoubleArgumentType deserialize(ByteBuf buf) {
     byte flags = buf.readByte();

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/brigadier/DummyProperty.java

@@ -9,8 +9,7 @@ class DummyProperty<T> implements ArgumentType<T> {
 
   private final String identifier;
   private final ArgumentPropertySerializer<T> serializer;
-  @Nullable
+  private final @Nullable T result;
-  private final T result;
 
   DummyProperty(String identifier, ArgumentPropertySerializer<T> serializer, @Nullable T result) {
     this.identifier = identifier;

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/brigadier/DummyVoidArgumentPropertySerializer.java

@@ -14,9 +14,8 @@ class DummyVoidArgumentPropertySerializer implements ArgumentPropertySerializer<
   private DummyVoidArgumentPropertySerializer() {
   }
 
-  @Nullable
   @Override
-  public Void deserialize(ByteBuf buf) {
+  public @Nullable Void deserialize(ByteBuf buf) {
     return null;
   }
 

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/brigadier/FloatArgumentPropertySerializer.java

@@ -6,7 +6,6 @@ import static com.velocitypowered.proxy.protocol.packet.brigadier.IntegerArgumen
 
 import com.mojang.brigadier.arguments.FloatArgumentType;
 import io.netty.buffer.ByteBuf;
-import org.checkerframework.checker.nullness.qual.Nullable;
 
 class FloatArgumentPropertySerializer implements ArgumentPropertySerializer<FloatArgumentType> {
 
@@ -16,7 +15,6 @@ class FloatArgumentPropertySerializer implements ArgumentPropertySerializer<Floa
 
   }
 
-  @Nullable
   @Override
   public FloatArgumentType deserialize(ByteBuf buf) {
     byte flags = buf.readByte();

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/brigadier/IntegerArgumentPropertySerializer.java

@@ -2,7 +2,6 @@ package com.velocitypowered.proxy.protocol.packet.brigadier;
 
 import com.mojang.brigadier.arguments.IntegerArgumentType;
 import io.netty.buffer.ByteBuf;
-import org.checkerframework.checker.nullness.qual.Nullable;
 
 class IntegerArgumentPropertySerializer implements ArgumentPropertySerializer<IntegerArgumentType> {
 
@@ -15,7 +14,6 @@ class IntegerArgumentPropertySerializer implements ArgumentPropertySerializer<In
 
   }
 
-  @Nullable
   @Override
   public IntegerArgumentType deserialize(ByteBuf buf) {
     byte flags = buf.readByte();

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/brigadier/StringArgumentPropertySerializer.java

@@ -3,7 +3,6 @@ package com.velocitypowered.proxy.protocol.packet.brigadier;
 import com.mojang.brigadier.arguments.StringArgumentType;
 import com.velocitypowered.proxy.protocol.ProtocolUtils;
 import io.netty.buffer.ByteBuf;
-import org.checkerframework.checker.nullness.qual.Nullable;
 
 /**
  * Serializes properties for {@link StringArgumentType}.
@@ -17,7 +16,6 @@ class StringArgumentPropertySerializer implements ArgumentPropertySerializer<Str
 
   }
 
-  @Nullable
   @Override
   public StringArgumentType deserialize(ByteBuf buf) {
     int type = ProtocolUtils.readVarInt(buf);

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/brigadier/VoidArgumentPropertySerializer.java

@@ -19,9 +19,8 @@ class VoidArgumentPropertySerializer<T extends ArgumentType<?>>
     return new VoidArgumentPropertySerializer<T>(supplier);
   }
 
-  @Nullable
   @Override
-  public T deserialize(ByteBuf buf) {
+  public @Nullable T deserialize(ByteBuf buf) {
     return argumentSupplier.get();
   }