From 7a5b3c1eed58b3d4b3051a8f19509e02a74e2ba9 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@gopivotal.com>
Date: Fri, 27 Jun 2014 12:34:51 -0400
Subject: [PATCH] Append suffx to user dest in SimpMessagingTemplate

Isssue: SPR-11868
---
 .../messaging/simp/SimpMessagingTemplate.java |  5 +++--
 .../simp/SimpMessagingTemplateTests.java      | 19 +++++++++++++++++++
 ...essageBrokerBeanDefinitionParserTests.java |  2 +-
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/SimpMessagingTemplate.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/SimpMessagingTemplate.java
index 735d1f3c1a..b95bc4ff12 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/simp/SimpMessagingTemplate.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/SimpMessagingTemplate.java
@@ -77,8 +77,9 @@ public class SimpMessagingTemplate extends AbstractMessageSendingTemplate<String
 	 * @see org.springframework.messaging.simp.user.UserDestinationMessageHandler
 	 */
 	public void setUserDestinationPrefix(String prefix) {
-		Assert.notNull(prefix, "UserDestinationPrefix must not be null");
-		this.userDestinationPrefix = prefix;
+		Assert.hasText(prefix, "'userDestinationPrefix' must not be empty");
+		this.userDestinationPrefix = prefix.endsWith("/") ? prefix : prefix + "/";
+
 	}
 
 	/**
diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/SimpMessagingTemplateTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/SimpMessagingTemplateTests.java
index 1b2fe8852e..a54c4b31b5 100644
--- a/spring-messaging/src/test/java/org/springframework/messaging/simp/SimpMessagingTemplateTests.java
+++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/SimpMessagingTemplateTests.java
@@ -118,6 +118,25 @@ public class SimpMessagingTemplateTests {
 		assertNull(headerAccessor.getNativeHeader("key"));
 	}
 
+	// SPR-11868
+
+	@Test
+	public void convertAndSendWithCustomDestinationPrefix() {
+		this.messagingTemplate.setUserDestinationPrefix("/prefix");
+		this.messagingTemplate.convertAndSendToUser("joe", "/queue/foo", "data");
+		List<Message<byte[]>> messages = this.messageChannel.getMessages();
+
+		assertEquals(1, messages.size());
+
+		Message<byte[]> message = messages.get(0);
+		SimpMessageHeaderAccessor headerAccessor =
+				MessageHeaderAccessor.getAccessor(message, SimpMessageHeaderAccessor.class);
+
+		assertNotNull(headerAccessor);
+		assertEquals(SimpMessageType.MESSAGE, headerAccessor.getMessageType());
+		assertEquals("/prefix/joe/queue/foo", headerAccessor.getDestination());
+	}
+
 	@Test
 	public void convertAndSendWithMutableSimpMessageHeaders() {
 		SimpMessageHeaderAccessor accessor = SimpMessageHeaderAccessor.create();
diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParserTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParserTests.java
index dfc73941cd..465dcb3fda 100644
--- a/spring-websocket/src/test/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParserTests.java
+++ b/spring-websocket/src/test/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParserTests.java
@@ -264,7 +264,7 @@ public class MessageBrokerBeanDefinitionParserTests {
 
 		SimpMessagingTemplate simpMessagingTemplate = this.appContext.getBean(SimpMessagingTemplate.class);
 		assertNotNull(simpMessagingTemplate);
-		assertEquals("/personal", simpMessagingTemplate.getUserDestinationPrefix());
+		assertEquals("/personal/", simpMessagingTemplate.getUserDestinationPrefix());
 
 		List<MessageConverter> converters = compositeMessageConverter.getConverters();
 		assertThat(converters.size(), Matchers.is(3));