From 536049995d30f7c8fb0f70f689a86bc8d22470d3 Mon Sep 17 00:00:00 2001 From: Andrew Steinborn Date: Mon, 26 Oct 2020 20:58:20 -0400 Subject: [PATCH] Fix SpotBugs complaint --- .../proxy/util/InformationUtils.java | 23 +++++-------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/proxy/src/main/java/com/velocitypowered/proxy/util/InformationUtils.java b/proxy/src/main/java/com/velocitypowered/proxy/util/InformationUtils.java index c75597f4..f53e3b5c 100644 --- a/proxy/src/main/java/com/velocitypowered/proxy/util/InformationUtils.java +++ b/proxy/src/main/java/com/velocitypowered/proxy/util/InformationUtils.java @@ -16,13 +16,10 @@ import com.velocitypowered.api.proxy.config.ProxyConfig; import com.velocitypowered.api.proxy.server.RegisteredServer; import com.velocitypowered.api.util.ProxyVersion; -import io.netty.channel.unix.DomainSocketAddress; - import java.net.Inet4Address; import java.net.Inet6Address; import java.net.InetAddress; import java.net.InetSocketAddress; -import java.net.SocketAddress; import java.util.List; import java.util.Map; @@ -170,22 +167,14 @@ public enum InformationUtils { public static JsonObject collectServerInfo(RegisteredServer server) { JsonObject info = new JsonObject(); info.addProperty("currentPlayers", server.getPlayersConnected().size()); - SocketAddress address = server.getServerInfo().getAddress(); - if (address instanceof InetSocketAddress) { - InetSocketAddress iaddr = (InetSocketAddress) address; - if (iaddr.isUnresolved()) { - // Greetings form Netty 4aa10db9 - info.addProperty("host", iaddr.getHostString()); - } else { - info.addProperty("host", anonymizeInetAddress(iaddr.getAddress())); - } - info.addProperty("port", iaddr.getPort()); - } else if (address instanceof DomainSocketAddress) { - DomainSocketAddress daddr = (DomainSocketAddress) address; - info.addProperty("path", daddr.path()); + InetSocketAddress iaddr = server.getServerInfo().getAddress(); + if (iaddr.isUnresolved()) { + // Greetings form Netty 4aa10db9 + info.addProperty("host", iaddr.getHostString()); } else { - info.addProperty("info", address.toString()); + info.addProperty("host", anonymizeInetAddress(iaddr.getAddress())); } + info.addProperty("port", iaddr.getPort()); return info; }