Merge remote-tracking branch 'upstream/master' into 4.0.0-WIP

Conflicts:
	spring-integration-core/src/main/java/org/springframework/integration/gateway/MessagingGatewaySupport.java
	spring-integration-core/src/main/java/org/springframework/integration/support/channel/BeanFactoryChannelResolver.java
	spring-integration-core/src/main/java/org/springframework/integration/util/MessagingMethodInvokerHelper.java
	spring-integration-core/src/test/java/org/springframework/integration/config/AggregatorParserTests.java
	spring-integration-core/src/test/java/org/springframework/integration/config/annotation/AggregatorAnnotationTests.java
	spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusTests.java
	spring-integration-file/src/main/java/org/springframework/integration/file/DefaultFileNameGenerator.java
	spring-integration-file/src/main/java/org/springframework/integration/file/remote/handler/FileTransferringMessageHandler.java
	spring-integration-file/src/test/java/org/springframework/integration/file/remote/gateway/RemoteFileOutboundGatewayTests.java
	spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpOutboundGatewayParserTests.java
	spring-integration-ftp/src/test/java/org/springframework/integration/ftp/inbound/FtpInboundRemoteFileSystemSynchronizerTests.java
	spring-integration-ftp/src/test/java/org/springframework/integration/ftp/outbound/FtpServerOutboundTests.java
	spring-integration-groovy/src/main/java/org/springframework/integration/groovy/GroovyScriptExecutingMessageProcessor.java
	spring-integration-http/src/test/java/org/springframework/integration/http/outbound/UriVariableExpressionTests.java
	spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/HelloWorldInterceptor.java
	spring-integration-jpa/src/test/java/org/springframework/integration/jpa/outbound/JpaOutboundGatewayIntegrationTests.java
	spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/MongoDbMessageGroupStoreTests.java
	spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/MongoDbMessageStoreTests.java
	spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisOutboundChannelAdapterParserTests.java
	spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/SftpOutboundGatewayParserTests.java
	spring-integration-sftp/src/test/java/org/springframework/integration/sftp/inbound/SftpInboundRemoteFileSystemSynchronizerTests.java
	spring-integration-sftp/src/test/java/org/springframework/integration/sftp/outbound/SftpServerOutboundTests.java

Resolved.

spring-integration-http/src/main/java/org/springframework/integration/http/config/HttpAdapterParsingUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -34,6 +34,7 @@ import org.springframework.util.xml.DomUtils;
  * @author Oleg Zhurakousky
  * @author Mark Fisher
  * @author Gary Russell
+ * @author Artem Bilan
  * @since 2.0.2
  */
 abstract class HttpAdapterParsingUtils {
@@ -52,9 +53,23 @@ abstract class HttpAdapterParsingUtils {
 		}
 	}
 
-	static void configureUriVariableExpressions(BeanDefinitionBuilder builder, Element element) {
+	static void configureUriVariableExpressions(BeanDefinitionBuilder builder, ParserContext parserContext, Element element) {
+		String uriVariablesExpression = element.getAttribute("uri-variables-expression");
+
 		List<Element> uriVariableElements = DomUtils.getChildElementsByTagName(element, "uri-variable");
-		if (!CollectionUtils.isEmpty(uriVariableElements)) {
+		boolean hasUriVariableExpressions = !CollectionUtils.isEmpty(uriVariableElements);
+
+		if (StringUtils.hasText(uriVariablesExpression)) {
+			if (hasUriVariableExpressions) {
+				parserContext.getReaderContext().error("'uri-variables-expression' attribute " +
+						"and 'uri-variable' sub-elements are mutually exclusive.", element);
+			}
+			BeanDefinitionBuilder beanDefinitionBuilder = BeanDefinitionBuilder.genericBeanDefinition(ExpressionFactoryBean.class)
+					.addConstructorArgValue(uriVariablesExpression);
+			builder.addPropertyValue("uriVariablesExpression", beanDefinitionBuilder.getBeanDefinition());
+		}
+
+		if (hasUriVariableExpressions) {
 			ManagedMap<String, Object> uriVariableExpressions = new ManagedMap<String, Object>();
 			for (Element uriVariableElement : uriVariableElements) {
 				String name = uriVariableElement.getAttribute("name");

spring-integration-http/src/main/java/org/springframework/integration/http/config/HttpOutboundChannelAdapterParser.java

@@ -77,7 +77,7 @@ public class HttpOutboundChannelAdapterParser extends AbstractOutboundChannelAda
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "charset");
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "extract-payload");
 		HttpAdapterParsingUtils.setExpectedResponseOrExpression(element, parserContext, builder);
-		HttpAdapterParsingUtils.configureUriVariableExpressions(builder, element);
+		HttpAdapterParsingUtils.configureUriVariableExpressions(builder, parserContext, element);
 		return builder.getBeanDefinition();
 	}
 

spring-integration-http/src/main/java/org/springframework/integration/http/config/HttpOutboundGatewayParser.java

@@ -87,7 +87,7 @@ public class HttpOutboundGatewayParser extends AbstractConsumerEndpointParser {
 
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "reply-timeout", "sendTimeout");
 		IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "reply-channel", "outputChannel");
-		HttpAdapterParsingUtils.configureUriVariableExpressions(builder, element);
+		HttpAdapterParsingUtils.configureUriVariableExpressions(builder, parserContext, element);
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "transfer-cookies");
 		return builder;
 	}

