From da88d5c50263517b4bca8d4aa9bcfcf637876b0b Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 6 Aug 2017 11:18:14 +1000 Subject: [PATCH] Formatting & dependency updates --- bootstrap/pom.xml | 6 +++--- pom.xml | 4 ++-- proxy/pom.xml | 2 +- proxy/src/main/java/net/md_5/bungee/UserConnection.java | 2 +- proxy/src/main/java/net/md_5/bungee/conf/Configuration.java | 2 +- .../java/net/md_5/bungee/connection/DownstreamBridge.java | 1 - .../java/net/md_5/bungee/connection/InitialHandler.java | 2 +- query/src/main/java/net/md_5/bungee/query/QueryHandler.java | 4 ++-- 8 files changed, 11 insertions(+), 12 deletions(-) diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml index 9c02b3893..9b5c98f7d 100644 --- a/bootstrap/pom.xml +++ b/bootstrap/pom.xml @@ -35,7 +35,7 @@ net.sf.jopt-simple jopt-simple - 4.8 + 4.9 compile @@ -46,7 +46,7 @@ org.apache.maven.plugins maven-jar-plugin - 2.4 + 3.0.2 @@ -60,7 +60,7 @@ org.apache.maven.plugins maven-shade-plugin - 2.1 + 3.0.0 package diff --git a/pom.xml b/pom.xml index 6821d7504..28431e5b9 100644 --- a/pom.xml +++ b/pom.xml @@ -87,8 +87,8 @@ com.google.code.findbugs - findbugs - 3.0.0 + findbugs-annotations + 3.0.1 provided diff --git a/proxy/pom.xml b/proxy/pom.xml index 1eae87330..211f4dedb 100644 --- a/proxy/pom.xml +++ b/proxy/pom.xml @@ -87,7 +87,7 @@ mysql mysql-connector-java - 5.1.42 + 5.1.43 runtime 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 c45f84127..fb50dabe9 100644 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java @@ -255,7 +255,7 @@ public final class UserConnection implements ProxiedPlayer if ( getServer() == null && !ch.isClosing() ) { - throw new IllegalStateException("Cancelled ServerConnectEvent with no server or disconnect."); + throw new IllegalStateException( "Cancelled ServerConnectEvent with no server or disconnect." ); } return; } diff --git a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java index 217fe7613..907246a98 100644 --- a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java +++ b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java @@ -85,7 +85,7 @@ public class Configuration implements ProxyConfig throttle = adapter.getInt( "connection_throttle", throttle ); ipForward = adapter.getBoolean( "ip_forward", ipForward ); compressionThreshold = adapter.getInt( "network_compression_threshold", compressionThreshold ); - preventProxyConnections = adapter.getBoolean( "prevent_proxy_connections", preventProxyConnections); + preventProxyConnections = adapter.getBoolean( "prevent_proxy_connections", preventProxyConnections ); disabledCommands = new CaseInsensitiveSet( (Collection) adapter.getList( "disabled_commands", Arrays.asList( "disabledcommandhere" ) ) ); diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java index 57fe06e5b..4049e815a 100644 --- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java @@ -1,6 +1,5 @@ package net.md_5.bungee.connection; -import com.google.common.base.Objects; import com.google.common.base.Preconditions; import com.google.common.io.ByteArrayDataOutput; import com.google.common.io.ByteStreams; diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java index cb140d4a8..baa8dd366 100644 --- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java @@ -562,7 +562,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection @Override public String getName() { - return (name != null ) ? name : ( loginRequest == null ) ? null : loginRequest.getData(); + return ( name != null ) ? name : ( loginRequest == null ) ? null : loginRequest.getData(); } @Override diff --git a/query/src/main/java/net/md_5/bungee/query/QueryHandler.java b/query/src/main/java/net/md_5/bungee/query/QueryHandler.java index 614dd94a3..79d6886a6 100644 --- a/query/src/main/java/net/md_5/bungee/query/QueryHandler.java +++ b/query/src/main/java/net/md_5/bungee/query/QueryHandler.java @@ -27,7 +27,7 @@ public class QueryHandler extends SimpleChannelInboundHandler private final ListenerInfo listener; /*========================================================================*/ private final Random random = new Random(); - private final Cache sessions = CacheBuilder.newBuilder().expireAfterWrite( 30, TimeUnit.SECONDS).build(); + private final Cache sessions = CacheBuilder.newBuilder().expireAfterWrite( 30, TimeUnit.SECONDS ).build(); private void writeShort(ByteBuf buf, int s) { @@ -124,7 +124,7 @@ public class QueryHandler extends SimpleChannelInboundHandler writeString( out, entry.getKey() ); writeString( out, entry.getValue() ); } - out.writeByte( 0x00 ); // Null + out.writeByte( 0x00 ); // Null // Padding writeString( out, "\01player_\00" );