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/test/java/org/springframework/integration/http/config/HttpOutboundChannelAdapterParserTests-context.xml

@@ -13,9 +13,9 @@
 	<si:channel id="requests"/>
 
 	<outbound-channel-adapter id="minimalConfig" url="http://localhost/test1" channel="requests"/>
-	
+
 	<outbound-channel-adapter id="restTemplateConfig" url="http://localhost/test1" channel="requests" rest-template="customRestTemplate"/>
-	
+
 	<beans:bean id="customRestTemplate" class="org.springframework.web.client.RestTemplate"/>
 
 	<outbound-channel-adapter id="fullConfig"
@@ -34,8 +34,14 @@
 		<uri-variable name="foo" expression="headers.bar"/>
 	</outbound-channel-adapter>
 
+	<util:map id="uriVariables">
+		<beans:entry key="foo1" value="bar1"/>
+		<beans:entry key="foo2" value="bar2"/>
+	</util:map>
+
 	<outbound-channel-adapter id="withUrlAndTemplate"
 		url="http://localhost/test1" channel="requests"
+		uri-variables-expression="@uriVariables"
 		rest-template="customRestTemplate"/>
 
 	<outbound-channel-adapter id="withUrlExpression" url-expression="'http://localhost/test1'" channel="requests"/>

spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundChannelAdapterParserTests.java

@@ -57,6 +57,7 @@ import org.springframework.web.client.RestTemplate;
  * @author Mark Fisher
  * @author Gary Russell
  * @author Gunnar Hillert
+ * @author Artem Bilan
  */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration
@@ -166,6 +167,7 @@ public class HttpOutboundChannelAdapterParserTests {
 	}
 
 	@Test
+	@SuppressWarnings("uchecked")
 	public void withUrlAndTemplate() {
 		DirectFieldAccessor endpointAccessor = new DirectFieldAccessor(this.withUrlAndTemplate);
 		RestTemplate restTemplate =
@@ -185,6 +187,14 @@ public class HttpOutboundChannelAdapterParserTests {
 		assertEquals(HttpMethod.POST.name(), TestUtils.getPropertyValue(handler, "httpMethodExpression", Expression.class).getExpressionString());
 		assertEquals("UTF-8", handlerAccessor.getPropertyValue("charset"));
 		assertEquals(true, handlerAccessor.getPropertyValue("extractPayload"));
+
+		//INT-3055
+		Object uriVariablesExpression = handlerAccessor.getPropertyValue("uriVariablesExpression");
+		assertNotNull(uriVariablesExpression);
+		assertEquals("@uriVariables", ((Expression) uriVariablesExpression).getExpressionString());
+		Object uriVariableExpressions = handlerAccessor.getPropertyValue("uriVariableExpressions");
+		assertNotNull(uriVariableExpressions);
+		assertTrue(((Map<?, ?>) uriVariableExpressions).isEmpty());
 	}
 
 	@Test

spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayParserTests-context.xml

@@ -40,7 +40,13 @@
 		<uri-variable name="foo" expression="headers.bar"/>
 	</outbound-gateway>
 
-	<outbound-gateway id="withUrlExpression" url-expression="'http://localhost/test1'" request-channel="requests"/>
+	<util:map id="uriVariables">
+		<beans:entry key="foo1" value="bar1"/>
+		<beans:entry key="foo2" value="bar2"/>
+	</util:map>
+
+	<outbound-gateway id="withUrlExpression" url-expression="'http://localhost/test1'" request-channel="requests"
+					  uri-variables-expression="@uriVariables"/>
 
 	<outbound-gateway id="withAdvice" url-expression="'http://localhost/test1'" request-channel="requests">
 		<request-handler-advice-chain>

spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayParserTests.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.
@@ -170,6 +170,14 @@ public class HttpOutboundGatewayParserTests {
 		assertEquals("UTF-8", handlerAccessor.getPropertyValue("charset"));
 		assertEquals(true, handlerAccessor.getPropertyValue("extractPayload"));
 		assertEquals(false, handlerAccessor.getPropertyValue("transferCookies"));
+
+		//INT-3055
+		Object uriVariablesExpression = handlerAccessor.getPropertyValue("uriVariablesExpression");
+		assertNotNull(uriVariablesExpression);
+		assertEquals("@uriVariables", ((Expression) uriVariablesExpression).getExpressionString());
+		Object uriVariableExpressions = handlerAccessor.getPropertyValue("uriVariableExpressions");
+		assertNotNull(uriVariableExpressions);
+		assertTrue(((Map<?, ?>) uriVariableExpressions).isEmpty());
 	}
 
 	@Test

spring-integration-http/src/test/java/org/springframework/integration/http/outbound/UriVariableExpressionTests.java

@@ -17,6 +17,7 @@
 package org.springframework.integration.http.outbound;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
 import static org.mockito.Mockito.mock;
 
 import java.io.IOException;
@@ -34,6 +35,8 @@ import org.springframework.expression.spel.standard.SpelExpressionParser;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.client.ClientHttpRequest;
 import org.springframework.http.client.SimpleClientHttpRequestFactory;
+import org.springframework.integration.expression.ExpressionEvalMap;
+import org.springframework.integration.support.MessageBuilder;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.support.GenericMessage;
 
@@ -62,14 +65,13 @@ public class UriVariableExpressionTests {
 		handler.setBeanFactory(mock(BeanFactory.class));
 		handler.afterPropertiesSet();
 		Message<?> message = new GenericMessage<Object>("bar");
-		Exception exception = null;
 		try {
 			handler.handleMessage(message);
+			fail("Exception expected.");
 		}
 		catch (Exception e) {
-			exception = e;
+			assertEquals("intentional", e.getCause().getMessage());
 		}
-		assertEquals("intentional", exception.getCause().getMessage());
 		assertEquals("http://test/bar", uriHolder.get().toString());
 	}
 
@@ -92,15 +94,45 @@ public class UriVariableExpressionTests {
 		});
 		handler.setBeanFactory(mock(BeanFactory.class));
 		handler.afterPropertiesSet();
