Minor code cleanup in Wrapper, DefaultArrayResponse, TS3ApiAsync

Author: rogermb

src/main/java/com/github/theholywaffle/teamspeak3/TS3ApiAsync.java

@@ -5189,10 +5189,9 @@ public CommandFuture<Void> uploadFileDirect(byte[] data, String filePath, boolea
 	 * @see #downloadIcon(OutputStream, long)
 	 */
 	public CommandFuture<Long> uploadIcon(InputStream dataIn, long dataLength) {
-		FileTransferHelper helper = query.getFileTransferHelper();
 		byte[] data;
 		try {
-			data = helper.readFully(dataIn, dataLength);
+			data = FileTransferHelper.readFully(dataIn, dataLength);
 		} catch (IOException e) {
 			throw new TS3FileTransferFailedException("Reading stream failed", e);
 		}
@@ -5219,10 +5218,9 @@ public CommandFuture<Long> uploadIcon(InputStream dataIn, long dataLength) {
 	 * @see #downloadIconDirect(long)
 	 */
 	public CommandFuture<Long> uploadIconDirect(byte[] data) {
-		FileTransferHelper helper = query.getFileTransferHelper();
 		CommandFuture<Long> future = new CommandFuture<>();
 
-		long iconId = helper.getIconId(data);
+		long iconId = FileTransferHelper.getIconId(data);
 		String path = "/icon_" + iconId;
 
 		uploadFileDirect(data, path, false, 0)

src/main/java/com/github/theholywaffle/teamspeak3/api/wrapper/Wrapper.java

@@ -44,7 +44,11 @@
  */
 public class Wrapper {
 
-	public static final Wrapper EMPTY = new Wrapper(Collections.<String, String>emptyMap());
+	/**
+	 * An empty wrapper whose getters will always return the default values
+	 * ({@code -1}, {@code false}, or {@code ""}).
+	 */
+	public static final Wrapper EMPTY = new Wrapper(Collections.emptyMap());
 
 	private final Map<String, String> map;
 
@@ -103,11 +107,8 @@ public boolean getBoolean(Property property) {
 	 * @return the double value of the property or {@code -1.0} if the property doesn't exist
 	 */
 	public double getDouble(String propertyName) {
-		final String value = get(propertyName);
-		if (value == null || value.isEmpty()) {
-			return -1D;
-		}
-		return Double.valueOf(value);
+		String value = get(propertyName);
+		return value.isEmpty() ? -1D : Double.parseDouble(value);
 	}
 
 	/**
@@ -133,11 +134,8 @@ public double getDouble(Property property) {
 	 * @return the long value of the property or {@code -1} if the property doesn't exist
 	 */
 	public long getLong(String propertyName) {
-		final String value = get(propertyName);
-		if (value == null || value.isEmpty()) {
-			return -1L;
-		}
-		return Long.parseLong(value);
+		String value = get(propertyName);
+		return value.isEmpty() ? -1L : Long.parseLong(value);
 	}
 
 	/**
@@ -163,11 +161,8 @@ public long getLong(Property property) {
 	 * @return the integer value of the property or {@code -1} if the property doesn't exist
 	 */
 	public int getInt(String propertyName) {
-		final String value = get(propertyName);
-		if (value == null || value.isEmpty()) {
-			return -1;
-		}
-		return Integer.parseInt(value);
+		String value = get(propertyName);
+		return value.isEmpty() ? -1 : Integer.parseInt(value);
 	}
 
 	/**

src/main/java/com/github/theholywaffle/teamspeak3/commands/response/DefaultArrayResponse.java

@@ -90,7 +90,7 @@ private static Map<String, String> parseMap(String rawMap) {
 		return map;
 	}
 
-	private static final DefaultArrayResponse EMPTY = new DefaultArrayResponse(new ArrayList<Wrapper>(0), "");
+	private static final DefaultArrayResponse EMPTY = new DefaultArrayResponse(Collections.emptyList(), "");
 
 	private final List<Wrapper> responses;
 	private final String rawResponse;