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

INT-1257 code polishing

Browse Source
This commit is contained in:
Oleg Zhurakousky
2010-07-27 05:56:12 +00:00
parent f022271db5
commit 6bc6063772
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -107,8 +107,9 @@ public class ConsumerEndpointFactoryBean
*/
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(this.beanFactory.getBean(MessageHistoryWriter.class), this.beanName, this.handler);
this.handler = new MessageHistoryAwareMessageHandler(writer, this.beanName, this.handler);
}
}
this.initializeEndpoint();

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

@@ -32,22 +32,22 @@ import org.springframework.integration.message.MessageRejectedException;
* @since 2.0
*/
public class MessageHistoryAwareMessageHandler implements NamedComponent, MessageHandler, Ordered {
private MessageHandler parentHandler;
private MessageHandler targetHandler;
private String componentName;
private MessageHistoryWriter historyWriter;
private int order;
private int order = Ordered.LOWEST_PRECEDENCE;
/**
*
* @param historyWriter
* @param endpointName
* @param parentHandler
*/
public MessageHistoryAwareMessageHandler(MessageHistoryWriter historyWriter, String endpointName, MessageHandler parentHandler){
public MessageHistoryAwareMessageHandler(MessageHistoryWriter historyWriter, String endpointName, MessageHandler targetHandler){
this.historyWriter = historyWriter;
this.componentName = endpointName;
this.parentHandler = parentHandler;
if (parentHandler instanceof Ordered){
this.order = ((Ordered)parentHandler).getOrder();
this.targetHandler = targetHandler;
if (targetHandler instanceof Ordered){
this.order = ((Ordered)targetHandler).getOrder();
}
}
@@ -58,11 +58,11 @@ public class MessageHistoryAwareMessageHandler implements NamedComponent, Messag
throws MessageRejectedException, MessageHandlingException,
MessageDeliveryException {
historyWriter.writeHistory(this, message);
parentHandler.handleMessage(message);
targetHandler.handleMessage(message);
}
public String getComponentType() {
return ((NamedComponent)parentHandler).getComponentType();
return ((NamedComponent)targetHandler).getComponentType();
}
public int getOrder() {