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

INT-779 The 'send-timeout' attribute is now available for all reply-producing handler types.

Browse Source
This commit is contained in:
Mark Fisher
2009-12-23 03:46:18 +00:00
parent 886e1dccb2
commit 9bac64589d
9 changed files with 185 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
org.springframework.integration/src/main/java/org/springframework/integration/config/FilterFactoryBean.java
View File

@@ -36,6 +36,8 @@ public class FilterFactoryBean extends AbstractMessageHandlerFactoryBean {
private volatile Boolean throwExceptionOnRejection;
private volatile Long sendTimeout;
public void setDiscardChannel(MessageChannel discardChannel) {
this.discardChannel = discardChannel;
@@ -45,6 +47,10 @@ public class FilterFactoryBean extends AbstractMessageHandlerFactoryBean {
this.throwExceptionOnRejection = throwExceptionOnRejection;
}
public void setSendTimeout(Long sendTimeout) {
this.sendTimeout = sendTimeout;
}
@Override
MessageHandler createMethodInvokingHandler(Object targetObject, String targetMethodName) {
if (targetObject instanceof MessageSelector) {
@@ -71,6 +77,9 @@ public class FilterFactoryBean extends AbstractMessageHandlerFactoryBean {
if (this.discardChannel != null) {
filter.setDiscardChannel(discardChannel);
}
if (this.sendTimeout != null) {
filter.setSendTimeout(this.sendTimeout.longValue());
}
return filter;
}

38
org.springframework.integration/src/main/java/org/springframework/integration/config/RouterFactoryBean.java
View File

@@ -69,27 +69,12 @@ public class RouterFactoryBean extends AbstractMessageHandlerFactoryBean {
MessageHandler createMethodInvokingHandler(Object targetObject, String targetMethodName) {
Assert.notNull(targetObject, "target object must not be null");
AbstractMessageRouter router = this.createRouter(targetObject, targetMethodName);
if (this.defaultOutputChannel != null) {
router.setDefaultOutputChannel(this.defaultOutputChannel);
}
if (this.timeout != null) {
router.setTimeout(timeout.longValue());
}
if (this.ignoreChannelNameResolutionFailures != null) {
Assert.isTrue(router instanceof AbstractChannelNameResolvingMessageRouter,
"The 'ignoreChannelNameResolutionFailures' property can only be set on routers that extend "
+ AbstractChannelNameResolvingMessageRouter.class.getName());
((AbstractChannelNameResolvingMessageRouter) router).setIgnoreChannelNameResolutionFailures(ignoreChannelNameResolutionFailures);
}
if (this.resolutionRequired != null) {
router.setResolutionRequired(this.resolutionRequired);
}
return router;
return this.configureRouter(router);
}
@Override
MessageHandler createExpressionEvaluatingHandler(String expression) {
return new ExpressionEvaluatingRouter(expression);
return this.configureRouter(new ExpressionEvaluatingRouter(expression));
}
private AbstractMessageRouter createRouter(Object targetObject, String targetMethodName) {
@@ -108,4 +93,23 @@ public class RouterFactoryBean extends AbstractMessageHandlerFactoryBean {
return router;
}
private AbstractMessageRouter configureRouter(AbstractMessageRouter router) {
if (this.defaultOutputChannel != null) {
router.setDefaultOutputChannel(this.defaultOutputChannel);
}
if (this.timeout != null) {
router.setTimeout(timeout.longValue());
}
if (this.ignoreChannelNameResolutionFailures != null) {
Assert.isTrue(router instanceof AbstractChannelNameResolvingMessageRouter,
"The 'ignoreChannelNameResolutionFailures' property can only be set on routers that extend "
+ AbstractChannelNameResolvingMessageRouter.class.getName());
((AbstractChannelNameResolvingMessageRouter) router).setIgnoreChannelNameResolutionFailures(ignoreChannelNameResolutionFailures);
}
if (this.resolutionRequired != null) {
router.setResolutionRequired(this.resolutionRequired);
}
return router;
}
}

29
org.springframework.integration/src/main/java/org/springframework/integration/config/SplitterFactoryBean.java
View File

@@ -30,24 +30,41 @@ import org.springframework.util.StringUtils;
*/
public class SplitterFactoryBean extends AbstractMessageHandlerFactoryBean {
private volatile Long sendTimeout;
public void setSendTimeout(Long sendTimeout) {
this.sendTimeout = sendTimeout;
}
@Override
MessageHandler createMethodInvokingHandler(Object targetObject, String targetMethodName) {
AbstractMessageSplitter splitter = null;
if (targetObject instanceof AbstractMessageSplitter) {
return (AbstractMessageSplitter) targetObject;
splitter = (AbstractMessageSplitter) targetObject;
}
return (StringUtils.hasText(targetMethodName))
? new MethodInvokingSplitter(targetObject, targetMethodName)
: new MethodInvokingSplitter(targetObject);
else {
splitter = (StringUtils.hasText(targetMethodName))
? new MethodInvokingSplitter(targetObject, targetMethodName)
: new MethodInvokingSplitter(targetObject);
}
return this.configureSplitter(splitter);
}
@Override
MessageHandler createExpressionEvaluatingHandler(String expression) {
return new ExpressionEvaluatingSplitter(expression);
return this.configureSplitter(new ExpressionEvaluatingSplitter(expression));
}
@Override
MessageHandler createDefaultHandler() {
return new DefaultMessageSplitter();
return this.configureSplitter(new DefaultMessageSplitter());
}
private AbstractMessageSplitter configureSplitter(AbstractMessageSplitter splitter) {
if (this.sendTimeout != null) {
splitter.setSendTimeout(sendTimeout);
}
return splitter;
}
}

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

@@ -31,6 +31,12 @@ import org.springframework.util.StringUtils;
*/
public class TransformerFactoryBean extends AbstractMessageHandlerFactoryBean {
private volatile Long sendTimeout;
public void setSendTimeout(Long sendTimeout) {
this.sendTimeout = sendTimeout;
}
@Override
MessageHandler createMethodInvokingHandler(Object targetObject, String targetMethodName) {
Assert.notNull(targetObject, "targetObject must not be null");
@@ -44,13 +50,21 @@ public class TransformerFactoryBean extends AbstractMessageHandlerFactoryBean {
else {
transformer = new MethodInvokingTransformer(targetObject);
}
return new MessageTransformingHandler(transformer);
return this.createHandler(transformer);
}
@Override
MessageHandler createExpressionEvaluatingHandler(String expression) {
Transformer transformer = new ExpressionEvaluatingTransformer(expression);
return new MessageTransformingHandler(transformer);
return this.createHandler(transformer);
}
private MessageTransformingHandler createHandler(Transformer transformer) {
MessageTransformingHandler handler = new MessageTransformingHandler(transformer);
if (this.sendTimeout != null) {
handler.setSendTimeout(this.sendTimeout.longValue());
}
return handler;
}
}

1
org.springframework.integration/src/main/java/org/springframework/integration/config/xml/AbstractDelegatingConsumerEndpointParser.java
View File

@@ -75,6 +75,7 @@ abstract class AbstractDelegatingConsumerEndpointParser extends AbstractConsumer
"a 'ref' or inner-bean definition is provided.", element);
}
}
IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "send-timeout");
this.postProcess(builder, element, parserContext);
return builder;
}

1
org.springframework.integration/src/main/java/org/springframework/integration/config/xml/ServiceActivatorParser.java
View File

@@ -52,6 +52,7 @@ public class ServiceActivatorParser extends AbstractConsumerEndpointParser {
String method = element.getAttribute(METHOD_ATTRIBUTE);
builder.getRawBeanDefinition().getConstructorArgumentValues().addGenericArgumentValue(method, "java.lang.String");
}
IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "send-timeout");
return builder;
}

