INT-2216 - For Payload Enricher - add: 'request-timeout' and 'reply-timeout' attributes

For reference see: https://jira.springsource.org/browse/INT-2216

spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests-context.xml

@@ -15,7 +15,10 @@
 
 	<channel id="requests"/>
 
-	<enricher id="enricher" input-channel="input" request-channel="requests" order="99" should-clone-payload="true" output-channel="output">
+	<enricher id="enricher" input-channel="input" 
+	                        request-channel="requests" request-timeout="1234"
+	                        reply-timeout="9876"
+	                        order="99" should-clone-payload="true" output-channel="output">
 		<property name="name" expression="payload.sourceName"/>
 		<property name="age" value="42"/>
 	</enricher>

spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests.java

@@ -42,6 +42,8 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 /**
  * @author Mark Fisher
+ * @author Gunnar Hillert
+ * 
  * @since 2.1
  */
 @RunWith(SpringJUnit4ClassRunner.class)
@@ -80,6 +82,19 @@ public class EnricherParserTests {
 		}
 	}
 
+	@Test
+	public void configurationCheckTimeoutParameters() {
+		
+		Object endpoint = context.getBean("enricher");
+		
+		Long requestTimeout = TestUtils.getPropertyValue(endpoint, "handler.requestTimeout", Long.class);
+		Long replyTimeout   = TestUtils.getPropertyValue(endpoint, "handler.replyTimeout", Long.class);
+
+		assertEquals(Long.valueOf(1234L), requestTimeout);
+		assertEquals(Long.valueOf(9876L), replyTimeout);
+
+	}
+	
 	@Test
 	public void integrationTest() {
 		SubscribableChannel requests = context.getBean("requests", SubscribableChannel.class);

spring-integration-core/src/test/java/org/springframework/integration/transformer/ContentEnricherTests.java

@@ -30,18 +30,50 @@ import org.junit.Test;
 import org.springframework.expression.Expression;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
 import org.springframework.integration.Message;
+import org.springframework.integration.MessageDeliveryException;
 import org.springframework.integration.MessageHandlingException;
 import org.springframework.integration.channel.DirectChannel;
 import org.springframework.integration.channel.QueueChannel;
+import org.springframework.integration.channel.RendezvousChannel;
 import org.springframework.integration.handler.AbstractReplyProducingMessageHandler;
 import org.springframework.integration.support.MessageBuilder;
 
 /**
  * @author Mark Fisher
+ * @author Gunnar Hillert
+ * 
  * @since 2.1
  */
 public class ContentEnricherTests {
 
+	@Test
+	public void requestChannelSendTimingOut() {
+		
+		final String requestChannelName = "Request_Channel";
+		final long requestTimeout = 200L;
+		
+		QueueChannel replyChannel   = new QueueChannel();
+		QueueChannel requestChannel = new RendezvousChannel();
+		requestChannel.setBeanName(requestChannelName);
+		
+		ContentEnricher enricher = new ContentEnricher();
+		enricher.setRequestChannel(requestChannel);
+		enricher.setRequestTimeout(requestTimeout);
+		enricher.afterPropertiesSet();
+
+		Target target = new Target("replace me");
+		Message<?> requestMessage = MessageBuilder.withPayload(target).setReplyChannel(replyChannel).build();
+		
+		try {
+		    enricher.handleMessage(requestMessage);
+		} catch (MessageDeliveryException e) {
+			assertEquals("failed to send message to channel '" + requestChannelName 
+					   + "' within timeout: " + requestTimeout, e.getMessage());
+			return;
+		}
+
+	}
+	
 	@Test
 	public void simpleProperty() {
 		QueueChannel replyChannel = new QueueChannel();
@@ -69,6 +101,54 @@ public class ContentEnricherTests {
 		assertEquals("Doe, John", ((Target) reply.getPayload()).getName());
 	}
 
+	@Test
+	public void setReplyChannelWithoutRequestChannel() {
+		
+		QueueChannel replyChannel   = new QueueChannel();
+		
+		ContentEnricher enricher = new ContentEnricher();
+		enricher.setReplyChannel(replyChannel);
+		
+		try { 
+		    enricher.afterPropertiesSet();
+		} catch (IllegalArgumentException e) {
+			assertEquals("If the replyChannel is set, then the requestChannel must not be null", e.getMessage());
+			return;
+		}
+		
+		fail("Expected an exception.");
+	}
+	
+	@Test
+	public void setNullReplyTimeout() {
+		
+		ContentEnricher enricher = new ContentEnricher();
+		
+		try {
+		    enricher.setReplyTimeout(null);
+		} catch (IllegalArgumentException e) {
+			assertEquals("replyTimeout must not be null", e.getMessage());
+			return;
+		}
+		
+		fail("Expected an exception.");
+	}
+	
+	@Test
+	public void setNullRequestTimeout() {
+		
+		ContentEnricher enricher = new ContentEnricher();
+		
+		try {
+		    enricher.setRequestTimeout(null);
+		} catch (IllegalArgumentException e) {
+			assertEquals("requestTimeout must not be null", e.getMessage());
+			return;
+		}
+		
+		fail("Expected an exception.");
+	}
+	
 	@Test
 	public void testSimplePropertyWithoutUsingRequestChannel() {
 		QueueChannel replyChannel = new QueueChannel();