Fix some issues detected by FindBugs.

rogermb · rogermb · commit 3f78c6f29755 · 2016-03-31T17:57:29.000+02:00
diff --git a/src/main/java/com/github/theholywaffle/teamspeak3/api/wrapper/Client.java b/src/main/java/com/github/theholywaffle/teamspeak3/api/wrapper/Client.java
@@ -102,7 +102,7 @@ public int[] getServerGroups() {
 		final String[] arr = str.split(",");
 		final int[] groups = new int[arr.length];
 		for (int i = 0; i < groups.length; i++) {
-			groups[i] = Integer.valueOf(arr[i]);
+			groups[i] = Integer.parseInt(arr[i]);
 		}
 		return groups;
 	}
diff --git a/src/main/java/com/github/theholywaffle/teamspeak3/api/wrapper/ClientInfo.java b/src/main/java/com/github/theholywaffle/teamspeak3/api/wrapper/ClientInfo.java
@@ -72,7 +72,7 @@ public int getDefaultChannel() {
 		// TeamSpeak decided to prefix the channel ID with a forward slash (/)...
 		final String channelId = get(ClientProperty.CLIENT_DEFAULT_CHANNEL);
 		if (channelId.isEmpty()) return -1;
-		return Integer.valueOf(channelId.substring(1));
+		return Integer.parseInt(channelId.substring(1));
 	}
 
 	public String getDefaultToken() {
diff --git a/src/main/java/com/github/theholywaffle/teamspeak3/api/wrapper/Wrapper.java b/src/main/java/com/github/theholywaffle/teamspeak3/api/wrapper/Wrapper.java
@@ -134,7 +134,7 @@ public long getLong(String propertyName) {
 		if (value == null || value.isEmpty()) {
 			return -1L;
 		}
-		return Long.valueOf(value);
+		return Long.parseLong(value);
 	}
 
 	/**
@@ -164,7 +164,7 @@ public int getInt(String propertyName) {
 		if (value == null || value.isEmpty()) {
 			return -1;
 		}
-		return Integer.valueOf(value);
+		return Integer.parseInt(value);
 	}
 
 	/**
diff --git a/src/main/java/com/github/theholywaffle/teamspeak3/commands/CChannelCreate.java b/src/main/java/com/github/theholywaffle/teamspeak3/commands/CChannelCreate.java
@@ -38,12 +38,13 @@ public CChannelCreate(String name, Map<ChannelProperty, String> options) {
 		add(new KeyValueParam("channel_name", name));
 
 		if (options != null) {
-			for (final ChannelProperty p : options.keySet()) {
+			for (Map.Entry<ChannelProperty, String> option : options.entrySet()) {
+				final ChannelProperty p = option.getKey();
 				if (!p.isChangeable()) {
 					throw new IllegalArgumentException("ChannelProperty " + p.getName() + " is not changeable!");
 				}
 
-				add(new KeyValueParam(p.getName(), options.get(p)));
+				add(new KeyValueParam(p.getName(), option.getValue()));
 			}
 		}
 	}
diff --git a/src/main/java/com/github/theholywaffle/teamspeak3/commands/CChannelEdit.java b/src/main/java/com/github/theholywaffle/teamspeak3/commands/CChannelEdit.java
@@ -38,12 +38,13 @@ public CChannelEdit(int channelId, Map<ChannelProperty, String> options) {
 		add(new KeyValueParam("cid", channelId));
 
 		if (options != null) {
-			for (final ChannelProperty p : options.keySet()) {
+			for (Map.Entry<ChannelProperty, String> option : options.entrySet()) {
+				final ChannelProperty p = option.getKey();
 				if (!p.isChangeable()) {
 					throw new IllegalArgumentException("ChannelProperty " + p.getName() + " is not changeable!");
 				}
 
-				add(new KeyValueParam(p.getName(), options.get(p)));
+				add(new KeyValueParam(p.getName(), option.getValue()));
 			}
 		}
 	}
diff --git a/src/main/java/com/github/theholywaffle/teamspeak3/commands/CClientDBEdit.java b/src/main/java/com/github/theholywaffle/teamspeak3/commands/CClientDBEdit.java
@@ -38,12 +38,13 @@ public CClientDBEdit(int clientDBId, Map<ClientProperty, String> options) {
 		add(new KeyValueParam("cldbid", clientDBId));
 
 		if (options != null) {
-			for (final ClientProperty p : options.keySet()) {
+			for (Map.Entry<ClientProperty, String> option : options.entrySet()) {
+				final ClientProperty p = option.getKey();
 				if (!p.isChangeable()) {
 					throw new IllegalArgumentException("ClientProperty " + p.getName() + " is not changeable!");
 				}
 
-				add(new KeyValueParam(p.getName(), options.get(p)));
+				add(new KeyValueParam(p.getName(), option.getValue()));
 			}
 		}
 	}
diff --git a/src/main/java/com/github/theholywaffle/teamspeak3/commands/CClientEdit.java b/src/main/java/com/github/theholywaffle/teamspeak3/commands/CClientEdit.java
@@ -38,12 +38,13 @@ public CClientEdit(int clientId, Map<ClientProperty, String> options) {
 		add(new KeyValueParam("clid", clientId));
 
 		if (options != null) {
-			for (final ClientProperty p : options.keySet()) {
+			for (Map.Entry<ClientProperty, String> option : options.entrySet()) {
+				final ClientProperty p = option.getKey();
 				if (!p.isChangeable()) {
 					throw new IllegalArgumentException("ClientProperty " + p.getName() + " is not changeable!");
 				}
 
-				add(new KeyValueParam(p.getName(), options.get(p)));
+				add(new KeyValueParam(p.getName(), option.getValue()));
 			}
 		}
 	}
diff --git a/src/main/java/com/github/theholywaffle/teamspeak3/commands/CClientUpdate.java b/src/main/java/com/github/theholywaffle/teamspeak3/commands/CClientUpdate.java
@@ -37,12 +37,13 @@ public CClientUpdate(Map<ClientProperty, String> options) {
 		super("clientupdate");
 
 		if (options != null) {
-			for (final ClientProperty p : options.keySet()) {
+			for (Map.Entry<ClientProperty, String> option : options.entrySet()) {
+				final ClientProperty p = option.getKey();
 				if (!p.isChangeable()) {
 					throw new IllegalArgumentException("ClientProperty " + p.getName() + " is not changeable!");
 				}
 
-				add(new KeyValueParam(p.getName(), options.get(p)));
+				add(new KeyValueParam(p.getName(), option.getValue()));
 			}
 		}
 	}
diff --git a/src/main/java/com/github/theholywaffle/teamspeak3/commands/CServerCreate.java b/src/main/java/com/github/theholywaffle/teamspeak3/commands/CServerCreate.java
@@ -38,12 +38,13 @@ public CServerCreate(String name, Map<VirtualServerProperty, String> map) {
 		add(new KeyValueParam(VirtualServerProperty.VIRTUALSERVER_NAME.getName(), name));
 
 		if (map != null) {
-			for (final VirtualServerProperty p : map.keySet()) {
+			for (Map.Entry<VirtualServerProperty, String> option : map.entrySet()) {
+				final VirtualServerProperty p = option.getKey();
 				if (!p.isChangeable()) {
 					throw new IllegalArgumentException("VirtualServerProperty " + p.getName() + " is not changeable!");
 				}
 
-				add(new KeyValueParam(p.getName(), map.get(p)));
+				add(new KeyValueParam(p.getName(), option.getValue()));
 			}
 		}
 
diff --git a/src/main/java/com/github/theholywaffle/teamspeak3/commands/CServerEdit.java b/src/main/java/com/github/theholywaffle/teamspeak3/commands/CServerEdit.java
@@ -36,12 +36,13 @@ public class CServerEdit extends Command {
 	public CServerEdit(Map<VirtualServerProperty, String> map) {
 		super("serveredit");
 
-		for (final VirtualServerProperty p : map.keySet()) {
+		for (Map.Entry<VirtualServerProperty, String> option : map.entrySet()) {
+			final VirtualServerProperty p = option.getKey();
 			if (!p.isChangeable()) {
 				throw new IllegalArgumentException("VirtualServerProperty " + p.getName() + " is not changeable!");
 			}
 
-			add(new KeyValueParam(p.getName(), map.get(p)));
+			add(new KeyValueParam(p.getName(), option.getValue()));
 		}
 	}
 }
diff --git a/src/main/java/com/github/theholywaffle/teamspeak3/commands/Command.java b/src/main/java/com/github/theholywaffle/teamspeak3/commands/Command.java
@@ -115,11 +115,11 @@ public Command reset() {
 	}
 
 	public String toString() {
-		String str = command;
+		StringBuilder builder = new StringBuilder(command);
 		for (final Parameter p : params) {
-			str += " " + p;
+			builder.append(" ").append(p);
 		}
-		return str;
+		return builder.toString();
 	}
 
 	public String getRaw() {

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ public int[] getServerGroups() {`
`102`	`102`	`final String[] arr = str.split(",");`
`103`	`103`	`final int[] groups = new int[arr.length];`
`104`	`104`	`for (int i = 0; i < groups.length; i++) {`
`105`		`- groups[i] = Integer.valueOf(arr[i]);`
	`105`	`+ groups[i] = Integer.parseInt(arr[i]);`
`106`	`106`	`}`
`107`	`107`	`return groups;`
`108`	`108`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public int getDefaultChannel() {`
`72`	`72`	`// TeamSpeak decided to prefix the channel ID with a forward slash (/)...`
`73`	`73`	`final String channelId = get(ClientProperty.CLIENT_DEFAULT_CHANNEL);`
`74`	`74`	`if (channelId.isEmpty()) return -1;`
`75`		`- return Integer.valueOf(channelId.substring(1));`
	`75`	`+ return Integer.parseInt(channelId.substring(1));`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`public String getDefaultToken() {`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ public long getLong(String propertyName) {`
`134`	`134`	`if (value == null \|\| value.isEmpty()) {`
`135`	`135`	`return -1L;`
`136`	`136`	`}`
`137`		`- return Long.valueOf(value);`
	`137`	`+ return Long.parseLong(value);`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`/**`
`@@ -164,7 +164,7 @@ public int getInt(String propertyName) {`
`164`	`164`	`if (value == null \|\| value.isEmpty()) {`
`165`	`165`	`return -1;`
`166`	`166`	`}`
`167`		`- return Integer.valueOf(value);`
	`167`	`+ return Integer.parseInt(value);`
`168`	`168`	`}`
`169`	`169`
`170`	`170`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -38,12 +38,13 @@ public CChannelCreate(String name, Map<ChannelProperty, String> options) {`
`38`	`38`	`add(new KeyValueParam("channel_name", name));`
`39`	`39`
`40`	`40`	`if (options != null) {`
`41`		`- for (final ChannelProperty p : options.keySet()) {`
	`41`	`+ for (Map.Entry<ChannelProperty, String> option : options.entrySet()) {`
	`42`	`+ final ChannelProperty p = option.getKey();`
`42`	`43`	`if (!p.isChangeable()) {`
`43`	`44`	`throw new IllegalArgumentException("ChannelProperty " + p.getName() + " is not changeable!");`
`44`	`45`	`}`
`45`	`46`
`46`		`- add(new KeyValueParam(p.getName(), options.get(p)));`
	`47`	`+ add(new KeyValueParam(p.getName(), option.getValue()));`
`47`	`48`	`}`
`48`	`49`	`}`
`49`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,12 +38,13 @@ public CChannelEdit(int channelId, Map<ChannelProperty, String> options) {`
`38`	`38`	`add(new KeyValueParam("cid", channelId));`
`39`	`39`
`40`	`40`	`if (options != null) {`
`41`		`- for (final ChannelProperty p : options.keySet()) {`
	`41`	`+ for (Map.Entry<ChannelProperty, String> option : options.entrySet()) {`
	`42`	`+ final ChannelProperty p = option.getKey();`
`42`	`43`	`if (!p.isChangeable()) {`
`43`	`44`	`throw new IllegalArgumentException("ChannelProperty " + p.getName() + " is not changeable!");`
`44`	`45`	`}`
`45`	`46`
`46`		`- add(new KeyValueParam(p.getName(), options.get(p)));`
	`47`	`+ add(new KeyValueParam(p.getName(), option.getValue()));`
`47`	`48`	`}`
`48`	`49`	`}`
`49`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,12 +38,13 @@ public CClientDBEdit(int clientDBId, Map<ClientProperty, String> options) {`
`38`	`38`	`add(new KeyValueParam("cldbid", clientDBId));`
`39`	`39`
`40`	`40`	`if (options != null) {`
`41`		`- for (final ClientProperty p : options.keySet()) {`
	`41`	`+ for (Map.Entry<ClientProperty, String> option : options.entrySet()) {`
	`42`	`+ final ClientProperty p = option.getKey();`
`42`	`43`	`if (!p.isChangeable()) {`
`43`	`44`	`throw new IllegalArgumentException("ClientProperty " + p.getName() + " is not changeable!");`
`44`	`45`	`}`
`45`	`46`
`46`		`- add(new KeyValueParam(p.getName(), options.get(p)));`
	`47`	`+ add(new KeyValueParam(p.getName(), option.getValue()));`
`47`	`48`	`}`
`48`	`49`	`}`
`49`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,12 +38,13 @@ public CClientEdit(int clientId, Map<ClientProperty, String> options) {`
`38`	`38`	`add(new KeyValueParam("clid", clientId));`
`39`	`39`
`40`	`40`	`if (options != null) {`
`41`		`- for (final ClientProperty p : options.keySet()) {`
	`41`	`+ for (Map.Entry<ClientProperty, String> option : options.entrySet()) {`
	`42`	`+ final ClientProperty p = option.getKey();`
`42`	`43`	`if (!p.isChangeable()) {`
`43`	`44`	`throw new IllegalArgumentException("ClientProperty " + p.getName() + " is not changeable!");`
`44`	`45`	`}`
`45`	`46`
`46`		`- add(new KeyValueParam(p.getName(), options.get(p)));`
	`47`	`+ add(new KeyValueParam(p.getName(), option.getValue()));`
`47`	`48`	`}`
`48`	`49`	`}`
`49`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,12 +37,13 @@ public CClientUpdate(Map<ClientProperty, String> options) {`
`37`	`37`	`super("clientupdate");`
`38`	`38`
`39`	`39`	`if (options != null) {`
`40`		`- for (final ClientProperty p : options.keySet()) {`
	`40`	`+ for (Map.Entry<ClientProperty, String> option : options.entrySet()) {`
	`41`	`+ final ClientProperty p = option.getKey();`
`41`	`42`	`if (!p.isChangeable()) {`
`42`	`43`	`throw new IllegalArgumentException("ClientProperty " + p.getName() + " is not changeable!");`
`43`	`44`	`}`
`44`	`45`
`45`		`- add(new KeyValueParam(p.getName(), options.get(p)));`
	`46`	`+ add(new KeyValueParam(p.getName(), option.getValue()));`
`46`	`47`	`}`
`47`	`48`	`}`
`48`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,12 +38,13 @@ public CServerCreate(String name, Map<VirtualServerProperty, String> map) {`
`38`	`38`	`add(new KeyValueParam(VirtualServerProperty.VIRTUALSERVER_NAME.getName(), name));`
`39`	`39`
`40`	`40`	`if (map != null) {`
`41`		`- for (final VirtualServerProperty p : map.keySet()) {`
	`41`	`+ for (Map.Entry<VirtualServerProperty, String> option : map.entrySet()) {`
	`42`	`+ final VirtualServerProperty p = option.getKey();`
`42`	`43`	`if (!p.isChangeable()) {`
`43`	`44`	`throw new IllegalArgumentException("VirtualServerProperty " + p.getName() + " is not changeable!");`
`44`	`45`	`}`
`45`	`46`
`46`		`- add(new KeyValueParam(p.getName(), map.get(p)));`
	`47`	`+ add(new KeyValueParam(p.getName(), option.getValue()));`
`47`	`48`	`}`
`48`	`49`	`}`
`49`	`50`
Original file line number	Diff line number	Diff line change
`@@ -36,12 +36,13 @@ public class CServerEdit extends Command {`
`36`	`36`	`public CServerEdit(Map<VirtualServerProperty, String> map) {`
`37`	`37`	`super("serveredit");`
`38`	`38`
`39`		`- for (final VirtualServerProperty p : map.keySet()) {`
	`39`	`+ for (Map.Entry<VirtualServerProperty, String> option : map.entrySet()) {`
	`40`	`+ final VirtualServerProperty p = option.getKey();`
`40`	`41`	`if (!p.isChangeable()) {`
`41`	`42`	`throw new IllegalArgumentException("VirtualServerProperty " + p.getName() + " is not changeable!");`
`42`	`43`	`}`
`43`	`44`
`44`		`- add(new KeyValueParam(p.getName(), map.get(p)));`
	`45`	`+ add(new KeyValueParam(p.getName(), option.getValue()));`
`45`	`46`	`}`
`46`	`47`	`}`
`47`	`48`	`}`