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

setting order on all AbstractMessageHandlers (not just reply-producers)

Browse Source
This commit is contained in:
Mark Fisher
2009-07-03 02:57:21 +00:00
parent fc51ac5216
commit 960555849a
5 changed files with 130 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractMessageHandlerFactoryBean.java
View File

@@ -21,6 +21,7 @@ import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanFactoryAware;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.integration.core.MessageChannel;
import org.springframework.integration.handler.AbstractMessageHandler;
import org.springframework.integration.handler.AbstractReplyProducingMessageHandler;
import org.springframework.integration.message.MessageHandler;
import org.springframework.util.Assert;
@@ -74,15 +75,14 @@ public abstract class AbstractMessageHandlerFactoryBean implements FactoryBean,
if (this.handler == null) {
this.initializeHandler();
Assert.notNull(this.handler, "failed to create MessageHandler");
if (this.handler instanceof AbstractReplyProducingMessageHandler) {
AbstractReplyProducingMessageHandler abstractHandler = (AbstractReplyProducingMessageHandler) this.handler;
if (this.outputChannel != null) {
abstractHandler.setOutputChannel(this.outputChannel);
}
if (this.order != null) {
abstractHandler.setOrder(this.order.intValue());
}
abstractHandler.setBeanFactory(beanFactory);
if (this.handler instanceof AbstractReplyProducingMessageHandler && this.outputChannel != null) {
((AbstractReplyProducingMessageHandler) this.handler).setOutputChannel(this.outputChannel);
}
if (this.handler instanceof BeanFactoryAware) {
((BeanFactoryAware) this.handler).setBeanFactory(beanFactory);
}
if (this.handler instanceof AbstractMessageHandler && this.order != null) {
((AbstractMessageHandler) this.handler).setOrder(this.order.intValue());
}
}
return this.handler;

15
org.springframework.integration/src/main/java/org/springframework/integration/handler/MessageHandlerChain.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2008 the original author or authors.
* Copyright 2002-2009 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@ import java.util.List;
import org.springframework.beans.BeanWrapperImpl;
import org.springframework.beans.PropertyAccessor;
import org.springframework.core.Ordered;
import org.springframework.integration.channel.DirectChannel;
import org.springframework.integration.context.IntegrationObjectSupport;
import org.springframework.integration.core.Message;
@@ -62,7 +63,7 @@ import org.springframework.util.Assert;
* @author Mark Fisher
* @author Iwein Fuld
*/
public class MessageHandlerChain extends IntegrationObjectSupport implements MessageHandler {
public class MessageHandlerChain extends IntegrationObjectSupport implements MessageHandler, Ordered {
private static final String OUTPUT_CHANNEL_PROPERTY = "outputChannel";
@@ -70,6 +71,8 @@ public class MessageHandlerChain extends IntegrationObjectSupport implements Mes
private volatile MessageChannel outputChannel;
private volatile int order = Ordered.LOWEST_PRECEDENCE;
private volatile boolean initialized;
private final Object initializationMonitor = new Object();
@@ -83,6 +86,14 @@ public class MessageHandlerChain extends IntegrationObjectSupport implements Mes
this.outputChannel = outputChannel;
}
public void setOrder(int order) {
this.order = order;
}
public int getOrder() {
return this.order;
}
public final void afterPropertiesSet() {
synchronized (this.initializationMonitor) {
if (!this.initialized) {