Avoid inefficient keySet iteration in messaging classes

Issue: SPR-15553

Author: jhoeller

spring-messaging/src/main/java/org/springframework/messaging/simp/SimpMessagingTemplate.java

@@ -258,9 +258,9 @@ protected Map<String, Object> processHeadersToSend(Map<String, Object> headers)
 
 		SimpMessageHeaderAccessor headerAccessor = SimpMessageHeaderAccessor.create(SimpMessageType.MESSAGE);
 		initHeaders(headerAccessor);
-		for (String key : headers.keySet()) {
-			Object value = headers.get(key);
-			headerAccessor.setNativeHeader(key, (value != null ? value.toString() : null));
+		for (Map.Entry<String, Object> headerEntry : headers.entrySet()) {
+			Object value = headerEntry.getValue();
+			headerAccessor.setNativeHeader(headerEntry.getKey(), (value != null ? value.toString() : null));
 		}
 		return headerAccessor.getMessageHeaders();
 	}

spring-messaging/src/main/java/org/springframework/messaging/simp/broker/DefaultSubscriptionRegistry.java

@@ -431,8 +431,8 @@ public Set<Subscription> getSubscriptions(String destination) {
 		}
 
 		public Subscription getSubscription(String subscriptionId) {
-			for (String destination : this.destinationLookup.keySet()) {
-				Set<Subscription> subs = this.destinationLookup.get(destination);
+			for (Map.Entry<String, Set<DefaultSubscriptionRegistry.Subscription>> destinationEntry : this.destinationLookup.entrySet()) {
+				Set<Subscription> subs = destinationEntry.getValue();
 				if (subs != null) {
 					for (Subscription sub : subs) {
 						if (sub.getId().equalsIgnoreCase(subscriptionId)) {
@@ -459,17 +459,17 @@ public void addSubscription(String destination, String subscriptionId, Expressio
 		}
 
 		public String removeSubscription(String subscriptionId) {
-			for (String destination : this.destinationLookup.keySet()) {
-				Set<Subscription> subs = this.destinationLookup.get(destination);
+			for (Map.Entry<String, Set<DefaultSubscriptionRegistry.Subscription>> destinationEntry : this.destinationLookup.entrySet()) {
+				Set<Subscription> subs = destinationEntry.getValue();
 				if (subs != null) {
 					for (Subscription sub : subs) {
 						if (sub.getId().equals(subscriptionId) && subs.remove(sub)) {
 							synchronized (this.destinationLookup) {
 								if (subs.isEmpty()) {
-									this.destinationLookup.remove(destination);
+									this.destinationLookup.remove(destinationEntry.getKey());
 								}
 							}
-							return destination;
+							return destinationEntry.getKey();
 						}
 					}
 				}

spring-messaging/src/main/java/org/springframework/messaging/simp/broker/SimpleBrokerMessageHandler.java

@@ -19,6 +19,7 @@
 import java.security.Principal;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ScheduledFuture;
@@ -333,11 +334,11 @@ protected void sendMessageToSubscribers(String destination, Message<?> message)
 			logger.debug("Broadcasting to " + subscriptions.size() + " sessions.");
 		}
 		long now = System.currentTimeMillis();
-		for (String sessionId : subscriptions.keySet()) {
-			for (String subscriptionId : subscriptions.get(sessionId)) {
+		for (Map.Entry<String, List<String>> subscriptionEntry : subscriptions.entrySet()) {
+			for (String subscriptionId : subscriptionEntry.getValue()) {
 				SimpMessageHeaderAccessor headerAccessor = SimpMessageHeaderAccessor.create(SimpMessageType.MESSAGE);
 				initHeaders(headerAccessor);
-				headerAccessor.setSessionId(sessionId);
+				headerAccessor.setSessionId(subscriptionEntry.getKey());
 				headerAccessor.setSubscriptionId(subscriptionId);
 				headerAccessor.copyHeadersIfAbsent(message.getHeaders());
 				Object payload = message.getPayload();
@@ -349,7 +350,7 @@ protected void sendMessageToSubscribers(String destination, Message<?> message)
 					logger.error("Failed to send " + message, ex);
 				}
 				finally {
-					SessionInfo info = this.sessions.get(sessionId);
+					SessionInfo info = this.sessions.get(subscriptionEntry.getKey());
 					if (info != null) {
 						info.setLastWriteTime(now);
 					}

spring-messaging/src/main/java/org/springframework/messaging/support/NativeMessageHeaderAccessor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -191,9 +191,9 @@ public void addNativeHeaders(MultiValueMap<String, String> headers) {
 		if (headers == null) {
 			return;
 		}
-		for (String header : headers.keySet()) {
-			for (String value : headers.get(header)) {
-				addNativeHeader(header, value);
+		for (Map.Entry<String, List<String>> headerEntry : headers.entrySet()) {
+			for (String value : headerEntry.getValue()) {
+				addNativeHeader(headerEntry.getKey(), value);
 			}
 		}
 	}