svn commit: r1455537 - in /commons/proper/fileupload/trunk/src: main/java/org/apache/commons/fileupload/portlet/ main/java/org/apache/commons/fileupload/servlet/ test/java/org/apache/commons/fileupload/

[simonetripodi]

Author: simonetripodi
Date: Tue Mar 12 14:06:11 2013
New Revision: 1455537

URL: http://svn.apache.org/r1455537
Log:
[FILEUPLOAD-210] #comment added shortcut methods in (Port|Serv)letFileUpload

Modified:
    
commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/portlet/PortletFileUpload.java
    
commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/servlet/ServletFileUpload.java
    
commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/ServletFileUploadTest.java

Modified: 
commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/portlet/PortletFileUpload.java
URL: 
http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/portlet/PortletFileUpload.java?rev=1455537&r1=1455536&r2=1455537&view=diff
==============================================================================
--- 
commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/portlet/PortletFileUpload.java
 (original)
+++ 
commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/portlet/PortletFileUpload.java
 Tue Mar 12 14:06:11 2013
@@ -18,6 +18,7 @@ package org.apache.commons.fileupload.po
 
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 
 import javax.portlet.ActionRequest;
 
@@ -114,6 +115,24 @@ public class PortletFileUpload extends F
      *
      * @param request The portlet request to be parsed.
      *
+     * @return A map of <code>FileItem</code> instances parsed from the 
request.
+     *
+     * @throws FileUploadException if there are problems reading/parsing
+     *                             the request or storing files.
+     *
+     * @since 1.3
+     */
+    public Map<String, List<FileItem>> parseParameterMap(ActionRequest request)
+            throws FileUploadException {
+        return parseParameterMap(new PortletRequestContext(request));
+    }
+
+    /**
+     * Processes an <a href="http://www.ietf.org/rfc/rfc1867.txt";>RFC 1867</a>
+     * compliant <code>multipart/form-data</code> stream.
+     *
+     * @param request The portlet request to be parsed.
+     *
      * @return An iterator to instances of <code>FileItemStream</code>
      *         parsed from the request, in the order that they were
      *         transmitted.

Modified: 
commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/servlet/ServletFileUpload.java
URL: 
http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/servlet/ServletFileUpload.java?rev=1455537&r1=1455536&r2=1455537&view=diff
==============================================================================
--- 
commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/servlet/ServletFileUpload.java
 (original)
+++ 
commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/servlet/ServletFileUpload.java
 Tue Mar 12 14:06:11 2013
@@ -18,6 +18,7 @@ package org.apache.commons.fileupload.se
 
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -123,6 +124,24 @@ public class ServletFileUpload extends F
      *
      * @param request The servlet request to be parsed.
      *
+     * @return A map of <code>FileItem</code> instances parsed from the 
request.
+     *
+     * @throws FileUploadException if there are problems reading/parsing
+     *                             the request or storing files.
+     *
+     * @since 1.3
+     */
+    public Map<String, List<FileItem>> parseParameterMap(HttpServletRequest 
request)
+            throws FileUploadException {
+        return parseParameterMap(new ServletRequestContext(request));
+    }
+
+    /**
+     * Processes an <a href="http://www.ietf.org/rfc/rfc1867.txt";>RFC 1867</a>
+     * compliant <code>multipart/form-data</code> stream.
+     *
+     * @param request The servlet request to be parsed.
+     *
      * @return An iterator to instances of <code>FileItemStream</code>
      *         parsed from the request, in the order that they were
      *         transmitted.

Modified: 
commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/ServletFileUploadTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/ServletFileUploadTest.java?rev=1455537&r1=1455536&r2=1455537&view=diff
==============================================================================
--- 
commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/ServletFileUploadTest.java
 (original)
+++ 
commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/ServletFileUploadTest.java
 Tue Mar 12 14:06:11 2013
@@ -31,7 +31,6 @@ import javax.servlet.http.HttpServletReq
 
 import org.apache.commons.fileupload.disk.DiskFileItemFactory;
 import org.apache.commons.fileupload.servlet.ServletFileUpload;
-import org.apache.commons.fileupload.servlet.ServletRequestContext;
 import org.junit.Test;
 
 /**
@@ -389,7 +388,7 @@ public class ServletFileUploadTest exten
         ServletFileUpload upload = new ServletFileUpload(new 
DiskFileItemFactory());
         HttpServletRequest request = new MockHttpServletRequest(bytes, 
CONTENT_TYPE);
 
-        Map<String, List<FileItem>> mappedParameters = 
upload.parseParameterMap(new ServletRequestContext(request));
+        Map<String, List<FileItem>> mappedParameters = 
upload.parseParameterMap(request);
         assertTrue(mappedParameters.containsKey("file"));
         assertEquals(1, mappedParameters.get("file").size());