Revert: SPR-6021 - Allow for using MultiValueMap in GET request for mapping multiple request params

org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationControllerTests.java

@@ -1352,11 +1352,23 @@ public class ServletAnnotationControllerTests {
 	public void requestHeaderMap() throws Exception {
 		initServlet(RequestHeaderMapController.class);
 
-		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/httpHeaders");
+		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/map");
 		request.addHeader("Content-Type", "text/html");
 		request.addHeader("Custom-Header", new String[]{"value21", "value22"});
 		MockHttpServletResponse response = new MockHttpServletResponse();
 
+		servlet.service(request, response);
+		assertEquals("Content-Type=text/html,Custom-Header=value21", response.getContentAsString());
+
+		request.setRequestURI("/multiValueMap");
+		response = new MockHttpServletResponse();
+
+		servlet.service(request, response);
+		assertEquals("Content-Type=[text/html],Custom-Header=[value21,value22]", response.getContentAsString());
+
+		request.setRequestURI("/httpHeaders");
+		response = new MockHttpServletResponse();
+
 		servlet.service(request, response);
 		assertEquals("Content-Type=[text/html],Custom-Header=[value21,value22]", response.getContentAsString());
 	}
@@ -2427,9 +2439,21 @@ public class ServletAnnotationControllerTests {
 	@Controller
 	public static class RequestHeaderMapController {
 
-		@RequestMapping("/httpHeaders")
+		@RequestMapping("/map")
-		public void httpHeaders(HttpHeaders headers, Writer writer) throws IOException {
+		public void map(@RequestHeader Map<String, String> headers, Writer writer) throws IOException {
-			assertEquals("Invalid Content-Type", new MediaType("text", "html"), headers.getContentType());
+			for (Iterator<Map.Entry<String, String>> it = headers.entrySet().iterator(); it.hasNext();) {
+				Map.Entry<String, String> entry = it.next();
+				writer.write(entry.getKey() + "=" + entry.getValue());
+				if (it.hasNext()) {
+					writer.write(',');
+				}
+
+			}
+		}
+
+		@RequestMapping("/multiValueMap")
+		public void multiValueMap(@RequestHeader MultiValueMap<String, String> headers, Writer writer)
+				throws IOException {
 			for (Iterator<Map.Entry<String, List<String>>> it1 = headers.entrySet().iterator(); it1.hasNext();) {
 				Map.Entry<String, List<String>> entry = it1.next();
 				writer.write(entry.getKey() + "=[");
@@ -2447,6 +2471,12 @@ public class ServletAnnotationControllerTests {
 			}
 		}
 
+		@RequestMapping("/httpHeaders")
+		public void httpHeaders(@RequestHeader HttpHeaders headers, Writer writer) throws IOException {
+			assertEquals("Invalid Content-Type", new MediaType("text", "html"), headers.getContentType());
+			multiValueMap(headers, writer);
+		}
+
 	}
 
 	public interface IMyController {

org.springframework.web/src/main/java/org/springframework/web/bind/annotation/support/HandlerMethodInvoker.java

@@ -27,6 +27,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -259,10 +260,7 @@ public class HandlerMethodInvoker {
 				}
 				else {
 					Class paramType = methodParam.getParameterType();
-					if (HttpHeaders.class.isAssignableFrom(paramType)) {
+					if (Model.class.isAssignableFrom(paramType) || Map.class.isAssignableFrom(paramType)) {
-						args[i] = resolveHttpHeadersRequest(webRequest);
-					}
-					else if (Model.class.isAssignableFrom(paramType) || Map.class.isAssignableFrom(paramType)) {
 						args[i] = implicitModel;
 					}
 					else if (SessionStatus.class.isAssignableFrom(paramType)) {
@@ -482,8 +480,8 @@ public class HandlerMethodInvoker {
 			throws Exception {
 
 		Class<?> paramType = methodParam.getParameterType();
-		if (HttpHeaders.class.isAssignableFrom(paramType)) {
+		if (Map.class.isAssignableFrom(paramType)) {
-			return resolveHttpHeadersRequest(webRequest);
+			return resolveRequestHeaderMap((Class<? extends Map>) paramType, webRequest);
 		}
 		if (headerName.length() == 0) {
 			headerName = getRequiredParameterName(methodParam);
@@ -507,9 +505,32 @@ public class HandlerMethodInvoker {
 		return binder.convertIfNecessary(headerValue, paramType, methodParam);
 	}
 
-	private HttpHeaders resolveHttpHeadersRequest(NativeWebRequest webRequest) throws Exception {
+	private Map resolveRequestHeaderMap(Class<? extends Map> mapType, NativeWebRequest webRequest) {
-		HttpInputMessage inputMessage = createHttpInputMessage(webRequest);
+		if (MultiValueMap.class.isAssignableFrom(mapType)) {
-		return inputMessage.getHeaders();
+			MultiValueMap<String, String> result;
+			if (HttpHeaders.class.isAssignableFrom(mapType)) {
+				result = new HttpHeaders();
+			}
+			else {
+				result = new LinkedMultiValueMap<String, String>();
+			}
+			for (Iterator<String> iterator = webRequest.getHeaderNames(); iterator.hasNext();) {
+				String headerName = iterator.next();
+				for (String headerValue : webRequest.getHeaderValues(headerName)) {
+					result.add(headerName, headerValue);
+				}
+			}
+			return result;
+		}
+		else {
+			Map<String, String> result = new LinkedHashMap<String, String>();
+			for (Iterator<String> iterator = webRequest.getHeaderNames(); iterator.hasNext();) {
+				String headerName = iterator.next();
+				String headerValue = webRequest.getHeader(headerName);
+				result.put(headerName, headerValue);
+			}
+			return result;
+		}
 	}
 
 	/**