INT-1362 HTTP Inbound: Additional EvalCtx Vars.

JIRA: https://jira.springsource.org/browse/INT-1362, https://jira.springsource.org/browse/INT-2469

* Add to the `EvaluationContext` of HTTP Inbound Endpoints additional request variables
* Tests and documentation

INT-2669: Mention SpEL variables in JavaDocs

JIRA: https://jira.springsource.org/browse/INT-2669

INT-1362 Doc Polishing

spring-integration-http/src/test/java/org/springframework/integration/http/inbound/Int2312RequestMappingIntegrationTests-context.xml

@@ -26,8 +26,16 @@
 					 request-channel="toLowerCaseChannel"
 					 payload-expression="#pathVariables.value">
 		<int-http:request-mapping headers="toLowerCase"/>
+
+		<int-http:header name="requestAttributes" expression="#requestAttributes"/>
+		<int-http:header name="requestParams" expression="#requestParams"/>
+		<int-http:header name="requestHeaders" expression="#requestHeaders"/>
+		<int-http:header name="matrixVariables" expression="#matrixVariables"/>
+		<int-http:header name="cookies" expression="#cookies"/>
 	</int-http:inbound-gateway>
 
+	<int:publish-subscribe-channel id="toLowerCaseChannel"/>
+
 	<int:transformer input-channel="toLowerCaseChannel" expression="payload.toLowerCase()"/>
 
 	<int-http:inbound-gateway path="#{TEST_PATH}"

spring-integration-http/src/test/java/org/springframework/integration/http/inbound/Int2312RequestMappingIntegrationTests.java

@@ -17,22 +17,36 @@
 package org.springframework.integration.http.inbound;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;
 
+import javax.servlet.http.Cookie;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
+
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
+import org.springframework.integration.Message;
+import org.springframework.integration.MessageHeaders;
+import org.springframework.integration.MessagingException;
+import org.springframework.integration.core.MessageHandler;
+import org.springframework.integration.core.SubscribableChannel;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.util.AntPathMatcher;
+import org.springframework.util.MultiValueMap;
 import org.springframework.web.bind.UnsatisfiedServletRequestParameterException;
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 import org.springframework.web.servlet.HandlerAdapter;
 import org.springframework.web.servlet.HandlerMapping;
 import org.springframework.web.servlet.mvc.HttpRequestHandlerAdapter;
@@ -53,6 +67,9 @@ public class Int2312RequestMappingIntegrationTests {
 	@Autowired
 	private HandlerMapping handlerMapping;
 
+	@Autowired
+	private SubscribableChannel toLowerCaseChannel;
+
 	private HandlerAdapter handlerAdapter = new HttpRequestHandlerAdapter();
 
 	@Test
@@ -77,22 +94,57 @@ public class Int2312RequestMappingIntegrationTests {
 
 
 	@Test
+	@SuppressWarnings("unchecked")
+	//INT-1362
 	public void testURIVariablesAndHeaders() throws Exception {
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		request.setMethod("GET");
 		String testRequest = "aBc";
+		// TODO test it after upgrade to Spring 4.0
+		// String testRequest = "aBc;q1=1;q2=2";
 		String requestURI = "/test/" + testRequest;
 		request.setRequestURI(requestURI);
+		request.setContentType("text/plain");
+		final Map<String, String> params = new HashMap<String, String>();
+		params.put("foo", "bar");
+		request.setParameters(params);
+		request.setContent("hello".getBytes());
+		final Cookie cookie = new Cookie("foo", "bar");
+		request.setCookies(cookie);
+		request.addHeader("toLowerCase", true);
 
-		//See org.springframework.web.servlet.mvc.method.RequestMappingInfoHandlerMapping#handleMatch
-		Map<String, String> uriTemplateVariables =
-				new AntPathMatcher().extractUriTemplateVariables(TEST_PATH, requestURI);
-		request.setAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE, uriTemplateVariables);
+		//See org.springframework.web.servlet.FrameworkServlet#initContextHolders
+		final RequestAttributes attributes = new ServletRequestAttributes(request);
+		RequestContextHolder.setRequestAttributes(attributes);
+
+		this.toLowerCaseChannel.subscribe(new MessageHandler() {
+			@Override
+			public void handleMessage(Message<?> message) throws MessagingException {
+				MessageHeaders headers = message.getHeaders();
+
+				assertEquals(attributes, headers.get("requestAttributes"));
+
+				Object requestParams = headers.get("requestParams");
+				assertNotNull(requestParams);
+				assertEquals(params, ((MultiValueMap<String, String>) requestParams).toSingleValueMap());
+
+				// TODO test it after upgrade to Spring 4.0
+				// assertEquals(matrixVariables, headers.get("matrixVariables"));
+
+				Object requestHeaders = headers.get("requestHeaders");
+				assertNotNull(requestParams);
+				assertEquals(MediaType.TEXT_PLAIN, ((HttpHeaders) requestHeaders).getContentType());
+
+				Map<String, Cookie> cookies = (Map<String, Cookie>) headers.get("cookies");
+				assertEquals(1, cookies.size());
+				Cookie foo = cookies.get("foo");
+				assertNotNull(foo);
+				assertEquals(cookie, foo);
+			}
+		});
 
 		MockHttpServletResponse response = new MockHttpServletResponse();
 
-		request.addHeader("toLowerCase", true);
-
 		Object handler = this.handlerMapping.getHandler(request).getHandler();
 		this.handlerAdapter.handle(request, response, handler);
 		final String testResponse = response.getContentAsString();