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

INT-1627 polishing

Browse Source
This commit is contained in:
Mark Fisher
2010-11-17 10:15:58 -05:00
parent 65be52c060
commit 957b7608d5
4 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
spring-integration-core/src/main/java/org/springframework/integration/config/AbstractSimpleMessageHandlerFactoryBean.java
View File

@@ -27,17 +27,21 @@ import org.springframework.util.Assert;
/**
* @author Dave Syer
*
*/
public abstract class AbstractSimpleMessageHandlerFactoryBean implements
FactoryBean<MessageHandler>, BeanFactoryAware {
public abstract class AbstractSimpleMessageHandlerFactoryBean implements FactoryBean<MessageHandler>, BeanFactoryAware {
private volatile MessageHandler handler;
private volatile MessageChannel outputChannel;
private volatile Integer order;
private BeanFactory beanFactory;
private volatile boolean initialized;
private final Object initializationMonitor = new Object();
private volatile MessageHandler handler;
private volatile MessageChannel outputChannel;
private volatile Integer order;
private BeanFactory beanFactory;
public AbstractSimpleMessageHandlerFactoryBean() {
super();

22
spring-integration-core/src/main/java/org/springframework/integration/config/ExpressionControlBusFactoryBean.java
View File

@@ -30,27 +30,23 @@ public class ExpressionControlBusFactoryBean extends AbstractSimpleMessageHandle
private volatile BeanResolver beanResolver;
private final ExpressionCommandMessageProcessor processor;
private final ExpressionCommandMessageProcessor processor = new ExpressionCommandMessageProcessor();
public ExpressionControlBusFactoryBean(ExpressionCommandMessageProcessor processor) {
this.processor = processor;
}
public void setBeanResolver(BeanResolver beanResolver) {
this.beanResolver = beanResolver;
}
public void setSendTimeout(Long sendTimeout) {
this.sendTimeout = sendTimeout;
}
public void setBeanResolver(BeanResolver beanResolver) {
this.beanResolver = beanResolver;
}
protected MessageHandler createHandler() {
if (beanResolver != null) {
processor.setBeanResolver(beanResolver);
this.processor.setBeanFactory(this.getBeanFactory());
if (this.beanResolver != null) {
this.processor.setBeanResolver(this.beanResolver);
}
ServiceActivatingHandler handler = new ServiceActivatingHandler(processor);
ServiceActivatingHandler handler = new ServiceActivatingHandler(this.processor);
if (this.sendTimeout != null) {
handler.setSendTimeout(this.sendTimeout);
}

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

@@ -16,7 +16,6 @@ package org.springframework.integration.config.xml;
import org.w3c.dom.Element;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.support.RootBeanDefinition;
import org.springframework.beans.factory.xml.ParserContext;
/**
@@ -30,8 +29,6 @@ public class ControlBusParser extends AbstractConsumerEndpointParser {
protected BeanDefinitionBuilder parseHandler(Element element, ParserContext parserContext) {
BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(
"org.springframework.integration.config.ExpressionControlBusFactoryBean");
builder.addConstructorArgValue(new RootBeanDefinition(
"org.springframework.integration.handler.ExpressionCommandMessageProcessor"));
IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "bean-resolver");
IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "send-timeout");
IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "order");

2
spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusExplicitPollerTests-context.xml
View File

@@ -18,6 +18,6 @@
<poller fixed-rate="100" />
</control-bus>
<beans:bean id="service" class="org.springframework.integration.config.xml.ControlBusTests$Service" />
<beans:bean id="service" class="org.springframework.integration.config.xml.ControlBusExplicitPollerTests$Service" />
</beans:beans>