From 0cdff0bede52cff8e7a90bac73ddfd9f3d1ee134 Mon Sep 17 00:00:00 2001 From: Branden Clark Date: Tue, 28 Jan 2025 17:38:45 -0800 Subject: [PATCH 1/2] Check hasNext when looking for ordered UserDestinationResult sessionIds Signed-off-by: Branden Clark --- .../user/UserDestinationMessageHandler.java | 2 +- .../UserDestinationMessageHandlerTests.java | 21 +++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/user/UserDestinationMessageHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/user/UserDestinationMessageHandler.java index ddd4226a6073..0b41ac56612e 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/user/UserDestinationMessageHandler.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/user/UserDestinationMessageHandler.java @@ -280,7 +280,7 @@ public void send(UserDestinationResult destinationResult, Message message) th Iterator itr = (sessionIds != null ? sessionIds.iterator() : null); for (String target : destinationResult.getTargetDestinations()) { - String sessionId = (itr != null ? itr.next() : null); + String sessionId = (itr != null && itr.hasNext() ? itr.next() : null); getTemplateToUse(sessionId).send(target, message); } } diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/user/UserDestinationMessageHandlerTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/user/UserDestinationMessageHandlerTests.java index 0f2548f879e7..4e3ca1318b2b 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/user/UserDestinationMessageHandlerTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/user/UserDestinationMessageHandlerTests.java @@ -17,6 +17,7 @@ package org.springframework.messaging.simp.user; import java.nio.charset.StandardCharsets; +import java.util.Set; import org.jspecify.annotations.Nullable; import org.junit.jupiter.api.Test; @@ -98,6 +99,26 @@ void handleMessage() { assertThat(accessor.getFirstNativeHeader(ORIGINAL_DESTINATION)).isEqualTo("/user/queue/foo"); } + @Test + @SuppressWarnings("rawtypes") + void handleMessageWithoutSessionIds() { + UserDestinationResolver resolver = mock(); + Message message = createWith(SimpMessageType.MESSAGE, "joe", null, "/user/joe/queue/foo"); + UserDestinationResult result = new UserDestinationResult("/queue/foo-user123", Set.of("/queue/foo-user123"), "/user/queue/foo", "joe"); + given(resolver.resolveDestination(message)).willReturn(result); + + given(this.brokerChannel.send(Mockito.any(Message.class))).willReturn(true); + UserDestinationMessageHandler handler = new UserDestinationMessageHandler(new StubMessageChannel(), this.brokerChannel, resolver); + handler.handleMessage(message); + + ArgumentCaptor captor = ArgumentCaptor.forClass(Message.class); + Mockito.verify(this.brokerChannel).send(captor.capture()); + + SimpMessageHeaderAccessor accessor = SimpMessageHeaderAccessor.wrap(captor.getValue()); + assertThat(accessor.getDestination()).isEqualTo("/queue/foo-user123"); + assertThat(accessor.getFirstNativeHeader(ORIGINAL_DESTINATION)).isEqualTo("/user/queue/foo"); + } + @Test @SuppressWarnings("rawtypes") void handleMessageWithoutActiveSession() { From c9c5446e871ee88a5412da8b3509fe4281a9b5f9 Mon Sep 17 00:00:00 2001 From: Branden Clark Date: Fri, 31 Jan 2025 17:13:12 -0800 Subject: [PATCH 2/2] Make sessionIds not nullable because default is provided Signed-off-by: Branden Clark --- .../messaging/simp/user/UserDestinationMessageHandler.java | 4 +--- .../messaging/simp/user/UserDestinationResult.java | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/user/UserDestinationMessageHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/user/UserDestinationMessageHandler.java index 0b41ac56612e..0b128242c722 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/user/UserDestinationMessageHandler.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/user/UserDestinationMessageHandler.java @@ -20,7 +20,6 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.apache.commons.logging.Log; @@ -276,8 +275,7 @@ public MessageSendingOperations getMessagingTemplate() { } public void send(UserDestinationResult destinationResult, Message message) throws MessagingException { - Set sessionIds = destinationResult.getSessionIds(); - Iterator itr = (sessionIds != null ? sessionIds.iterator() : null); + Iterator itr = destinationResult.getSessionIds().iterator(); for (String target : destinationResult.getTargetDestinations()) { String sessionId = (itr != null && itr.hasNext() ? itr.next() : null); diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/user/UserDestinationResult.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/user/UserDestinationResult.java index c47607bac9ab..d76b9c3ce066 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/user/UserDestinationResult.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/user/UserDestinationResult.java @@ -113,7 +113,7 @@ public String getSubscribeDestination() { /** * Return the session id for the targetDestination. */ - public @Nullable Set getSessionIds() { + public Set getSessionIds() { return this.sessionIds; }