spring-integration-http/src/main/java/org/springframework/integration/http/outbound/HttpRequestExecutingMessageHandler.java

@@ -111,6 +111,10 @@ public class HttpRequestExecutingMessageHandler extends AbstractReplyProducingMe
 
 	private volatile HeaderMapper<HttpHeaders> headerMapper = DefaultHttpHeaderMapper.outboundMapper();
 
+	private volatile Expression uriVariablesExpression;
+
+
+
 	/**
 	 * Create a handler that will send requests to the provided URI.
 	 */
@@ -280,6 +284,15 @@ public class HttpRequestExecutingMessageHandler extends AbstractReplyProducingMe
 		}
 	}
 
+	/**
+	 * Set the {@link Expression} to evaluate against the outbound message; the expression
+	 * must evaluate to a Map of URI variable expressions to evaluate against the outbound message
+	 * when replacing the variable placeholders in a URI template.
+	 */
+	public void setUriVariablesExpression(Expression uriVariablesExpression) {
+		this.uriVariablesExpression = uriVariablesExpression;
+	}
+
 	/**
 	 * Set to true if you wish 'Set-Cookie' headers in responses to be
 	 * transferred as 'Cookie' headers in subsequent interactions for
@@ -314,6 +327,7 @@ public class HttpRequestExecutingMessageHandler extends AbstractReplyProducingMe
 	}
 
 	private class ClassToStringConverter implements Converter<Class<?>, String> {
+		@Override
 		public String convert(Class<?> source) {
 			return source.getName();
 		}
@@ -326,6 +340,7 @@ public class HttpRequestExecutingMessageHandler extends AbstractReplyProducingMe
 	 *
 	 */
 	private class ObjectToStringConverter implements Converter<Object, String> {
+		@Override
 		public String convert(Object source) {
 			if (source instanceof Class) {
 				return ((Class<?>) source).getName();
@@ -351,11 +366,7 @@ public class HttpRequestExecutingMessageHandler extends AbstractReplyProducingMe
 			Class<?> expectedResponseType = this.determineExpectedResponseType(requestMessage);
 
 			HttpEntity<?> httpRequest = this.generateHttpRequest(requestMessage, httpMethod);
-			Map<String, Object> uriVariables = ExpressionEvalMap
-					.from(this.uriVariableExpressions)
-					.usingEvaluationContext(this.evaluationContext)
-					.withRoot(requestMessage)
-					.build();
+			Map<String, ?> uriVariables = this.determineUriVariables(requestMessage);
 			UriComponents uriComponents = UriComponentsBuilder.fromUriString(uri).buildAndExpand(uriVariables);
 			URI realUri = this.encodeUri ? uriComponents.toUri() : new URI(uriComponents.toUriString());
 			ResponseEntity<?> httpResponse = this.restTemplate.exchange(realUri, httpMethod, httpRequest, expectedResponseType);
@@ -554,7 +565,6 @@ public class HttpRequestExecutingMessageHandler extends AbstractReplyProducingMe
 		return HttpMethod.valueOf(strHttpMethod);
 	}
 
-
 	private Class<?> determineExpectedResponseType(Message<?> requestMessage) throws Exception{
 		Class<?> expectedResponseType = null;
 		String expectedResponseTypeName = null;
@@ -568,4 +578,22 @@ public class HttpRequestExecutingMessageHandler extends AbstractReplyProducingMe
 
 	}
 
+	@SuppressWarnings("unchecked")
+	private Map<String, ?> determineUriVariables(Message<?> requestMessage) {
+		Map<String, ?> expressions;
+
+		if (this.uriVariablesExpression != null) {
+			expressions = this.uriVariablesExpression.getValue(this.evaluationContext, requestMessage, Map.class);
+		}
+		else {
+			expressions = this.uriVariableExpressions;
+		}
+
+		return ExpressionEvalMap.from(expressions)
+					.usingEvaluationContext(this.evaluationContext)
+					.withRoot(requestMessage)
+					.build();
+
+	}
+
 }

spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-3.0.xsd

@@ -322,78 +322,14 @@
 					<xsd:annotation>
 						<xsd:documentation>
 							Specify an expression for URI variable placeholder within 'url'.
+							This element is mutually exclusive with 'uri-variables-expression' attribute.
 						</xsd:documentation>
 					</xsd:annotation>
 				</xsd:element>
 				<xsd:element name="request-handler-advice-chain" type="integration:adviceChainType" minOccurs="0" maxOccurs="1" />
 			</xsd:choice>
 			<xsd:attributeGroup ref="integration:channelAdapterAttributes"/>
-			<xsd:attribute name="url" type="xsd:string" use="optional">
-				<xsd:annotation>
-					<xsd:documentation>
-						<![CDATA[
-	URL to which the requests should be sent. It may include {placeholders} for
-	evaluation against uri-variables.
-					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-			<xsd:attribute name="url-expression" type="xsd:string" use="optional">
-				<xsd:annotation>
-					<xsd:documentation>
-						<![CDATA[
-	SpEL Expression resolving to a URL to which the requests should be sent. The resolved
-	value may include {placeholders} for further evaluation against uri-variables.
-					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-			<xsd:attribute name="encode-uri" type="xsd:string" default="true">
-				<xsd:annotation>
-					<xsd:documentation>
-						When set to "false", the real URI won't be encoded before the request is sent. This may be useful
-						in some scenarios as it allows user control over the encoding, if needed,
-						for example by using the "url-expression". Default is "true".
-					</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 Default is POST.
-						This attribute cannot be provided if http-method-expression has a value.
-					</xsd:documentation>
-				</xsd:annotation>
-				<xsd:simpleType>
-					<xsd:union memberTypes="httpMethodEnumeration xsd:string" />
-				</xsd:simpleType>
-			</xsd:attribute>
-			<xsd:attribute name="http-method-expression" type="xsd:string">
-				<xsd:annotation>
-					<xsd:documentation>
-						The SpEL expression to determine HTTP method, use when executing requests with this adapter,
-						dynamically. This attribute cannot be provided if http-method has a value.
-					</xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-			<xsd:attribute name="rest-template" type="xsd:string">
-				<xsd:annotation>
-					<xsd:appinfo>
-						<tool:annotation kind="ref">
-							<tool:expected-type type="org.springframework.web.client.RestTemplate" />
-						</tool:annotation>
-					</xsd:appinfo>
-					<xsd:documentation>
-						The reference to org.springframework.web.client.RestTemplate bean to send the HTTP Request.
-					</xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-			<xsd:attribute name="charset" type="xsd:string">
-				<xsd:annotation>
-					<xsd:documentation>
-						Specify the charset name to use for converting String-typed payloads to bytes.
-						The default is 'UTF-8'
-					</xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
+			<xsd:attributeGroup ref="httpOutboundCommonAttributes"/>
 			<xsd:attribute name="extract-payload" type="xsd:string" default="true">
 				<xsd:annotation>
 					<xsd:documentation>
@@ -404,93 +340,6 @@
 					</xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
-			<xsd:attribute name="expected-response-type" type="xsd:string">
-				<xsd:annotation>
-					<xsd:documentation>
-						The expected type to which the response body should be converted.
-						Default is 'org.springframework.http.ResponseEntity'.
-						This attribute cannot be provided if expected-response-type-expression has a value
-					</xsd:documentation>
-					<xsd:appinfo>
-						<tool:annotation kind="direct">
-							<tool:expected-type type="java.lang.Class" />
-						</tool:annotation>
-					</xsd:appinfo>
-				</xsd:annotation>
-			</xsd:attribute>
-			<xsd:attribute name="expected-response-type-expression" type="xsd:string">
-				<xsd:annotation>
-					<xsd:documentation>
-						SpEL expression to determine the type for the expected response to which the response body should be converted
-				        The returned value of the expression could be an instance of java.lang.Class or
-				        java.lang.String representing a fully qualified class name.
-						This attribute cannot be provided if expected-response-type has a value
-					</xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-			<xsd:attribute name="message-converters" type="xsd:string">
-				<xsd:annotation>
-					<xsd:documentation>
-						Provide a reference to a list of HttpMessageConverter instances. If specified, these converters will replace
-						all of the default converters that would normally be present on the underlying RestTemplate.
-					</xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-			<xsd:attribute name="header-mapper" type="xsd:string">
-				<xsd:annotation>
-					<xsd:appinfo>
-						<tool:annotation kind="ref">
-							<tool:expected-type type="org.springframework.integration.mapping.HeaderMapper" />
-						</tool:annotation>
-					</xsd:appinfo>
-					<xsd:documentation>
-						Specify a reference to org.springframework.integration.mapping.HeaderMapper
-						implementation bean. Only one of 'header-mapper' or 'mapped-request-headers' attributes
-						can be provided.
-					</xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-			<xsd:attribute name="mapped-request-headers" type="xsd:string">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-	Comma-separated list of names of MessageHeaders to be mapped into the HttpHeaders of the HTTP request.
-	This can only be provided if the 'header-mapper' reference is not being set directly. The values in
-	this list can also be simple patterns to be matched against the header names (e.g. "foo*" or "*foo").
-	The String "HTTP_REQUEST_HEADERS" will match against any of the standard HTTP Request headers.
-					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-			<xsd:attribute name="request-factory" type="xsd:string">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-	Reference to a ClientHttpRequestFactory to be used by the underlying RestTemplate.
-					]]></xsd:documentation>
-					<xsd:appinfo>
-						<tool:annotation kind="ref">
-							<tool:expected-type type="org.springframework.http.client.ClientHttpRequestFactory" />
-						</tool:annotation>
-					</xsd:appinfo>
-				</xsd:annotation>
-			</xsd:attribute>
-			<xsd:attribute name="error-handler" type="xsd:string">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-	Reference to a ResponseErrorHandler to be used by the underlying RestTemplate.
-					]]></xsd:documentation>
-					<xsd:appinfo>
-						<tool:annotation kind="ref">
-							<tool:expected-type type="org.springframework.web.client.ResponseErrorHandler" />
-						</tool:annotation>
-					</xsd:appinfo>
-				</xsd:annotation>
-			</xsd:attribute>
-			<xsd:attribute name="order" type="xsd:string">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-	Specifies the order for invocation when this adapter is connected as a subscriber to a SubscribableChannel.
-					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
 		</xsd:complexType>
 	</xsd:element>
 
@@ -525,96 +374,6 @@
 							</xsd:documentation>
 						</xsd:annotation>
 					</xsd:attribute>
-					<xsd:attribute name="url" type="xsd:string" use="optional">
-						<xsd:annotation>
-							<xsd:documentation>
-			URL to which the requests should be sent. It may include {placeholders} for
-			evaluation against uri-variables.
-							</xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="url-expression" type="xsd:string" use="optional">
-						<xsd:annotation>
-							<xsd:documentation>
-								<![CDATA[
-			SpEL Expression resolving to a URL to which the requests should be sent. The resolved
-			value may include {placeholders} for further evaluation against uri-variables.
-							]]></xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="encode-uri" type="xsd:string" default="true">
-						<xsd:annotation>
-							<xsd:documentation>
-								When set to "false", the real URI won't be encoded before the request is sent. This may be useful
-								in some scenarios as it allows user control over the encoding, if needed,
-								for example by using the "url-expression". Default is "true".
-							</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. Default is POST.
-								This attribute cannot be provided if http-method-expression has a value.
-							</xsd:documentation>
-						</xsd:annotation>
-						<xsd:simpleType>
-							<xsd:union memberTypes="httpMethodEnumeration xsd:string" />
-						</xsd:simpleType>
-					</xsd:attribute>
-					<xsd:attribute name="http-method-expression" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation>
-								The SpEL expression to determine HTTP method, use when executing requests with this gateway,
-								dynamically. This attribute cannot be provided if http-method has a value.
-							</xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="message-converters" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation>
-								Provide a reference to a list of HttpMessageConverter instances. If specified, these converters will replace
-								all of the default converters that would normally be present on the underlying RestTemplate.
-							</xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="header-mapper" type="xsd:string">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type type="org.springframework.integration.mapping.HeaderMapper" />
-								</tool:annotation>
-							</xsd:appinfo>
-							<xsd:documentation>
-								Specifies a reference to org.springframework.integration.mapping.HeaderMapper
-								implementation bean. Only one of 'header-mapper' or 'mapped-request-headers'('mapped-response-headers')
-								attributes
-								can be provided.
-							</xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="rest-template" type="xsd:string">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type type="org.springframework.web.client.RestTemplate" />
-								</tool:annotation>
-								<xsd:documentation>
-									The reference to org.springframework.web.client.RestTemplate bean to send the HTTP Request.
-								</xsd:documentation>
-							</xsd:appinfo>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="mapped-request-headers" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation><![CDATA[
-	Comma-separated list of names of MessageHeaders to be mapped into the HttpHeaders of the HTTP request.
-	This can only be provided if the 'header-mapper' reference is not being set directly. The values in
-	this list can also be simple patterns to be matched against the header names (e.g. "foo*" or "*foo").
-	The String "HTTP_REQUEST_HEADERS" will match against any of the standard HTTP Request headers.
-							]]></xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
 					<xsd:attribute name="mapped-response-headers" type="xsd:string">
 						<xsd:annotation>
 							<xsd:documentation><![CDATA[
@@ -626,76 +385,13 @@
 						</xsd:annotation>
 					</xsd:attribute>
 					<xsd:attribute name="extract-request-payload" type="xsd:string">
-						<xsd:annotation>
-						<xsd:documentation>
-							Specifies whether the outbound message's payload should be extracted
-							when preparing the request body. Otherwise the Message instance itself
-							will be serialized.
-							The default value is 'true'.
-						</xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="expected-response-type" type="xsd:string">
 						<xsd:annotation>
 							<xsd:documentation>
-								The expected type to which the response body should be converted.
-								Default is 'org.springframework.http.ResponseEntity'.
-								This attribute cannot be provided if expected-response-type-expression has a value
+								Specifies whether the outbound message's payload should be extracted
+								when preparing the request body. Otherwise the Message instance itself
+								will be serialized.
+								The default value is 'true'.
 							</xsd:documentation>
-							<xsd:appinfo>
-								<tool:annotation kind="direct">
-									<tool:expected-type type="java.lang.Class" />
-								</tool:annotation>
-							</xsd:appinfo>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="expected-response-type-expression" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation>
-								SpEL expression to determine the type for the expected response to which the response body should be converted
-				                The returned value of the expression could be an instance of java.lang.Class or
-				                java.lang.String representing a fully qualified class name.
-								This attribute cannot be provided if expected-response-type has a value
-							</xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="charset" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation>
-								Specify the charset name to use for converting String-typed payloads to bytes.
-								The default is 'UTF-8'
-							</xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="request-factory" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation><![CDATA[
-	Reference to a ClientHttpRequestFactory to be used by the underlying RestTemplate.
-							]]></xsd:documentation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type type="org.springframework.http.client.ClientHttpRequestFactory" />
-								</tool:annotation>
-							</xsd:appinfo>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="error-handler" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation><![CDATA[
-	Reference to a ResponseErrorHandler to be used by the underlying RestTemplate.
-							]]></xsd:documentation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type type="org.springframework.web.client.ResponseErrorHandler" />
-								</tool:annotation>
-							</xsd:appinfo>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="order" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation><![CDATA[
-	Specifies the order for invocation when this gateway is connected as a subscriber to a SubscribableChannel.
-							]]></xsd:documentation>
 						</xsd:annotation>
 					</xsd:attribute>
 					<xsd:attribute name="transfer-cookies" type="xsd:string" default="false">
@@ -730,6 +426,7 @@
 							]]></xsd:documentation>
 						</xsd:annotation>
 					</xsd:attribute>
+					<xsd:attributeGroup ref="httpOutboundCommonAttributes"/>
 				</xsd:extension>
 			</xsd:complexContent>
 		</xsd:complexType>
@@ -873,4 +570,168 @@
 		</xsd:attribute>
 	</xsd:complexType>
 
+	<xsd:attributeGroup name="httpOutboundCommonAttributes">
+		<xsd:attribute name="url" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation>
+					<![CDATA[
+	URL to which the requests should be sent. It may include {placeholders} for
+	evaluation against uri-variables.
+					]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="url-expression" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation>
+					<![CDATA[
+	SpEL Expression resolving to a URL to which the requests should be sent. The resolved
+	value may include {placeholders} for further evaluation against uri-variables.
+					]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="encode-uri" type="xsd:string" default="true">
+			<xsd:annotation>
+				<xsd:documentation>
+					When set to "false", the real URI won't be encoded before the request is sent. This may be useful
+					in some scenarios as it allows user control over the encoding, if needed,
+					for example by using the "url-expression". Default is "true".
+				</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 Default is POST.
+					This attribute cannot be provided if http-method-expression has a value.
+				</xsd:documentation>
+			</xsd:annotation>
+			<xsd:simpleType>
+				<xsd:union memberTypes="httpMethodEnumeration xsd:string" />
+			</xsd:simpleType>
+		</xsd:attribute>
+		<xsd:attribute name="http-method-expression" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation>
+					The SpEL expression to determine HTTP method, use when executing requests with this adapter,
+					dynamically. This attribute cannot be provided if http-method has a value.
+				</xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="rest-template" type="xsd:string">
+			<xsd:annotation>
+				<xsd:appinfo>
+					<tool:annotation kind="ref">
+						<tool:expected-type type="org.springframework.web.client.RestTemplate" />
+					</tool:annotation>
+				</xsd:appinfo>
+				<xsd:documentation>
+					The reference to org.springframework.web.client.RestTemplate bean to send the HTTP Request.
+				</xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="charset" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation>
+					Specify the charset name to use for converting String-typed payloads to bytes.
+					The default is 'UTF-8'
+				</xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="expected-response-type" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation>
+					The expected type to which the response body should be converted.
+					Default is 'org.springframework.http.ResponseEntity'.
+					This attribute cannot be provided if expected-response-type-expression has a value
+				</xsd:documentation>
+				<xsd:appinfo>
+					<tool:annotation kind="direct">
+						<tool:expected-type type="java.lang.Class" />
+					</tool:annotation>
+				</xsd:appinfo>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="expected-response-type-expression" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation>
+					SpEL expression to determine the type for the expected response to which the response body should be converted
+					The returned value of the expression could be an instance of java.lang.Class or
+					java.lang.String representing a fully qualified class name.
+					This attribute cannot be provided if expected-response-type has a value
+				</xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="message-converters" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation>
+					Provide a reference to a list of HttpMessageConverter instances. If specified, these converters will replace
+					all of the default converters that would normally be present on the underlying RestTemplate.
+				</xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="header-mapper" type="xsd:string">
+			<xsd:annotation>
+				<xsd:appinfo>
+					<tool:annotation kind="ref">
+						<tool:expected-type type="org.springframework.integration.mapping.HeaderMapper" />
+					</tool:annotation>
+				</xsd:appinfo>
+				<xsd:documentation>
+					Specify a reference to org.springframework.integration.mapping.HeaderMapper
+					implementation bean. Only one of 'header-mapper' or 'mapped-request-headers' attributes
+					can be provided.
+				</xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="mapped-request-headers" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+	Comma-separated list of names of MessageHeaders to be mapped into the HttpHeaders of the HTTP request.
+	This can only be provided if the 'header-mapper' reference is not being set directly. The values in
+	this list can also be simple patterns to be matched against the header names (e.g. "foo*" or "*foo").
+	The String "HTTP_REQUEST_HEADERS" will match against any of the standard HTTP Request headers.
+					]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="request-factory" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+	Reference to a ClientHttpRequestFactory to be used by the underlying RestTemplate.
+					]]></xsd:documentation>
+				<xsd:appinfo>
+					<tool:annotation kind="ref">
+						<tool:expected-type type="org.springframework.http.client.ClientHttpRequestFactory" />
+					</tool:annotation>
+				</xsd:appinfo>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="error-handler" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+	Reference to a ResponseErrorHandler to be used by the underlying RestTemplate.
+					]]></xsd:documentation>
+				<xsd:appinfo>
+					<tool:annotation kind="ref">
+						<tool:expected-type type="org.springframework.web.client.ResponseErrorHandler" />
+					</tool:annotation>
+				</xsd:appinfo>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="order" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+	Specifies the order for invocation when this adapter is connected as a subscriber to a SubscribableChannel.
+					]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="uri-variables-expression" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+	Specifies the SpEL expression to be evaluate as a Map for URI variable placeholders within 'url'.
+	This attribute is mutually exclusive with 'uri-variable' sub-elements.
+					]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:attributeGroup>
+
 </xsd:schema>