Replaces old for loop style with the newer foreach loop

Signed-off-by: Otavio R. Piske <angusyoung@gmail.com>

Author: orpiske

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/src/main/java-templates/org/eclipse/paho/client/mqttv3/internal/ClientComms.java

@@ -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/MqttAsyncClient.java

@@ -928,10 +928,10 @@ public IMqttToken subscribe(String[] topicFilters, int[] qos, Object userContext
 		}
 
 		// remove any message handlers for individual topics and validate topicFilter
-		for (int i = 0; i < topicFilters.length; ++i) {
+		for (String topicFilter : topicFilters) {
 			// Check if the topic filter is valid before subscribing
-			MqttTopic.validate(topicFilters[i], true/* allow wildcards */);
-			this.comms.removeMessageListener(topicFilters[i]);
+			MqttTopic.validate(topicFilter, true/* allow wildcards */);
+			this.comms.removeMessageListener(topicFilter);
 		}
 
 		return this.subscribeBase(topicFilters, qos, userContext, callback);
@@ -1028,8 +1028,8 @@ public IMqttToken subscribe(String[] topicFilters, int[] qos, Object userContext
 			token = this.subscribeBase(topicFilters, qos, userContext, callback);
 		} catch(Exception e) {
 			// if the subscribe fails, then we have to remove the message handlers
-			for (int i = 0; i < topicFilters.length; ++i) {
-				this.comms.removeMessageListener(topicFilters[i]);
+			for (String topicFilter : topicFilters) {
+				this.comms.removeMessageListener(topicFilter);
 			}
 			throw e;
 		}
@@ -1097,17 +1097,17 @@ public IMqttToken unsubscribe(String[] topicFilters, Object userContext, IMqttAc
 			log.fine(CLASS_NAME, methodName, "107", new Object[] { subs, userContext, callback });
 		}
 
-		for (int i = 0; i < topicFilters.length; i++) {
+		for (String topicFilter : topicFilters) {
 			// Check if the topic filter is valid before unsubscribing
 			// Although we already checked when subscribing, but invalid
 			// topic filter is meanless for unsubscribing, just prohibit it
 			// to reduce unnecessary control packet send to broker.
-			MqttTopic.validate(topicFilters[i], true/* allow wildcards */);
+			MqttTopic.validate(topicFilter, true/* allow wildcards */);
 		}
 
 		// remove message handlers from the list for this client
-		for (int i = 0; i < topicFilters.length; ++i) {
-			this.comms.removeMessageListener(topicFilters[i]);
+		for (String topicFilter : topicFilters) {
+			this.comms.removeMessageListener(topicFilter);
 		}
 
 		MqttToken token = new MqttToken(getClientId());

org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/internal/wire/MqttSuback.java

@@ -53,8 +53,8 @@ protected byte[] getVariableHeader() throws MqttException {
 	public String toString() {
 		StringBuffer sb = new StringBuffer();
 		sb.append(super.toString()).append(" granted Qos");
-		for (int i = 0; i < grantedQos.length; ++i) {
-			sb.append(" ").append(grantedQos[i]);
+		for (int grantedQo : grantedQos) {
+			sb.append(" ").append(grantedQo);
 		}
 		return sb.toString();
 	}

org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/internal/wire/MqttSubscribe.java

@@ -85,8 +85,8 @@ public MqttSubscribe(String[] names, int[] qos) {
 
 		this.count = names.length;
 
-		for (int i = 0; i < qos.length; i++) {
-			MqttMessage.validateQos(qos[i]);
+		for (int qo : qos) {
+			MqttMessage.validateQos(qo);
 		}
 	}
 

org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/internal/wire/MqttUnsubscribe.java

@@ -110,8 +110,8 @@ public byte[] getPayload() throws MqttException {
 		try {
 			ByteArrayOutputStream baos = new ByteArrayOutputStream();
 			DataOutputStream dos = new DataOutputStream(baos);
-			for (int i = 0; i < names.length; i++) {
-				encodeUTF8(dos, names[i]);
+			for (String name : names) {
+				encodeUTF8(dos, name);
 			}
 			dos.flush();
 			return baos.toByteArray();

org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/logging/JSR47Logger.java

@@ -261,16 +261,16 @@ protected static void dumpMemoryTrace47(java.util.logging.Logger logger) {
 
 		if (logger!= null) {
 			Handler[] handlers = logger.getHandlers();
-			
-		    for (int i=0; i<handlers.length; i++) {
-		      if (handlers[i] instanceof java.util.logging.MemoryHandler) {
-		        synchronized (handlers[i]) {
-		        	mHand = ((java.util.logging.MemoryHandler)handlers[i]);
-		        	mHand.push();
-		        	return;
-		        } // synchronized (handler).
-		      }      
-		    } // for handlers...
+
+			for (Handler handler : handlers) {
+				if (handler instanceof MemoryHandler) {
+					synchronized (handler) {
+						mHand = ((MemoryHandler) handler);
+						mHand.push();
+						return;
+					} // synchronized (handler).
+				}
+			} // for handlers...
 		    dumpMemoryTrace47(logger.getParent());
 		}
 	}

org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/persist/MqttDefaultFilePersistence.java

@@ -245,9 +245,9 @@ public Enumeration<String> keys() throws MqttPersistenceException {
 		checkIsOpen();
 		File[] files = getFiles();
 		Vector<String> result = new Vector<String>(files.length);
-		for (int i=0;i<files.length;i++) {
-			String filename = files[i].getName();
-			String key = filename.substring(0,filename.length()-MESSAGE_FILE_EXTENSION.length());
+		for (File file : files) {
+			String filename = file.getName();
+			String key = filename.substring(0, filename.length() - MESSAGE_FILE_EXTENSION.length());
 			result.addElement(key);
 		}
 		return result.elements();
@@ -280,12 +280,12 @@ private void restoreBackups(File dir) throws MqttPersistenceException {
 			throw new MqttPersistenceException();
 		}
 
-		for (int i=0;i<files.length;i++) {
-			File originalFile = new File(dir,files[i].getName().substring(0,files[i].getName().length()-MESSAGE_BACKUP_FILE_EXTENSION.length()));
-			boolean result = files[i].renameTo(originalFile);
+		for (File file : files) {
+			File originalFile = new File(dir, file.getName().substring(0, file.getName().length() - MESSAGE_BACKUP_FILE_EXTENSION.length()));
+			boolean result = file.renameTo(originalFile);
 			if (!result) {
 				originalFile.delete();
-				files[i].renameTo(originalFile);
+				file.renameTo(originalFile);
 			}
 		}
 	}
@@ -299,8 +299,8 @@ public boolean containsKey(String key) throws MqttPersistenceException {
 	public void clear() throws MqttPersistenceException {
 		checkIsOpen();
 		File[] files = getFiles();
-		for (int i=0; i<files.length; i++) {
-			files[i].delete();
+		for (File file : files) {
+			file.delete();
 		}
 		clientDir.delete();
 	}