From d3fde86be35de56b220e246296862a8098a967c8 Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Thu, 24 Jun 2010 23:03:50 +0000
Subject: [PATCH] INT-1207 added support for the "http-method" attribute on
 <outbound-gateway> and <outbound-channel-adapter> elements in the http
 namespace

---
 .../HttpOutboundChannelAdapterParser.java     |  1 +
 .../config/HttpOutboundGatewayParser.java     |  1 +
 .../config/spring-integration-http-2.0.xsd    | 32 +++++++++++++++++++
 ...boundChannelAdapterParserTests-context.xml |  1 +
 ...HttpOutboundChannelAdapterParserTests.java |  3 ++
 ...HttpOutboundGatewayParserTests-context.xml |  1 +
 .../HttpOutboundGatewayParserTests.java       |  3 ++
 7 files changed, 42 insertions(+)

diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/config/HttpOutboundChannelAdapterParser.java b/spring-integration-http/src/main/java/org/springframework/integration/http/config/HttpOutboundChannelAdapterParser.java
index 4e140d9417..cc6d051b81 100644
--- a/spring-integration-http/src/main/java/org/springframework/integration/http/config/HttpOutboundChannelAdapterParser.java
+++ b/spring-integration-http/src/main/java/org/springframework/integration/http/config/HttpOutboundChannelAdapterParser.java
@@ -40,6 +40,7 @@ public class HttpOutboundChannelAdapterParser extends AbstractOutboundChannelAda
 				PACKAGE_PATH + ".HttpRequestExecutingMessageHandler");
 		builder.addPropertyValue("expectReply", false);
 		builder.addConstructorArgValue(element.getAttribute("url"));
+		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "http-method");
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "charset");
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "extract-payload");
 		IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "request-factory");
diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/config/HttpOutboundGatewayParser.java b/spring-integration-http/src/main/java/org/springframework/integration/http/config/HttpOutboundGatewayParser.java
index 7172b74a8c..d98c3c4b8c 100644
--- a/spring-integration-http/src/main/java/org/springframework/integration/http/config/HttpOutboundGatewayParser.java
+++ b/spring-integration-http/src/main/java/org/springframework/integration/http/config/HttpOutboundGatewayParser.java
@@ -43,6 +43,7 @@ public class HttpOutboundGatewayParser extends AbstractConsumerEndpointParser {
 		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(
 				PACKAGE_PATH + ".HttpRequestExecutingMessageHandler");
 		builder.addConstructorArgValue(element.getAttribute("url"));
+		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "http-method");
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "charset");
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "extract-request-payload", "extractPayload");
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "request-timeout", "sendTimeout");
diff --git a/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-2.0.xsd b/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-2.0.xsd
index 916abb4588..dd4a03b5fa 100644
--- a/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-2.0.xsd
+++ b/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-2.0.xsd
@@ -112,6 +112,16 @@
 					]]></xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
+			<xsd:attribute name="http-method">
+				<xsd:annotation>
+					<xsd:documentation>
+	The HTTP method to use when executing requests with this adapter. 
+					</xsd:documentation>
+				</xsd:annotation>
+				<xsd:simpleType>
+					<xsd:union memberTypes="httpMethodEnumeration xsd:string" />
+				</xsd:simpleType>
+			</xsd:attribute>
 			<xsd:attribute name="channel" type="xsd:string" use="required">
 				<xsd:annotation>
 					<xsd:appinfo>
@@ -165,6 +175,16 @@
 							</xsd:documentation>
 						</xsd:annotation>
 					</xsd:attribute>
+					<xsd:attribute name="http-method">
+						<xsd:annotation>
+							<xsd:documentation>
+	The HTTP method to use when executing requests with this adapter. 
+							</xsd:documentation>
+						</xsd:annotation>
+						<xsd:simpleType>
+							<xsd:union memberTypes="httpMethodEnumeration xsd:string" />
+						</xsd:simpleType>
+					</xsd:attribute>
 					<xsd:attribute name="extract-request-payload" type="xsd:string"/>
 					<xsd:attribute name="charset" type="xsd:string"/>
 					<xsd:attribute name="request-factory" type="xsd:string">
@@ -189,6 +209,18 @@
 		</xsd:complexType>
 	</xsd:element>
 
+	<xsd:simpleType name="httpMethodEnumeration">
+		<xsd:restriction base="xsd:token">
+			<xsd:enumeration value="GET" />
+			<xsd:enumeration value="POST" />
+			<xsd:enumeration value="HEAD" />
+			<xsd:enumeration value="OPTIONS" />
+			<xsd:enumeration value="PUT" />
+			<xsd:enumeration value="DELETE" />
+			<xsd:enumeration value="TRACE" />
+		</xsd:restriction>
+	</xsd:simpleType>
+
 	<xsd:complexType name="gatewayType">
 		<xsd:annotation>
 			<xsd:documentation>
diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundChannelAdapterParserTests-context.xml b/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundChannelAdapterParserTests-context.xml
index 1545d4a9c7..b192291fab 100644
--- a/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundChannelAdapterParserTests-context.xml
+++ b/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundChannelAdapterParserTests-context.xml
@@ -16,6 +16,7 @@
 
 	<outbound-channel-adapter id="fullConfig"
 		url="http://localhost/test2"
+		http-method="GET"
 		channel="requests"
 		charset="UTF-8"
 		extract-payload="false"
diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundChannelAdapterParserTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundChannelAdapterParserTests.java
index bc144d767d..e5c69ef478 100644
--- a/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundChannelAdapterParserTests.java
+++ b/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundChannelAdapterParserTests.java
@@ -27,6 +27,7 @@ import org.springframework.beans.DirectFieldAccessor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.ApplicationContext;
+import org.springframework.http.HttpMethod;
 import org.springframework.http.client.ClientHttpRequestFactory;
 import org.springframework.http.client.SimpleClientHttpRequestFactory;
 import org.springframework.integration.endpoint.AbstractEndpoint;
@@ -69,6 +70,7 @@ public class HttpOutboundChannelAdapterParserTests {
 		assertTrue(requestFactory instanceof SimpleClientHttpRequestFactory);
 		DirectFieldAccessor mapperAccessor = new DirectFieldAccessor(mapper);
 		assertEquals("http://localhost/test1", handlerAccessor.getPropertyValue("uri"));
+		assertEquals(HttpMethod.POST, handlerAccessor.getPropertyValue("httpMethod"));
 		assertEquals("UTF-8", mapperAccessor.getPropertyValue("charset"));
 		assertEquals(true, mapperAccessor.getPropertyValue("extractPayload"));
 	}
@@ -93,6 +95,7 @@ public class HttpOutboundChannelAdapterParserTests {
 		assertEquals(requestFactoryBean, requestFactory);
 		DirectFieldAccessor mapperAccessor = new DirectFieldAccessor(mapper);
 		assertEquals("http://localhost/test2", handlerAccessor.getPropertyValue("uri"));
+		assertEquals(HttpMethod.GET, handlerAccessor.getPropertyValue("httpMethod"));
 		assertEquals("UTF-8", mapperAccessor.getPropertyValue("charset"));
 		assertEquals(false, mapperAccessor.getPropertyValue("extractPayload"));
 	}
diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayParserTests-context.xml b/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayParserTests-context.xml
index af9e57380a..2ec2db3025 100644
--- a/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayParserTests-context.xml
+++ b/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayParserTests-context.xml
@@ -20,6 +20,7 @@
 
 	<outbound-gateway id="fullConfig"
 		url="http://localhost/test2"
+		http-method="PUT"
 		request-channel="requests"
 		request-factory="testRequestFactory"
 		request-timeout="1234"
diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayParserTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayParserTests.java
index 0df15b4ea0..c204443d1c 100644
--- a/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayParserTests.java
+++ b/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayParserTests.java
@@ -28,6 +28,7 @@ import org.springframework.beans.DirectFieldAccessor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.ApplicationContext;
+import org.springframework.http.HttpMethod;
 import org.springframework.http.client.ClientHttpRequestFactory;
 import org.springframework.http.client.SimpleClientHttpRequestFactory;
 import org.springframework.integration.core.MessageChannel;
@@ -73,6 +74,7 @@ public class HttpOutboundGatewayParserTests {
 		assertTrue(requestFactory instanceof SimpleClientHttpRequestFactory);
 		DirectFieldAccessor mapperAccessor = new DirectFieldAccessor(mapper);
 		assertEquals("http://localhost/test1", handlerAccessor.getPropertyValue("uri"));
+		assertEquals(HttpMethod.POST, handlerAccessor.getPropertyValue("httpMethod"));
 		assertEquals("UTF-8", mapperAccessor.getPropertyValue("charset"));
 		assertEquals(true, mapperAccessor.getPropertyValue("extractPayload"));
 	}
@@ -98,6 +100,7 @@ public class HttpOutboundGatewayParserTests {
 		assertTrue(requestFactory instanceof SimpleClientHttpRequestFactory);
 		DirectFieldAccessor mapperAccessor = new DirectFieldAccessor(mapper);
 		assertEquals("http://localhost/test2", handlerAccessor.getPropertyValue("uri"));
+		assertEquals(HttpMethod.PUT, handlerAccessor.getPropertyValue("httpMethod"));
 		assertEquals("UTF-8", mapperAccessor.getPropertyValue("charset"));
 		assertEquals(false, mapperAccessor.getPropertyValue("extractPayload"));
 		Object requestFactoryBean = this.applicationContext.getBean("testRequestFactory");