Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Arjen Poutsma
2010-03-23 08:52:59 +00:00
parent ec577f8e24
commit 465e84eda4
2 changed files with 64 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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)) {
args[i] = resolveHttpHeadersRequest(webRequest);
}
else if (Model.class.isAssignableFrom(paramType) || Map.class.isAssignableFrom(paramType)) {
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)) {
return resolveHttpHeadersRequest(webRequest);
if (Map.class.isAssignableFrom(paramType)) {
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 {
HttpInputMessage inputMessage = createHttpInputMessage(webRequest);
return inputMessage.getHeaders();
private Map resolveRequestHeaderMap(Class<? extends Map> mapType, NativeWebRequest webRequest) {
if (MultiValueMap.class.isAssignableFrom(mapType)) {
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;
}
}
/**