Merge branch 'orpiske-code-cleanups' into develop

Author: Ian Craggs

org.eclipse.paho.client.mqttv3.test/src/test/java/org/eclipse/paho/client/mqttv3/test/BasicTest.java

@@ -319,7 +319,7 @@ public void testConnOptDefaults() throws Exception {
 
     log.info("Check MqttConnectOptions defaults");
     MqttConnectOptions connOpts = new MqttConnectOptions();
-    Assert.assertEquals(new Integer(connOpts.getKeepAliveInterval()), new Integer(60));
+    Assert.assertEquals(Integer.valueOf(connOpts.getKeepAliveInterval()), Integer.valueOf(60));
     Assert.assertNull(connOpts.getPassword());
     Assert.assertNull(connOpts.getUserName());
     Assert.assertNull(connOpts.getSocketFactory());

org.eclipse.paho.client.mqttv3.test/src/test/java/org/eclipse/paho/client/mqttv3/test/LiveTakeOverTest.java

@@ -45,7 +45,7 @@ public class LiveTakeOverTest {
   private static String topicPrefix;
 
 
-  static enum FirstClientState {
+  enum FirstClientState {
     INITIAL,
     READY,
     RUNNING,

org.eclipse.paho.client.mqttv3.test/src/test/java/org/eclipse/paho/client/mqttv3/test/ModelTestCase.java

@@ -470,7 +470,7 @@ public void subscribe() throws Exception {
   public void subscribe(String topic, int qos, boolean expectRetained) throws Exception {
     logToFile("subscribe [topic:" + topic + "][qos:" + qos + "][expectRetained:" + expectRetained
               + "]");
-    subscribedTopics.put(topic, new Integer(qos));
+    subscribedTopics.put(topic, Integer.valueOf(qos));
     client.subscribe(topic, qos);
     if (expectRetained) {
       waitForMessage(topic, retainedPublishes.get(topic), true);

org.eclipse.paho.client.mqttv3.test/src/test/java/org/eclipse/paho/client/mqttv3/test/SendReceiveAsyncTest.java

@@ -337,8 +337,8 @@ public void testMultipleClients() {
 
       for (int iMessage = 0; iMessage < 10; iMessage++) {
         byte[] payload = ("Message " + iMessage).getBytes();
-        for (int i = 0; i < mqttPublisher.length; i++) {
-          pubToken = mqttPublisher[i].publish(topicNames[0], payload, 0, false, null, null);
+        for (IMqttAsyncClient iMqttAsyncClient : mqttPublisher) {
+          pubToken = iMqttAsyncClient.publish(topicNames[0], payload, 0, false, null, null);
           log.info("Publishing to..." + topicNames[0]);
           pubToken.waitForCompletion();
         }

org.eclipse.paho.client.mqttv3.test/src/test/java/org/eclipse/paho/client/mqttv3/test/logging/LoggerDumper.java

@@ -73,8 +73,7 @@ else if (rootNode.getLogger() == logger) {
       parentNode = findParentNode(parent);
 
       LoggerNode found = null;
-      for (Iterator<LoggerNode> iterator = parentNode.getChildren().iterator(); iterator.hasNext();) {
-        LoggerNode childNode = iterator.next();
+      for (LoggerNode childNode : parentNode.getChildren()) {
         if (childNode.getLogger() == logger) {
           found = childNode;
           break;
@@ -125,8 +124,7 @@ private void dumpLoggerNode(LoggerNode node, int indent, StringBuilder sb) {
       sb.append(StringUtilities.NL);
     }
 
-    for (Iterator<LoggerNode> iterator = node.getChildren().iterator(); iterator.hasNext();) {
-      LoggerNode child = iterator.next();
+    for (LoggerNode child : node.getChildren()) {
       dumpLoggerNode(child, indent + 1, sb);
     }
   }

org.eclipse.paho.client.mqttv3.test/src/test/java/org/eclipse/paho/client/mqttv3/test/properties/TestProperties.java

@@ -429,8 +429,8 @@ public static List<String> getServerURIsAsListOfStrings() throws URISyntaxExcept
 
     List<String> list2 = new ArrayList<String>();
 
-    for (int i = 0; i < list1.size(); i++) {
-      list2.add(list1.get(i).toString());
+    for (URI uri : list1) {
+      list2.add(uri.toString());
     }
 
     return list2;

org.eclipse.paho.client.mqttv3.test/src/test/java/org/eclipse/paho/client/mqttv3/test/utilities/MqttV3Receiver.java

@@ -204,7 +204,7 @@ public boolean validateReceipt(List<String> sendTopics, List<Integer> expectedQo
     log.entering(className, methodName, new Object[]{
         sendTopics, expectedQosList, sentBytes});
 
-    int expectedMessageNumbers[] = new int[nPublishers];
+    int[] expectedMessageNumbers = new int[nPublishers];
     for (int i = 0; i < nPublishers; i++) {
       expectedMessageNumbers[i] = 0;
     }

org.eclipse.paho.client.mqttv3/src/main/java-templates/org/eclipse/paho/client/mqttv3/internal/ClientComms.java

@@ -667,7 +667,7 @@ public Properties getDebug() {
 		props.put("conState", Integer.valueOf(conState));
 		props.put("serverURI", getClient().getServerURI());
 		props.put("callback", callback);
-		props.put("stoppingComms", new Boolean(stoppingComms));
+		props.put("stoppingComms", Boolean.valueOf(stoppingComms));
 		return props;
 	}
 
@@ -708,8 +708,8 @@ public void run() {
 				// This will have been set if disconnect occurred before delivery was
 				// fully processed.
 				MqttDeliveryToken[] toks = tokenStore.getOutstandingDelTokens();
-				for (int i=0; i<toks.length; i++) {
-					toks[i].internalTok.setException(null);
+				for (MqttDeliveryToken tok : toks) {
+					tok.internalTok.setException(null);
 				}
 
 				// Save the connect token in tokenStore as failure can occur before send

org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/IMqttActionListener.java

@@ -15,7 +15,7 @@ public interface IMqttActionListener {
 	 * This method is invoked when an action has completed successfully.  
 	 * @param asyncActionToken associated with the action that has completed
 	 */
-	public void onSuccess(IMqttToken asyncActionToken );
+    void onSuccess(IMqttToken asyncActionToken);
 	/**
 	 * This method is invoked when an action fails.  
 	 * If a client is disconnected while an action is in progress 
@@ -26,5 +26,5 @@ public interface IMqttActionListener {
 	 * @param asyncActionToken associated with the action that has failed
 	 * @param exception thrown by the action that has failed
 	 */
-	public void onFailure(IMqttToken asyncActionToken, Throwable exception);
+    void onFailure(IMqttToken asyncActionToken, Throwable exception);
 }