From aa44ebe7704c0953eebb7b045585f79f2cc75d11 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 31 May 2025 13:07:09 +1000 Subject: [PATCH] Remove obsolete/unused findbugs-annotations --- log/src/main/java/net/md_5/bungee/log/BungeeLogger.java | 8 -------- .../main/java/net/md_5/bungee/log/ConciseFormatter.java | 1 - pom.xml | 6 ------ proxy/src/main/java/net/md_5/bungee/BungeeCord.java | 5 ----- proxy/src/main/java/net/md_5/bungee/UserConnection.java | 1 - proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java | 4 +--- .../main/java/net/md_5/bungee/connection/PingHandler.java | 2 -- .../main/java/net/md_5/bungee/entitymap/EntityMap.java | 2 -- .../java/net/md_5/bungee/entitymap/EntityMap_1_10.java | 2 -- .../java/net/md_5/bungee/entitymap/EntityMap_1_11.java | 2 -- .../java/net/md_5/bungee/entitymap/EntityMap_1_12.java | 2 -- .../java/net/md_5/bungee/entitymap/EntityMap_1_12_1.java | 2 -- .../java/net/md_5/bungee/entitymap/EntityMap_1_13.java | 2 -- .../java/net/md_5/bungee/entitymap/EntityMap_1_14.java | 2 -- .../java/net/md_5/bungee/entitymap/EntityMap_1_15.java | 2 -- .../java/net/md_5/bungee/entitymap/EntityMap_1_16.java | 2 -- .../java/net/md_5/bungee/entitymap/EntityMap_1_16_2.java | 2 -- .../java/net/md_5/bungee/entitymap/EntityMap_1_8.java | 2 -- .../java/net/md_5/bungee/entitymap/EntityMap_1_9.java | 2 -- .../java/net/md_5/bungee/entitymap/EntityMap_1_9_4.java | 2 -- proxy/src/main/java/net/md_5/bungee/http/HttpClient.java | 1 - .../main/java/net/md_5/bungee/module/ModuleManager.java | 8 -------- 22 files changed, 1 insertion(+), 61 deletions(-) diff --git a/log/src/main/java/net/md_5/bungee/log/BungeeLogger.java b/log/src/main/java/net/md_5/bungee/log/BungeeLogger.java index d7d2b6a9..4954d332 100644 --- a/log/src/main/java/net/md_5/bungee/log/BungeeLogger.java +++ b/log/src/main/java/net/md_5/bungee/log/BungeeLogger.java @@ -1,6 +1,5 @@ package net.md_5.bungee.log; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.IOException; import java.util.logging.FileHandler; import java.util.logging.Level; @@ -13,13 +12,6 @@ public class BungeeLogger extends Logger private final LogDispatcher dispatcher = new LogDispatcher( this ); - // CHECKSTYLE:OFF - @SuppressWarnings( - { - "CallToPrintStackTrace", "CallToThreadStartDuringObjectConstruction" - }) - // CHECKSTYLE:ON - @SuppressFBWarnings("SC_START_IN_CTOR") public BungeeLogger(String loggerName, String filePattern, ConsoleReader reader) { super( loggerName, null ); diff --git a/log/src/main/java/net/md_5/bungee/log/ConciseFormatter.java b/log/src/main/java/net/md_5/bungee/log/ConciseFormatter.java index 6f3f1585..85d4ec85 100644 --- a/log/src/main/java/net/md_5/bungee/log/ConciseFormatter.java +++ b/log/src/main/java/net/md_5/bungee/log/ConciseFormatter.java @@ -18,7 +18,6 @@ public class ConciseFormatter extends Formatter private final boolean coloured; @Override - @SuppressWarnings("ThrowableResultIgnored") public String format(LogRecord record) { StringBuilder formatted = new StringBuilder(); diff --git a/pom.xml b/pom.xml index 63b12ecc..ae9d4f62 100644 --- a/pom.xml +++ b/pom.xml @@ -105,12 +105,6 @@ 33.3.1-jre compile - - com.google.code.findbugs - findbugs-annotations - 3.0.1 - provided - org.jetbrains annotations-java5 diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java index ffa4588a..45090154 100644 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java @@ -6,7 +6,6 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.google.common.util.concurrent.ThreadFactoryBuilder; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import io.netty.bootstrap.ServerBootstrap; import io.netty.channel.Channel; import io.netty.channel.ChannelException; @@ -179,7 +178,6 @@ public class BungeeCord extends ProxyServer private BungeeChannelInitializer serverInfoChannelInitializer; }; - @SuppressFBWarnings("DM_DEFAULT_ENCODING") public BungeeCord() throws IOException { // Java uses ! to indicate a resource inside of a jar/zip/other container. Running Bungee from within a directory that has a ! will cause this to muck up. @@ -259,7 +257,6 @@ public class BungeeCord extends ProxyServer * * @throws Exception any critical errors encountered */ - @SuppressFBWarnings("RV_RETURN_VALUE_IGNORED_BAD_PRACTICE") public void start() throws Exception { System.setProperty( "io.netty.selectorAutoRebuildThreshold", "0" ); // Seems to cause Bungee to stop accepting connections @@ -429,8 +426,6 @@ public class BungeeCord extends ProxyServer } // This must be run on a separate thread to avoid deadlock! - @SuppressFBWarnings("DM_EXIT") - @SuppressWarnings("TooBroadCatch") private void independentThreadStop(final String reason, boolean callSystemExit) { // Acquire the shutdown lock diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java index d5df3c27..5adee5b8 100644 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java @@ -383,7 +383,6 @@ public final class UserConnection implements ProxiedPlayer ChannelFutureListener listener = new ChannelFutureListener() { @Override - @SuppressWarnings("ThrowableResultIgnored") public void operationComplete(ChannelFuture future) throws Exception { if ( callback != null ) diff --git a/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java b/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java index 95781e33..9c8325bf 100644 --- a/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java +++ b/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java @@ -1,6 +1,5 @@ package net.md_5.bungee.conf; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -230,7 +229,6 @@ public class YamlConfig implements ConfigurationAdapter @Override @SuppressWarnings("unchecked") - @SuppressFBWarnings("RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE") public Collection getListeners() { Collection> base = get( "listeners", (Collection) Arrays.asList( new Map[] @@ -305,7 +303,7 @@ public class YamlConfig implements ConfigurationAdapter Map> raw = get( "groups", Collections.emptyMap() ); Collection groups = raw.get( player ); - Collection ret = ( groups == null ) ? new HashSet() : new HashSet<>( groups ); + Collection ret = ( groups == null ) ? new HashSet<>() : new HashSet<>( groups ); ret.add( "default" ); return ret; } diff --git a/proxy/src/main/java/net/md_5/bungee/connection/PingHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/PingHandler.java index 0cddf41f..0004d990 100644 --- a/proxy/src/main/java/net/md_5/bungee/connection/PingHandler.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/PingHandler.java @@ -1,7 +1,6 @@ package net.md_5.bungee.connection; import com.google.gson.Gson; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import lombok.RequiredArgsConstructor; import net.md_5.bungee.BungeeServerInfo; import net.md_5.bungee.PlayerInfoSerializer; @@ -67,7 +66,6 @@ public class PingHandler extends PacketHandler } @Override - @SuppressFBWarnings("UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR") public void handle(StatusResponse statusResponse) throws Exception { ServerPing serverPing = gson.fromJson( statusResponse.getResponse(), ServerPing.class ); diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java index 873ddd68..77b27c6f 100644 --- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java +++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java @@ -1,6 +1,5 @@ package net.md_5.bungee.entitymap; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufInputStream; import java.io.DataInputStream; @@ -140,7 +139,6 @@ public abstract class EntityMap } } - @SuppressFBWarnings("DLS_DEAD_LOCAL_STORE") protected static void rewriteVarInt(ByteBuf packet, int oldId, int newId, int offset) { // Need to rewrite the packet because VarInts are variable length diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_10.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_10.java index f42dc722..e30492cb 100644 --- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_10.java +++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_10.java @@ -1,6 +1,5 @@ package net.md_5.bungee.entitymap; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import io.netty.buffer.ByteBuf; import java.util.UUID; import net.md_5.bungee.BungeeCord; @@ -47,7 +46,6 @@ class EntityMap_1_10 extends EntityMap } @Override - @SuppressFBWarnings("DLS_DEAD_LOCAL_STORE") public void rewriteClientbound(ByteBuf packet, int oldId, int newId) { super.rewriteClientbound( packet, oldId, newId ); diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_11.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_11.java index dc711f34..42c6d56f 100644 --- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_11.java +++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_11.java @@ -1,6 +1,5 @@ package net.md_5.bungee.entitymap; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import io.netty.buffer.ByteBuf; import java.util.UUID; import net.md_5.bungee.BungeeCord; @@ -47,7 +46,6 @@ class EntityMap_1_11 extends EntityMap } @Override - @SuppressFBWarnings("DLS_DEAD_LOCAL_STORE") public void rewriteClientbound(ByteBuf packet, int oldId, int newId) { super.rewriteClientbound( packet, oldId, newId ); diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_12.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_12.java index c15ab1a1..811bcac8 100644 --- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_12.java +++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_12.java @@ -1,6 +1,5 @@ package net.md_5.bungee.entitymap; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import io.netty.buffer.ByteBuf; import java.util.UUID; import net.md_5.bungee.BungeeCord; @@ -47,7 +46,6 @@ class EntityMap_1_12 extends EntityMap } @Override - @SuppressFBWarnings("DLS_DEAD_LOCAL_STORE") public void rewriteClientbound(ByteBuf packet, int oldId, int newId) { super.rewriteClientbound( packet, oldId, newId ); diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_12_1.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_12_1.java index c3e6f8c7..e8c38c6e 100644 --- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_12_1.java +++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_12_1.java @@ -1,6 +1,5 @@ package net.md_5.bungee.entitymap; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import io.netty.buffer.ByteBuf; import java.util.UUID; import net.md_5.bungee.BungeeCord; @@ -47,7 +46,6 @@ class EntityMap_1_12_1 extends EntityMap } @Override - @SuppressFBWarnings("DLS_DEAD_LOCAL_STORE") public void rewriteClientbound(ByteBuf packet, int oldId, int newId) { super.rewriteClientbound( packet, oldId, newId ); diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_13.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_13.java index c653d664..5fa12256 100644 --- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_13.java +++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_13.java @@ -1,6 +1,5 @@ package net.md_5.bungee.entitymap; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import io.netty.buffer.ByteBuf; import java.util.UUID; import net.md_5.bungee.BungeeCord; @@ -47,7 +46,6 @@ class EntityMap_1_13 extends EntityMap } @Override - @SuppressFBWarnings("DLS_DEAD_LOCAL_STORE") public void rewriteClientbound(ByteBuf packet, int oldId, int newId, int protocolVersion) { super.rewriteClientbound( packet, oldId, newId ); diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_14.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_14.java index e9b28f0d..33f25c92 100644 --- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_14.java +++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_14.java @@ -1,6 +1,5 @@ package net.md_5.bungee.entitymap; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import io.netty.buffer.ByteBuf; import java.util.UUID; import net.md_5.bungee.BungeeCord; @@ -46,7 +45,6 @@ class EntityMap_1_14 extends EntityMap } @Override - @SuppressFBWarnings("DLS_DEAD_LOCAL_STORE") public void rewriteClientbound(ByteBuf packet, int oldId, int newId, int protocolVersion) { super.rewriteClientbound( packet, oldId, newId ); diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_15.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_15.java index eafca587..60cdf04c 100644 --- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_15.java +++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_15.java @@ -1,6 +1,5 @@ package net.md_5.bungee.entitymap; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import io.netty.buffer.ByteBuf; import java.util.UUID; import net.md_5.bungee.BungeeCord; @@ -46,7 +45,6 @@ class EntityMap_1_15 extends EntityMap } @Override - @SuppressFBWarnings("DLS_DEAD_LOCAL_STORE") public void rewriteClientbound(ByteBuf packet, int oldId, int newId, int protocolVersion) { super.rewriteClientbound( packet, oldId, newId ); diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_16.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_16.java index 98b1a155..735bd6df 100644 --- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_16.java +++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_16.java @@ -1,6 +1,5 @@ package net.md_5.bungee.entitymap; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import io.netty.buffer.ByteBuf; import java.util.UUID; import net.md_5.bungee.BungeeCord; @@ -46,7 +45,6 @@ class EntityMap_1_16 extends EntityMap } @Override - @SuppressFBWarnings("DLS_DEAD_LOCAL_STORE") public void rewriteClientbound(ByteBuf packet, int oldId, int newId, int protocolVersion) { super.rewriteClientbound( packet, oldId, newId ); diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_16_2.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_16_2.java index d46ec192..9560ff3d 100644 --- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_16_2.java +++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_16_2.java @@ -1,6 +1,5 @@ package net.md_5.bungee.entitymap; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import io.netty.buffer.ByteBuf; import java.util.UUID; import lombok.AccessLevel; @@ -25,7 +24,6 @@ class EntityMap_1_16_2 extends EntityMap private final int spectateId; @Override - @SuppressFBWarnings("DLS_DEAD_LOCAL_STORE") public void rewriteClientbound(ByteBuf packet, int oldId, int newId, int protocolVersion) { if ( spawnPlayerId == -1 ) diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_8.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_8.java index 42a53153..d3b52da4 100644 --- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_8.java +++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_8.java @@ -1,6 +1,5 @@ package net.md_5.bungee.entitymap; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import io.netty.buffer.ByteBuf; import java.util.UUID; import net.md_5.bungee.BungeeCord; @@ -48,7 +47,6 @@ class EntityMap_1_8 extends EntityMap } @Override - @SuppressFBWarnings("DLS_DEAD_LOCAL_STORE") public void rewriteClientbound(ByteBuf packet, int oldId, int newId) { super.rewriteClientbound( packet, oldId, newId ); diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_9.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_9.java index 657e5846..0cd0bf06 100644 --- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_9.java +++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_9.java @@ -1,6 +1,5 @@ package net.md_5.bungee.entitymap; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import io.netty.buffer.ByteBuf; import java.util.UUID; import net.md_5.bungee.BungeeCord; @@ -47,7 +46,6 @@ class EntityMap_1_9 extends EntityMap } @Override - @SuppressFBWarnings("DLS_DEAD_LOCAL_STORE") public void rewriteClientbound(ByteBuf packet, int oldId, int newId) { super.rewriteClientbound( packet, oldId, newId ); diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_9_4.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_9_4.java index 11d8e0e3..930a7b5a 100644 --- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_9_4.java +++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_9_4.java @@ -1,6 +1,5 @@ package net.md_5.bungee.entitymap; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import io.netty.buffer.ByteBuf; import java.util.UUID; import net.md_5.bungee.BungeeCord; @@ -47,7 +46,6 @@ class EntityMap_1_9_4 extends EntityMap } @Override - @SuppressFBWarnings("DLS_DEAD_LOCAL_STORE") public void rewriteClientbound(ByteBuf packet, int oldId, int newId) { super.rewriteClientbound( packet, oldId, newId ); diff --git a/proxy/src/main/java/net/md_5/bungee/http/HttpClient.java b/proxy/src/main/java/net/md_5/bungee/http/HttpClient.java index e0c52f21..0bfcc94e 100644 --- a/proxy/src/main/java/net/md_5/bungee/http/HttpClient.java +++ b/proxy/src/main/java/net/md_5/bungee/http/HttpClient.java @@ -29,7 +29,6 @@ public class HttpClient public static final int TIMEOUT = 5000; private static final Cache addressCache = CacheBuilder.newBuilder().expireAfterWrite( 1, TimeUnit.MINUTES ).build(); - @SuppressWarnings("UnusedAssignment") public static void get(String url, EventLoop eventLoop, final Callback callback) { Preconditions.checkNotNull( url, "url" ); diff --git a/proxy/src/main/java/net/md_5/bungee/module/ModuleManager.java b/proxy/src/main/java/net/md_5/bungee/module/ModuleManager.java index d3c50b0f..b6183c6f 100644 --- a/proxy/src/main/java/net/md_5/bungee/module/ModuleManager.java +++ b/proxy/src/main/java/net/md_5/bungee/module/ModuleManager.java @@ -1,7 +1,6 @@ package net.md_5.bungee.module; import com.google.common.base.Preconditions; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.File; import java.io.FileInputStream; import java.io.FileWriter; @@ -31,12 +30,6 @@ public class ModuleManager knownSources.put( "jenkins", new JenkinsModuleSource() ); } - // CHECKSTYLE:OFF - @SuppressFBWarnings( - { - "SF_SWITCH_FALLTHROUGH", "SF_SWITCH_NO_DEFAULT" - }) - // CHECKSTYLE:ON public void load(ProxyServer proxy, File moduleDirectory) throws Exception { moduleDirectory.mkdir(); @@ -132,7 +125,6 @@ public class ModuleManager } } - @SuppressFBWarnings("REC_CATCH_EXCEPTION") private ModuleVersion getVersion(File file) { try ( JarFile jar = new JarFile( file ) )