-		Message<?> message = new GenericMessage<Object>("bar");
-		Exception exception = null;
 		try {
-			handler.handleMessage(message);
+			handler.handleMessage(new GenericMessage<Object>("bar"));
+			fail("Exception expected.");
 		}
 		catch (Exception e) {
-			exception = e;
+			assertEquals("intentional", e.getCause().getMessage());
 		}
-		assertEquals("intentional", exception.getCause().getMessage());
+		assertEquals("http://test/bar", uriHolder.get().toString());
+	}
+
+	@Test
+	public void testInt3055UriVariablesExpression() throws Exception {
+		final AtomicReference<URI> uriHolder = new AtomicReference<URI>();
+		HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler("http://test/{foo}");
+
+		handler.setRequestFactory(new SimpleClientHttpRequestFactory() {
+			@Override
+			public ClientHttpRequest createRequest(URI uri, HttpMethod httpMethod) throws IOException {
+				uriHolder.set(uri);
+				throw new RuntimeException("intentional");
+			}
+		});
+		handler.setBeanFactory(mock(BeanFactory.class));
+		handler.setUriVariablesExpression(new SpelExpressionParser().parseExpression("headers.uriVariables"));
+		handler.afterPropertiesSet();
+
+		Map<String, String> expressions = new HashMap<String, String>();
+		expressions.put("foo", "bar");
+
+		Map<String, ?> expressionsMap = ExpressionEvalMap.from(expressions).usingSimpleCallback().build();
+
+		try {
+			handler.handleMessage(MessageBuilder.withPayload("test").setHeader("uriVariables", expressionsMap).build());
+			fail("Exception expected.");
+		}
+		catch (Exception e) {
+			assertEquals("intentional", e.getCause().getMessage());
+		}
+
 		assertEquals("http://test/bar", uriHolder.get().toString());
 	}