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

removed MultipartRequest mixin interface again (avoiding a package dependency cycle)

Browse Source
This commit is contained in:
Juergen Hoeller
2009-12-15 00:51:32 +00:00
parent 5b87793521
commit b5b1962530
6 changed files with 12 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/PortletWebRequest.java
View File

@@ -17,9 +17,7 @@
package org.springframework.web.portlet.context;
import java.security.Principal;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import javax.portlet.PortletRequest;
@@ -27,13 +25,9 @@ import javax.portlet.PortletResponse;
import javax.portlet.PortletSession;
import org.springframework.util.CollectionUtils;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
import org.springframework.web.context.request.NativeWebRequest;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartRequest;
/**
* {@link org.springframework.web.context.request.WebRequest} adapter
@@ -44,8 +38,6 @@ import org.springframework.web.multipart.MultipartRequest;
*/
public class PortletWebRequest extends PortletRequestAttributes implements NativeWebRequest {
private MultipartRequest multipartRequest;
private PortletResponse response;
@@ -55,9 +47,6 @@ public class PortletWebRequest extends PortletRequestAttributes implements Nativ
*/
public PortletWebRequest(PortletRequest request) {
super(request);
if (request instanceof MultipartRequest) {
this.multipartRequest = (MultipartRequest) request;
}
}
/**
@@ -166,43 +155,6 @@ public class PortletWebRequest extends PortletRequestAttributes implements Nativ
}
@SuppressWarnings("unchecked")
public Iterator<String> getFileNames() {
if (this.multipartRequest == null) {
return (Iterator<String>) Collections.EMPTY_SET.iterator();
}
return this.multipartRequest.getFileNames();
}
public MultipartFile getFile(String name) {
if (this.multipartRequest == null) {
return null;
}
return this.multipartRequest.getFile(name);
}
public List<MultipartFile> getFiles(String name) {
if (this.multipartRequest == null) {
return null;
}
return this.multipartRequest.getFiles(name);
}
public Map<String, MultipartFile> getFileMap() {
if (this.multipartRequest == null) {
return Collections.emptyMap();
}
return this.multipartRequest.getFileMap();
}
public MultiValueMap<String, MultipartFile> getMultiFileMap() {
if (this.multipartRequest == null) {
return new LinkedMultiValueMap<String, MultipartFile>();
}
return this.multipartRequest.getMultiFileMap();
}
@Override
public String toString() {
return "PortletWebRequest: " + getDescription(true);