19
org.springframework.integration/src/main/resources/org/springframework/integration/config/xml/spring-integration-2.0.xsd
View File

@@ -490,6 +490,14 @@
</xsd:appinfo>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="send-timeout" type="xsd:string">
<xsd:annotation>
<xsd:documentation>
Specify the maximum amount of time in milliseconds to wait when sending a reply
Message to the output channel. By default the send will block for one second.
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="method" type="xsd:string" />
</xsd:extension>
</xsd:complexContent>
@@ -1268,7 +1276,14 @@
<xsd:complexType name="baseRouterType">
<xsd:complexContent>
<xsd:extension base="inputEndpointType">
<xsd:attribute name="timeout" type="xsd:string" />
<xsd:attribute name="timeout" type="xsd:string">
<xsd:annotation>
<xsd:documentation>
Specify the maximum amount of time in milliseconds to wait when sending Messages
to the target MessageChannels. By default the send will block indefinitely.
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
@@ -1322,7 +1337,6 @@
</xsd:appinfo>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="send-timeout" type="xsd:string" />
<xsd:attribute name="send-partial-result-on-timeout"
type="xsd:string" />
<xsd:attribute name="tracked-correlation-id-capacity"
@@ -1364,7 +1378,6 @@
</xsd:appinfo>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="send-timeout" type="xsd:string" />
<xsd:attribute name="release-partial-sequences" type="xsd:string" />
<xsd:attribute name="send-partial-result-on-timeout"
type="xsd:string" />

