Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Well-known names for beans in message broker XML config

Browse Source 
Issue: SPR-15068
This commit is contained in:
Rossen Stoyanchev
2017-01-17 17:08:45 -05:00
parent be45de0571
commit 2e414ab25a
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-websocket/src/main/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParser.java
View File

@@ -104,6 +104,10 @@ class MessageBrokerBeanDefinitionParser implements BeanDefinitionParser {
public static final String SOCKJS_SCHEDULER_BEAN_NAME = "messageBrokerSockJsScheduler";
public static final String MESSAGING_TEMPLATE_BEAN_NAME = "brokerMessagingTemplate";
public static final String MESSAGE_CONVERTER_BEAN_NAME = "brokerMessageConverter";
private static final int DEFAULT_MAPPING_ORDER = 1;
private static final boolean jackson2Present = ClassUtils.isPresent(
@@ -482,7 +486,9 @@ class MessageBrokerBeanDefinitionParser implements BeanDefinitionParser {
ConstructorArgumentValues cavs = new ConstructorArgumentValues();
cavs.addIndexedArgumentValue(0, converters);
RootBeanDefinition messageConverterDef = new RootBeanDefinition(CompositeMessageConverter.class, cavs, null);
return new RuntimeBeanReference(registerBeanDef(messageConverterDef, context, source));
String name = MESSAGE_CONVERTER_BEAN_NAME;
registerBeanDefByName(name, messageConverterDef, context, source);
return new RuntimeBeanReference(name);
}
private RuntimeBeanReference registerMessagingTemplate(Element element, RuntimeBeanReference brokerChannel,
@@ -495,7 +501,9 @@ class MessageBrokerBeanDefinitionParser implements BeanDefinitionParser {
beanDef.getPropertyValues().add("userDestinationPrefix", element.getAttribute("user-destination-prefix"));
}
beanDef.getPropertyValues().add("messageConverter", messageConverter);
return new RuntimeBeanReference(registerBeanDef(beanDef,context, source));
String name = MESSAGING_TEMPLATE_BEAN_NAME;
registerBeanDefByName(name, beanDef, context, source);
return new RuntimeBeanReference(name);
}
private void registerAnnotationMethodMessageHandler(Element messageBrokerElement,