Clean up some less-than-conventional code

dmulloy2 · dmulloy2 · commit b17af6871690 · 2015-11-24T15:35:23.000-05:00
diff --git a/ProtocolLib/src/main/java/com/comphenix/protocol/CommandProtocol.java b/ProtocolLib/src/main/java/com/comphenix/protocol/CommandProtocol.java
@@ -75,7 +75,7 @@ protected boolean handleCommand(CommandSender sender, String[] args) {
 		} else if (subCommand.equalsIgnoreCase("timings")) {
 			toggleTimings(sender, args);
 		} else if (subCommand.equalsIgnoreCase("listeners")) {
-			printListeners(sender, args);
+			printListeners(sender);
 		} else if (subCommand.equalsIgnoreCase("version")) {
 			printVersion(sender);
 		} else if (subCommand.equalsIgnoreCase("dump")) {
@@ -96,7 +96,7 @@ public void updateVersion(final CommandSender sender) {
 	}
 	
 	// Display every listener on the server
-	private void printListeners(final CommandSender sender, String[] args) {
+	private void printListeners(final CommandSender sender) {
 		ProtocolManager manager = ProtocolLibrary.getProtocolManager();
 		
 		sender.sendMessage(ChatColor.GOLD + "Packet listeners:");
diff --git a/ProtocolLib/src/main/java/com/comphenix/protocol/ProtocolConfig.java b/ProtocolLib/src/main/java/com/comphenix/protocol/ProtocolConfig.java
@@ -77,10 +77,6 @@ public class ProtocolConfig {
 	private int modCount;
 
 	public ProtocolConfig(Plugin plugin) {
-		this(plugin, plugin.getConfig());
-	}
-
-	public ProtocolConfig(Plugin plugin, Configuration config) {
 		this.plugin = plugin;
 		reloadConfig();
 	}
diff --git a/ProtocolLib/src/main/java/com/comphenix/protocol/compat/netty/independent/NettyChannelInjector.java b/ProtocolLib/src/main/java/com/comphenix/protocol/compat/netty/independent/NettyChannelInjector.java
@@ -388,7 +388,7 @@ protected PacketEvent handleScheduled(Object instance, FieldAccessor accessor) {
 	 * @return TRUE if it is, FALSE if not or unknown.
 	 */
 	private boolean guessCompression(ChannelHandler handler) {
-		String className = handler != null ? handler.getClass().getCanonicalName() : null;
+		String className = handler != null ? handler.getClass().getCanonicalName() : "";
 		return className.contains("Compressor") || className.contains("Decompressor");
 	}
 
diff --git a/ProtocolLib/src/main/java/com/comphenix/protocol/concurrency/SortedCopyOnWriteArray.java b/ProtocolLib/src/main/java/com/comphenix/protocol/concurrency/SortedCopyOnWriteArray.java
@@ -30,7 +30,7 @@
  * An implicitly sorted array list that preserves insertion order and maintains duplicates.
  * @param <T> - type of the elements in the list.
  */
-public class SortedCopyOnWriteArray<T extends Comparable<T>> implements Iterable<T>, Collection<T> {
+public class SortedCopyOnWriteArray<T extends Comparable<T>> implements Collection<T> {
 	// Prevent reordering
 	private volatile List<T> list;
 	
diff --git a/ProtocolLib/src/main/java/com/comphenix/protocol/events/PacketAdapter.java b/ProtocolLib/src/main/java/com/comphenix/protocol/events/PacketAdapter.java
@@ -346,13 +346,11 @@ public static String getPluginName(PacketListener listener) {
 	 * @return Name of the given plugin.
 	 */
 	public static String getPluginName(Plugin plugin) {
-		// Try to get the plugin name
+		if (plugin == null)
+			return "UNKNOWN";
+
 		try {
-			if (plugin == null)
-				return "UNKNOWN";
-			else
-				return plugin.getName();
-			
+			return plugin.getName();
 		} catch (NoSuchMethodError e) {
 			return plugin.toString();
 		}
diff --git a/ProtocolLib/src/main/java/com/comphenix/protocol/injector/DelayedPacketManager.java b/ProtocolLib/src/main/java/com/comphenix/protocol/injector/DelayedPacketManager.java
@@ -18,7 +18,6 @@
 import com.comphenix.protocol.AsynchronousManager;
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.PacketType.Sender;
-import com.comphenix.protocol.ProtocolManager;
 import com.comphenix.protocol.error.ErrorReporter;
 import com.comphenix.protocol.error.Report;
 import com.comphenix.protocol.error.ReportType;
@@ -43,7 +42,7 @@
  * 
  * @author Kristian
  */
-public class DelayedPacketManager implements ProtocolManager, InternalManager {
+public class DelayedPacketManager implements InternalManager {
 	// Registering packet IDs that are not supported
 	public static final ReportType REPORT_CANNOT_SEND_QUEUED_PACKET = new ReportType("Cannot send queued packet %s.");
 	public static final ReportType REPORT_CANNOT_SEND_QUEUED_WIRE_PACKET = new ReportType("Cannot send queued wire packet %s.");
diff --git a/ProtocolLib/src/main/java/com/comphenix/protocol/injector/PacketFilterManager.java b/ProtocolLib/src/main/java/com/comphenix/protocol/injector/PacketFilterManager.java
@@ -51,7 +51,6 @@
 import com.comphenix.protocol.AsynchronousManager;
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.PacketType.Sender;
-import com.comphenix.protocol.ProtocolManager;
 import com.comphenix.protocol.async.AsyncFilterManager;
 import com.comphenix.protocol.async.AsyncMarker;
 import com.comphenix.protocol.compat.netty.Netty;
@@ -91,7 +90,7 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
 
-public final class PacketFilterManager implements ProtocolManager, ListenerInvoker, InternalManager {
+public final class PacketFilterManager implements ListenerInvoker, InternalManager {
 
 	public static final ReportType REPORT_CANNOT_LOAD_PACKET_LIST = new ReportType("Cannot load server and client packet list.");
 	public static final ReportType REPORT_CANNOT_INITIALIZE_PACKET_INJECTOR = new ReportType("Unable to initialize packet injector");
diff --git a/ProtocolLib/src/main/java/com/comphenix/protocol/injector/packet/InterceptWritePacket.java b/ProtocolLib/src/main/java/com/comphenix/protocol/injector/packet/InterceptWritePacket.java
@@ -54,7 +54,7 @@ public InterceptWritePacket(ErrorReporter reporter) {
 	}
 	
 	// TODO: PacketId should probably do something...
-	private Class<?> createProxyClass(int packetId) {
+	private Class<?> createProxyClass() {
 		// Construct the proxy object
 		Enhancer ex = EnhancerFactory.getInstance().createEnhancer();
 		
@@ -102,7 +102,7 @@ private Class<?> getProxyClass(int packetId) {
 		
 		// Concurrent pattern
 		if (stored == null) {
-			final Class<?> created = createProxyClass(packetId);
+			final Class<?> created = createProxyClass();
 			stored = proxyClasses.putIfAbsent(packetId, created);
 			
 			// We won!
diff --git a/ProtocolLib/src/main/java/com/comphenix/protocol/injector/packet/ProxyPacketInjector.java b/ProtocolLib/src/main/java/com/comphenix/protocol/injector/packet/ProxyPacketInjector.java
@@ -348,7 +348,7 @@ public PacketEvent packetRecieved(PacketContainer packet, InputStream input, byt
 	@Override
 	public PacketEvent packetRecieved(PacketContainer packet, Player client, byte[] buffered) {
 		NetworkMarker marker = buffered != null ? new LegacyNetworkMarker(ConnectionSide.CLIENT_SIDE, buffered, packet.getType()) : null;
-		PacketEvent event = PacketEvent.fromClient((Object) manager, packet, marker, client);
+		PacketEvent event = PacketEvent.fromClient(manager, packet, marker, client);
 		
 		manager.invokePacketRecieving(event);
 		return event;
diff --git a/ProtocolLib/src/main/java/com/comphenix/protocol/injector/spigot/DummyPacketInjector.java b/ProtocolLib/src/main/java/com/comphenix/protocol/injector/spigot/DummyPacketInjector.java
@@ -8,15 +8,14 @@
 import com.comphenix.protocol.concurrency.PacketTypeSet;
 import com.comphenix.protocol.events.PacketContainer;
 import com.comphenix.protocol.events.PacketEvent;
-import com.comphenix.protocol.injector.packet.PacketInjector;
 import com.google.common.collect.Sets;
 
 /**
  * Dummy packet injector that simply delegates to its parent Spigot packet injector or receiving filters.
  * 
  * @author Kristian
  */
-class DummyPacketInjector extends AbstractPacketInjector implements PacketInjector {
+class DummyPacketInjector extends AbstractPacketInjector {
 	private SpigotPacketInjector injector;	
 	private PacketTypeSet lastBufferedPackets = new PacketTypeSet();
 
diff --git a/ProtocolLib/src/main/java/com/comphenix/protocol/reflect/cloning/SerializableCloner.java b/ProtocolLib/src/main/java/com/comphenix/protocol/reflect/cloning/SerializableCloner.java
@@ -31,21 +31,17 @@ public Object clone(Object source) {
      * @return The cloned object.
      * @throws RuntimeException If we were unable to clone the object.
      */
-    @SuppressWarnings("unchecked")
-    public static <T extends Serializable> T clone(final T obj) {
-        try {
-            if (obj instanceof Serializable) {
-                ByteArrayOutputStream out = new ByteArrayOutputStream();
-                ObjectOutputStream oout = new ObjectOutputStream(out);
+	@SuppressWarnings("unchecked")
+	public static <T extends Serializable> T clone(final T obj) {
+		try {
+			ByteArrayOutputStream out = new ByteArrayOutputStream();
+			ObjectOutputStream oout = new ObjectOutputStream(out);
 
-                oout.writeObject(obj);
-                ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream(out.toByteArray()));
-                return (T) in.readObject();
-            } else {
-                throw new RuntimeException("Object " + obj + " is not serializable!");
-            }
-        } catch (Exception e) {
-            throw new RuntimeException("Unable to clone object " + obj + " (" + obj.getClass().getName() + ")", e);
-        }
-    }
+			oout.writeObject(obj);
+			ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream(out.toByteArray()));
+			return (T) in.readObject();
+		} catch (Exception e) {
+			throw new RuntimeException("Unable to clone object " + obj + " (" + obj.getClass().getName() + ")", e);
+		}
+	}
 }
diff --git a/ProtocolLib/src/main/java/com/comphenix/protocol/reflect/compiler/CompiledStructureModifier.java b/ProtocolLib/src/main/java/com/comphenix/protocol/reflect/compiler/CompiledStructureModifier.java
@@ -79,7 +79,7 @@ public StructureModifier<Object> writeDefaults() throws FieldAccessException {
 				continue;
 			}
 
-			write(index, (Object) generator.getDefault(field.getType()));
+			write(index, generator.getDefault(field.getType()));
 		}
 
 		return this;
diff --git a/ProtocolLib/src/main/java/com/comphenix/protocol/reflect/compiler/MethodDescriptor.java b/ProtocolLib/src/main/java/com/comphenix/protocol/reflect/compiler/MethodDescriptor.java
@@ -165,7 +165,7 @@ private static String map(final String type, final boolean defaultPackage) {
         }
 
         String t = type.substring(0, type.length() - sb.length() * 2);
-        String desc = (String) DESCRIPTORS.get(t);
+        String desc = DESCRIPTORS.get(t);
         if (desc != null) {
             sb.append(desc);
         } else {
diff --git a/ProtocolLib/src/main/java/com/comphenix/protocol/reflect/fuzzy/AbstractFuzzyMatcher.java b/ProtocolLib/src/main/java/com/comphenix/protocol/reflect/fuzzy/AbstractFuzzyMatcher.java
@@ -84,12 +84,7 @@ protected final int combineRounds(Integer... rounds) {
 		
 	@Override
 	public int compareTo(AbstractFuzzyMatcher<T> obj) {
-		if (obj instanceof AbstractFuzzyMatcher) {
-			AbstractFuzzyMatcher<?> matcher = (AbstractFuzzyMatcher<?>) obj;
-			return Ints.compare(getRoundNumber(), matcher.getRoundNumber());
-		}
-		// No match
-		return -1;
+		return Ints.compare(getRoundNumber(), obj.getRoundNumber());
 	}
 
 	/**
diff --git a/ProtocolLib/src/main/java/com/comphenix/protocol/reflect/fuzzy/FuzzyClassContract.java b/ProtocolLib/src/main/java/com/comphenix/protocol/reflect/fuzzy/FuzzyClassContract.java
@@ -251,7 +251,7 @@ public boolean isMatch(Class<?> value, Object parent) {
 			   (baseclassContracts.size() == 0 || 
 			   		processValue(value.getSuperclass(), parent, baseclassContracts)) &&
 			   (interfaceContracts.size() == 0 ||
-			    	processContracts(Arrays.asList(value.getInterfaces()), (Class<?>) parent, interfaceContracts));
+			    	processContracts(Arrays.asList(value.getInterfaces()), parent, interfaceContracts));
 	}
 
 	private <T> boolean processContracts(Collection<T> values, Object parent, List<AbstractFuzzyMatcher<T>> matchers) {
diff --git a/ProtocolLib/src/main/java/com/comphenix/protocol/utility/SnapshotVersion.java b/ProtocolLib/src/main/java/com/comphenix/protocol/utility/SnapshotVersion.java
@@ -33,7 +33,7 @@ public SnapshotVersion(String version) {
 		if (matcher.matches()) {
 			try {
 				this.snapshotDate = getDateFormat().parse(matcher.group(1));
-				this.snapshotWeekVersion = (int)matcher.group(2).charAt(0) - (int)'a';
+				this.snapshotWeekVersion = matcher.group(2).charAt(0) - 'a';
 				this.rawString = version;
 			} catch (ParseException e) {
 				throw new IllegalArgumentException("Date implied by snapshot version is invalid.", e);
@@ -83,7 +83,7 @@ public String getSnapshotString() {
 			rawString = String.format("%02dw%02d%s",
 				current.get(Calendar.YEAR) % 100, 
 				current.get(Calendar.WEEK_OF_YEAR),
-				(char) ((int)'a' + snapshotWeekVersion));
+				(char) ('a' + snapshotWeekVersion));
 		}
 		return rawString;
 	}
diff --git a/ProtocolLib/src/main/java/com/comphenix/protocol/wrappers/WrappedGameProfile.java b/ProtocolLib/src/main/java/com/comphenix/protocol/wrappers/WrappedGameProfile.java
@@ -165,8 +165,10 @@ public static WrappedGameProfile fromHandle(Object handle) {
 	 * @throws IllegalArgumentException If we cannot parse the text.
 	 */
 	private static UUID parseUUID(String id) {
+		if (id == null) return null;
+
 		try {
-			return id != null ? UUID.fromString(id) : null;
+			return UUID.fromString(id);
 		} catch (IllegalArgumentException e) {
 			// Warn once every hour (per plugin)
 			ProtocolLibrary.getErrorReporter()
diff --git a/ProtocolLib/src/main/java/com/comphenix/protocol/wrappers/nbt/WrappedCompound.java b/ProtocolLib/src/main/java/com/comphenix/protocol/wrappers/nbt/WrappedCompound.java
@@ -31,7 +31,7 @@
  * 
  * @author Kristian
  */
-class WrappedCompound implements NbtWrapper<Map<String, NbtBase<?>>>, Iterable<NbtBase<?>>, NbtCompound {
+class WrappedCompound implements NbtWrapper<Map<String, NbtBase<?>>>, NbtCompound {
 	// A list container
 	private WrappedElement<Map<String, Object>> container;
 	
@@ -636,7 +636,7 @@ public <T> NbtCompound put(String key, Collection<? extends NbtBase<T>> list) {
 	}
 	
 	@Override
-	public <T> NbtBase<?> remove(String key) {
+	public NbtBase<?> remove(String key) {
 		return getValue().remove(key);
 	}
 	
diff --git a/ProtocolLib/src/main/java/com/comphenix/protocol/wrappers/nbt/WrappedList.java b/ProtocolLib/src/main/java/com/comphenix/protocol/wrappers/nbt/WrappedList.java
@@ -36,7 +36,7 @@
  *
  * @param <TType> - the type of the value in each NBT sub element.
  */
-class WrappedList<TType> implements NbtWrapper<List<NbtBase<TType>>>, Iterable<TType>, NbtList<TType> {	
+class WrappedList<TType> implements NbtWrapper<List<NbtBase<TType>>>, NbtList<TType> {	
 	// A list container
 	private WrappedElement<List<Object>> container;
 	
diff --git a/ProtocolLib/src/test/java/com/comphenix/integration/protocol/SimpleCraftBukkitITCase.java b/ProtocolLib/src/test/java/com/comphenix/integration/protocol/SimpleCraftBukkitITCase.java
@@ -103,7 +103,6 @@ public void testPingPacket() throws Throwable {
 	 * Copy ProtocolLib into the plugins folder.
 	 * @throws IOException If anything went wrong.
 	 */
-	@SuppressWarnings("deprecation")
 	private static void setupPlugins() throws IOException {
 		File pluginDirectory = new File("plugins/");
 		File srcDirectory = new File("../");
diff --git a/ProtocolLib/src/test/java/com/comphenix/integration/protocol/SimpleMinecraftClient.java b/ProtocolLib/src/test/java/com/comphenix/integration/protocol/SimpleMinecraftClient.java
@@ -6,7 +6,6 @@
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.net.InetSocketAddress;
 import java.net.Socket;
@@ -50,7 +49,6 @@ public String queryServerPing(InetSocketAddress address) throws IOException {
         Socket socket = null;
         OutputStream output = null;
         InputStream input = null;
-        InputStreamReader reader = null;
         
         try {
             socket = new Socket();
@@ -76,10 +74,7 @@ public String queryServerPing(InetSocketAddress address) throws IOException {
           
             socket.close();
             return ((ResponsePacket) packet).getPingJson();
-            
         } finally {
-            if (reader != null)
-                reader.close();
             if (input != null)
                 input.close();
             if (output != null)
@@ -214,6 +209,7 @@ public void write(DataOutputStream output) throws IOException {
 			serializer.serializeVarInt(output, type.getCurrentId());
 		}
 		
+		@SuppressWarnings("unused")
 		public void read(PacketType type, DataInputStream input) throws IOException {
 			// Note - we don't read the packet id
 			if (this.type != type) {
diff --git a/ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/PlayerInfoDataTest.java b/ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/PlayerInfoDataTest.java
@@ -33,7 +33,7 @@
 public class PlayerInfoDataTest {
 
 	@BeforeClass
-	public static void initializeBukkit() throws IllegalAccessException {
+	public static void initializeBukkit() {
 		BukkitInitialization.initializePackage();
 	}
 
diff --git a/modules/TinyProtocol/src/main/java/com/comphenix/tinyprotocol/TinyProtocol.java b/modules/TinyProtocol/src/main/java/com/comphenix/tinyprotocol/TinyProtocol.java
@@ -257,6 +257,7 @@ private void registerPlayers(Plugin plugin) {
 	 * Note that this is not executed on the main thread.
 	 * 
 	 * @param reciever - the receiving player, NULL for early login/status packets.
+	 * @param channel - the channel that received the packet. Never NULL.
 	 * @param remoteAddress - remote address of the sending client. Never NULL.
 	 * @param packet - the packet being sent.
 	 * @return The packet to send instead, or NULL to cancel the transmission.

Original file line number	Diff line number	Diff line change
`@@ -388,7 +388,7 @@ protected PacketEvent handleScheduled(Object instance, FieldAccessor accessor) {`
`388`	`388`	`* @return TRUE if it is, FALSE if not or unknown.`
`389`	`389`	`*/`
`390`	`390`	`private boolean guessCompression(ChannelHandler handler) {`
`391`		`- String className = handler != null ? handler.getClass().getCanonicalName() : null;`
	`391`	`+ String className = handler != null ? handler.getClass().getCanonicalName() : "";`
`392`	`392`	`return className.contains("Compressor") \|\| className.contains("Decompressor");`
`393`	`393`	`}`
`394`	`394`