diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/config/EnableWebSocketMessageBroker.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/config/EnableWebSocketMessageBroker.java index 7cf413c8e28996a35a56138471c96739e8155a2c..5251c4cf985315755fb9d11761427a9a588e5eae 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/config/EnableWebSocketMessageBroker.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/config/EnableWebSocketMessageBroker.java @@ -49,7 +49,7 @@ import org.springframework.context.annotation.Import; * @Bean * public void configureMessageBroker(MessageBrokerConfigurer configurer) { * configurer.enableStompBrokerRelay("/queue/", "/topic/"); - * configurer.setAnnotationMethodDestinationPrefixes("/app/"); + * configurer.setApplicationDestinationPrefixes("/app/"); * } * } * diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/config/MessageBrokerConfigurer.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/config/MessageBrokerConfigurer.java index 96f4ba183e252bfa7142f472168305fed98c468c..7a2a23301a96a75dd1506d5966f25f8e9888ef5c 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/config/MessageBrokerConfigurer.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/config/MessageBrokerConfigurer.java @@ -37,7 +37,7 @@ public class MessageBrokerConfigurer { private StompBrokerRelayRegistration stompRelay; - private String[] annotationMethodDestinationPrefixes; + private String[] applicationDestinationPrefixes; private String userDestinationPrefix; @@ -67,10 +67,10 @@ public class MessageBrokerConfigurer { } /** - * Configure one or more prefixes to filter destinations targeting annotated - * application methods. For example destinations prefixed with "/app" may be processed - * by annotated application methods while other destinations may target the message - * broker (e.g. "/topic", "/queue"). + * Configure one or more prefixes to filter destinations targeting application + * annotated methods. For example destinations prefixed with "/app" may be + * processed by annotated methods while other destinations may target the + * message broker (e.g. "/topic", "/queue"). *

* When messages are processed, the matching prefix is removed from the destination in * order to form the lookup path. This means annotations should not contain the @@ -78,8 +78,8 @@ public class MessageBrokerConfigurer { *

* Prefixes that do not have a trailing slash will have one automatically appended. */ - public MessageBrokerConfigurer setAnnotationMethodDestinationPrefixes(String... destinationPrefixes) { - this.annotationMethodDestinationPrefixes = destinationPrefixes; + public MessageBrokerConfigurer setApplicationDestinationPrefixes(String... prefixes) { + this.applicationDestinationPrefixes = prefixes; return this; } @@ -118,9 +118,9 @@ public class MessageBrokerConfigurer { return (this.stompRelay != null) ? this.stompRelay.getMessageHandler() : null; } - protected Collection getAnnotationMethodDestinationPrefixes() { - return (this.annotationMethodDestinationPrefixes != null) - ? Arrays.asList(this.annotationMethodDestinationPrefixes) : null; + protected Collection getApplicationDestinationPrefixes() { + return (this.applicationDestinationPrefixes != null) + ? Arrays.asList(this.applicationDestinationPrefixes) : null; } protected String getUserDestinationPrefix() { diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/config/WebSocketMessageBrokerConfigurationSupport.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/config/WebSocketMessageBrokerConfigurationSupport.java index 696a19bf7c690182de71497dc5d344d08b1ea92b..7afea026c01b52b027961c63161e294e83c64b8b 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/config/WebSocketMessageBrokerConfigurationSupport.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/config/WebSocketMessageBrokerConfigurationSupport.java @@ -136,7 +136,7 @@ public abstract class WebSocketMessageBrokerConfigurationSupport { SimpAnnotationMethodMessageHandler handler = new SimpAnnotationMethodMessageHandler(brokerMessagingTemplate(), webSocketResponseChannel()); - handler.setDestinationPrefixes(getMessageBrokerConfigurer().getAnnotationMethodDestinationPrefixes()); + handler.setDestinationPrefixes(getMessageBrokerConfigurer().getApplicationDestinationPrefixes()); handler.setMessageConverter(simpMessageConverter()); webSocketRequestChannel().subscribe(handler); return handler; diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/handler/SimpAnnotationMethodIntegrationTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/handler/SimpAnnotationMethodIntegrationTests.java index 96b95ae3e6b14aa8aa2928932bab329fbf8df90b..03efe0af97a8fe8f3f50e25398d0bd931f4711cd 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/handler/SimpAnnotationMethodIntegrationTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/handler/SimpAnnotationMethodIntegrationTests.java @@ -217,7 +217,7 @@ public class SimpAnnotationMethodIntegrationTests extends AbstractWebSocketInteg @Override public void configureMessageBroker(MessageBrokerConfigurer configurer) { - configurer.setAnnotationMethodDestinationPrefixes("/app"); + configurer.setApplicationDestinationPrefixes("/app"); configurer.enableSimpleBroker("/topic", "/queue"); } }