From ae538cd1081d826ca7265e6df01a9de179119f3e Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Tue, 15 Jun 2010 01:18:55 +0000
Subject: [PATCH] INT-1154 The <header-enricher> element now supports the
 'send-timeout' attribute.

---
 .../config/xml/AbstractTransformerParser.java |  3 +-
 .../xml/HeaderEnricherParserTests-context.xml | 14 ++++++
 .../config/xml/HeaderEnricherParserTests.java | 49 +++++++++++++++++++
 3 files changed, 65 insertions(+), 1 deletion(-)
 create mode 100644 org.springframework.integration/src/test/java/org/springframework/integration/config/xml/HeaderEnricherParserTests-context.xml
 create mode 100644 org.springframework.integration/src/test/java/org/springframework/integration/config/xml/HeaderEnricherParserTests.java

diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/AbstractTransformerParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/AbstractTransformerParser.java
index 99648db279..0b805406ad 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/AbstractTransformerParser.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/AbstractTransformerParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2010 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.
@@ -37,6 +37,7 @@ public abstract class AbstractTransformerParser extends AbstractConsumerEndpoint
 		String transformerBeanName = BeanDefinitionReaderUtils.registerWithGeneratedName(
 				transformerBuilder.getBeanDefinition(), parserContext.getRegistry());
 		builder.addConstructorArgReference(transformerBeanName);
+		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "send-timeout");
 		return builder;
 	}
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/HeaderEnricherParserTests-context.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/HeaderEnricherParserTests-context.xml
new file mode 100644
index 0000000000..f652af64f6
--- /dev/null
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/HeaderEnricherParserTests-context.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:beans="http://www.springframework.org/schema/beans"
+	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">
+
+	<header-enricher id="headerEnricherWithSendTimeout" input-channel="input" send-timeout="1234">
+		<header name="foo" value="bar"/>
+	</header-enricher>
+
+</beans:beans>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/HeaderEnricherParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/HeaderEnricherParserTests.java
new file mode 100644
index 0000000000..2edd84426a
--- /dev/null
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/HeaderEnricherParserTests.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2002-2010 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.config.xml;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.integration.util.TestUtils;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+/**
+ * @author Mark Fisher
+ * @since 1.0.5
+ */
+@ContextConfiguration
+@RunWith(SpringJUnit4ClassRunner.class)
+public class HeaderEnricherParserTests {
+
+	@Autowired
+	private ApplicationContext context;
+
+
+	@Test // INT-1154
+	public void sendTimeoutConfigured() {
+		Object endpoint = context.getBean("headerEnricherWithSendTimeout");
+		long sendTimeout = TestUtils.getPropertyValue(endpoint, "handler.channelTemplate.sendTimeout", Long.class).longValue();
+		assertEquals(1234L, sendTimeout);
+	}
+
+}