Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ protected void doSend(String destination, Message<?> message) {
else {
// Try and keep the original accessor type
simpAccessor = (SimpMessageHeaderAccessor) MessageHeaderAccessor.getMutableAccessor(message);
simpAccessor.setLeaveMutable(true);
initHeaders(simpAccessor);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
package org.springframework.messaging.simp.user;

import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;

import org.jspecify.annotations.Nullable;
Expand All @@ -30,16 +32,21 @@
import org.springframework.messaging.SubscribableChannel;
import org.springframework.messaging.simp.SimpMessageHeaderAccessor;
import org.springframework.messaging.simp.SimpMessageType;
import org.springframework.messaging.simp.SimpMessagingTemplate;
import org.springframework.messaging.simp.broker.OrderedMessageChannelDecorator;
import org.springframework.messaging.simp.stomp.StompBrokerRelayMessageHandler;
import org.springframework.messaging.simp.stomp.StompCommand;
import org.springframework.messaging.simp.stomp.StompHeaderAccessor;
import org.springframework.messaging.support.ExecutorSubscribableChannel;
import org.springframework.messaging.support.ImmutableMessageChannelInterceptor;
import org.springframework.messaging.support.MessageBuilder;

import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;
import static org.springframework.messaging.simp.SimpMessageHeaderAccessor.ORIGINAL_DESTINATION;

/**
Expand Down Expand Up @@ -100,6 +107,31 @@ void handleMessage() {
assertThat(accessor.getFirstNativeHeader(ORIGINAL_DESTINATION)).isEqualTo("/user/queue/foo");
}

@Test
void handleMessageWithPreserveReceiveOrderToMultipleSessions() {
TestSimpUser simpUser = new TestSimpUser("joe");
simpUser.addSessions(new TestSimpSession("123"), new TestSimpSession("456"));
when(this.registry.getUser("joe")).thenReturn(simpUser);
ExecutorSubscribableChannel inboundChannel = new ExecutorSubscribableChannel();
OrderedMessageChannelDecorator.configureInterceptor(inboundChannel, true);
ExecutorSubscribableChannel brokerChannel = new ExecutorSubscribableChannel();
brokerChannel.addInterceptor(new ImmutableMessageChannelInterceptor());
List<String> destinations = new ArrayList<>();
brokerChannel.subscribe(message -> {
String destination = SimpMessageHeaderAccessor.getDestination(message.getHeaders());
if (destination != null && !destination.startsWith("/user/")) {
destinations.add(destination);
}
});
brokerChannel.subscribe(new UserDestinationMessageHandler(inboundChannel, brokerChannel,
new DefaultUserDestinationResolver(this.registry)));
SimpMessagingTemplate messagingTemplate = new SimpMessagingTemplate(brokerChannel);

messagingTemplate.convertAndSendToUser("joe", "/queue/foo", "data");

assertThat(destinations).containsExactlyInAnyOrder("/queue/foo-user123", "/queue/foo-user456");
}

@Test
@SuppressWarnings("rawtypes")
void handleMessageWithoutSessionIds() {
Expand Down