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

reordered ctor args, handler comes first since handleMessage() is still the primary responsibility

Browse Source
This commit is contained in:
Mark Fisher
2010-07-27 13:30:38 +00:00
parent 53132b2376
commit f64fb54b34
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
spring-integration-core/src/main/java/org/springframework/integration/config/ConsumerEndpointFactoryBean.java
View File

@@ -101,15 +101,14 @@ public class ConsumerEndpointFactoryBean
}
public void afterPropertiesSet() throws Exception {
/*
* Will check if this.handler needs to be wrapped in MessageHistoryAwareMessageHandler.
* Such wrapping is only required if this.beanFactory contains bean of type MessageHistoryWriter.class
*/
Map<String, MessageHistoryWriter> historyWriters = BeanFactoryUtils.beansOfTypeIncludingAncestors((ListableBeanFactory)this.beanFactory, MessageHistoryWriter.class);
if (historyWriters.size() == 1){
// Will check if this.handler needs to be wrapped in a MessageHistoryAwareMessageHandler.
// Such wrapping is only required if this.beanFactory contains a bean of type MessageHistoryWriter.
Map<String, MessageHistoryWriter> historyWriters = BeanFactoryUtils.beansOfTypeIncludingAncestors(
(ListableBeanFactory) this.beanFactory, MessageHistoryWriter.class);
if (historyWriters.size() == 1) {
MessageHistoryWriter writer = historyWriters.values().iterator().next();
if (!beanName.startsWith("org.springframework") && this.handler instanceof IntegrationObjectSupport){
this.handler = new MessageHistoryAwareMessageHandler(writer, this.beanName, this.handler);
if (!this.beanName.startsWith("org.springframework") && this.handler instanceof IntegrationObjectSupport) {
this.handler = new MessageHistoryAwareMessageHandler(this.handler, writer, this.beanName);
}
}
this.initializeEndpoint();

10
spring-integration-core/src/main/java/org/springframework/integration/history/MessageHistoryAwareMessageHandler.java
View File

@@ -33,11 +33,11 @@ import org.springframework.util.Assert;
*/
public class MessageHistoryAwareMessageHandler implements NamedComponent, MessageHandler, Ordered {
private MessageHandler targetHandler;
private final MessageHandler targetHandler;
private String componentName;
private final MessageHistoryWriter historyWriter;
private MessageHistoryWriter historyWriter;
private final String componentName;
/**
@@ -45,12 +45,12 @@ public class MessageHistoryAwareMessageHandler implements NamedComponent, Messag
* @param endpointName
* @param targetHandler
*/
public MessageHistoryAwareMessageHandler(MessageHistoryWriter historyWriter, String endpointName, MessageHandler targetHandler) {
public MessageHistoryAwareMessageHandler(MessageHandler targetHandler, MessageHistoryWriter historyWriter, String endpointName) {
Assert.notNull(targetHandler, "targetHandler must not be null");
Assert.notNull(historyWriter, "historyWriter must not be null");
this.targetHandler = targetHandler;
this.historyWriter = historyWriter;
this.componentName = endpointName;
this.targetHandler = targetHandler;
}