24
org.springframework.integration/src/test/java/org/springframework/integration/handler/SendTimeoutConfigurationTests-context.xml Normal file
View File

@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans:beans xmlns="http://www.springframework.org/schema/integration"
xmlns:beans="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
http://www.springframework.org/schema/integration/spring-integration.xsd">
<service-activator id="serviceActivator" input-channel="input" ref="mock" method="test" send-timeout="123"/>
<router id="router" input-channel="routerInput" expression="'someChannel'" timeout="123"/>
<filter id="filter" input-channel="filterInput" expression="'true'" send-timeout="123"/>
<transformer id="transformer" input-channel="transformerInput" expression="'foo'" send-timeout="123"/>
<splitter id="splitter" input-channel="splitterInput" expression="payload.values" send-timeout="123"/>
<beans:bean id="mock" class="org.mockito.Mockito" factory-method="mock">
<beans:constructor-arg value="org.springframework.integration.handler.MockHandlerTest$TestInterface"/>
</beans:bean>
</beans:beans>

74
org.springframework.integration/src/test/java/org/springframework/integration/handler/SendTimeoutConfigurationTests.java Normal file
View File

@@ -0,0 +1,74 @@
/*
* 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.integration.handler;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.DirectFieldAccessor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
/**
* @author Mark Fisher
*/
@ContextConfiguration
@RunWith(SpringJUnit4ClassRunner.class)
public class SendTimeoutConfigurationTests {
@Autowired
private ApplicationContext context;
@Test
public void serviceActivator() {
assertEquals(123, this.getTimeout("serviceActivator"));
}
@Test
public void filter() {
assertEquals(123, this.getTimeout("filter"));
}
@Test
public void transformer() {
assertEquals(123, this.getTimeout("transformer"));
}
@Test
public void splitter() {
assertEquals(123, this.getTimeout("splitter"));
}
@Test
public void router() {
assertEquals(123, this.getTimeout("router"));
}
private long getTimeout(String endpointName) {
DirectFieldAccessor endpointAccessor = new DirectFieldAccessor(context.getBean(endpointName));
DirectFieldAccessor handlerAccessor = new DirectFieldAccessor(endpointAccessor.getPropertyValue("handler"));
DirectFieldAccessor templateAccessor = new DirectFieldAccessor(handlerAccessor.getPropertyValue("channelTemplate"));
return ((Long) templateAccessor.getPropertyValue("sendTimeout")).longValue();
}
}