From dc55da09888cfb2e85a01449602aab1ba7d1cee7 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Thu, 16 Aug 2018 13:02:27 +0200 Subject: [PATCH] Polishing --- .../jms/config/JmsListenerEndpointRegistry.java | 13 +++++++------ .../support/SimpAnnotationMethodMessageHandler.java | 10 ++++++---- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/spring-jms/src/main/java/org/springframework/jms/config/JmsListenerEndpointRegistry.java b/spring-jms/src/main/java/org/springframework/jms/config/JmsListenerEndpointRegistry.java index 3d0b4b7069d..2f00f14daaf 100644 --- a/spring-jms/src/main/java/org/springframework/jms/config/JmsListenerEndpointRegistry.java +++ b/spring-jms/src/main/java/org/springframework/jms/config/JmsListenerEndpointRegistry.java @@ -44,12 +44,13 @@ import org.springframework.util.Assert; * lifecycle of the listener containers, in particular within the lifecycle * of the application context. * - *

Contrary to {@link MessageListenerContainer MessageListenerContainers} created manually, listener - * containers managed by registry are not beans in the application context and - * are not candidates for autowiring. Use {@link #getListenerContainers()} if - * you need to access this registry's listener containers for management purposes. - * If you need to access to a specific message listener container, use - * {@link #getListenerContainer(String)} with the id of the endpoint. + *

Contrary to {@link MessageListenerContainer MessageListenerContainers} + * created manually, listener containers managed by registry are not beans + * in the application context and are not candidates for autowiring. + * Use {@link #getListenerContainers()} if you need to access this registry's + * listener containers for management purposes. If you need to access to a + * specific message listener container, use {@link #getListenerContainer(String)} + * with the id of the endpoint. * * @author Stephane Nicoll * @author Juergen Hoeller diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SimpAnnotationMethodMessageHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SimpAnnotationMethodMessageHandler.java index c0d899d048e..eee70f55a11 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SimpAnnotationMethodMessageHandler.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SimpAnnotationMethodMessageHandler.java @@ -251,7 +251,7 @@ public class SimpAnnotationMethodMessageHandler extends AbstractMethodMessageHan /** * Configure a {@link MessageHeaderInitializer} to pass on to - * {@link org.springframework.messaging.handler.invocation.HandlerMethodReturnValueHandler org.springframework.messaging.handler.invocation.HandlerMethodReturnValueHandlers} + * {@link HandlerMethodReturnValueHandler HandlerMethodReturnValueHandlers} * that send messages from controller return values. *

By default, this property is not set. */ @@ -332,7 +332,8 @@ public class SimpAnnotationMethodMessageHandler extends AbstractMethodMessageHan // Annotation-based return value types - SendToMethodReturnValueHandler sendToHandler = new SendToMethodReturnValueHandler(this.brokerTemplate, true); + SendToMethodReturnValueHandler sendToHandler = + new SendToMethodReturnValueHandler(this.brokerTemplate, true); sendToHandler.setHeaderInitializer(this.headerInitializer); handlers.add(sendToHandler); @@ -341,10 +342,11 @@ public class SimpAnnotationMethodMessageHandler extends AbstractMethodMessageHan subscriptionHandler.setHeaderInitializer(this.headerInitializer); handlers.add(subscriptionHandler); - // custom return value types + // Custom return value types + handlers.addAll(getCustomReturnValueHandlers()); - // catch-all + // Catch-all sendToHandler = new SendToMethodReturnValueHandler(this.brokerTemplate, false); sendToHandler.setHeaderInitializer(this.headerInitializer);