root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

unified map view of request parameters, including multiparts

This commit is contained in:
Keith Donald 2009-07-31 04:10:55 +00:00
parent d456a9326e
commit 9ed5353947
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
org.springframework.web/src/main/java/org/springframework/web/context/request/NativeWebRequestParameterMap.java
View File

@ -18,7 +18,9 @@ package org.springframework.web.context.request;
import java.util.Iterator; import java.util.Iterator;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import org.springframework.util.CompositeIterator;
import org.springframework.util.StringKeyedMapAdapter; import org.springframework.util.StringKeyedMapAdapter;
import org.springframework.web.multipart.MultipartRequest;
/** /**
* Map backed by a Web request parameter map for accessing request parameters. * Map backed by a Web request parameter map for accessing request parameters.
@ -42,7 +44,6 @@ public class NativeWebRequestParameterMap extends StringKeyedMapAdapter<Object>
} }
protected Object getAttribute(String key) { protected Object getAttribute(String key) {
/* TODO - MultipartRequest is NOT accessible b/c its in web.servlet
if (request instanceof MultipartRequest) { if (request instanceof MultipartRequest) {
MultipartRequest multipartRequest = (MultipartRequest) request; MultipartRequest multipartRequest = (MultipartRequest) request;
Object data = multipartRequest.getFileMap().get(key); Object data = multipartRequest.getFileMap().get(key);
@ -50,7 +51,6 @@ public class NativeWebRequestParameterMap extends StringKeyedMapAdapter<Object>
return data; return data;
} }
} }
*/
String[] parameters = request.getParameterValues(key); String[] parameters = request.getParameterValues(key);
if (parameters == null) { if (parameters == null) {
return null; return null;
@ -70,17 +70,14 @@ public class NativeWebRequestParameterMap extends StringKeyedMapAdapter<Object>
} }
protected Iterator<String> getAttributeNames() { protected Iterator<String> getAttributeNames() {
return request.getParameterNames();
/* TODO - MultipartRequest is NOT accessible b/c its in web.servlet
if (request instanceof MultipartRequest) { if (request instanceof MultipartRequest) {
MultipartRequest multipartRequest = (MultipartRequest) request; MultipartRequest multipartRequest = (MultipartRequest) request;
CompositeIterator iterator = new CompositeIterator(); CompositeIterator<String> iterator = new CompositeIterator<String>();
iterator.add(multipartRequest.getFileMap().keySet().iterator()); iterator.add(multipartRequest.getFileMap().keySet().iterator());
iterator.add(CollectionUtils.toIterator(request.getParameterNames())); iterator.add(request.getParameterNames());
return iterator; return iterator;
} else { } else {
return CollectionUtils.toIterator(request.getParameterNames()); return request.getParameterNames();
} }
*/
} }
} }