root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Drop separate user dest property for subscriptions 

Before this change DefaultUserDestinationResolver provided a separate
destination prefix property for identifying "user" destinations in
subscription requests as opposed to in sent messages. Such a separate
property should not be needed.

Issue: SPR-11263
This commit is contained in:
Rossen Stoyanchev 2014-01-03 15:50:24 -05:00
parent d0556e61f9
commit abb8a93e2f
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
spring-messaging/src/main/java/org/springframework/messaging/simp/user/DefaultUserDestinationResolver.java
View File

@ -48,8 +48,6 @@ public class DefaultUserDestinationResolver implements UserDestinationResolver {
private String destinationPrefix = "/user/";
private String subscriptionDestinationPrefix = "/user/queue/";
/**
* Create an instance that will access user session id information through
@ -70,7 +68,6 @@ public class DefaultUserDestinationResolver implements UserDestinationResolver {
public void setUserDestinationPrefix(String prefix) {
Assert.hasText(prefix, "prefix must not be empty");
this.destinationPrefix = prefix.endsWith("/") ? prefix : prefix + "/";
this.subscriptionDestinationPrefix = this.destinationPrefix + "queue/";
}
/**
@ -82,13 +79,6 @@ public class DefaultUserDestinationResolver implements UserDestinationResolver {
return this.destinationPrefix;
}
/**
* Return the prefix used to identify user destinations for (un)subscribe messages.
* <p>By default "/user/queue/".
*/
public String getSubscriptionDestinationPrefix() {
return this.subscriptionDestinationPrefix;
}
/**
* Return the configured {@link UserSessionRegistry}.
@ -130,7 +120,7 @@ public class DefaultUserDestinationResolver implements UserDestinationResolver {
SimpMessageType messageType = headers.getMessageType();
if (SimpMessageType.SUBSCRIBE.equals(messageType) || SimpMessageType.UNSUBSCRIBE.equals(messageType)) {
if (!checkDestination(destination, this.subscriptionDestinationPrefix)) {
if (!checkDestination(destination, this.destinationPrefix)) {
return null;
}
if (user == null) {