You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by si...@apache.org on 2013/03/05 22:16:27 UTC

svn commit: r1452998 - in /commons/proper/fileupload/trunk/src: changes/ main/java/org/apache/commons/fileupload/ main/java/org/apache/commons/fileupload/disk/ main/java/org/apache/commons/fileupload/portlet/ main/java/org/apache/commons/fileupload/ser...

Author: simonetripodi
Date: Tue Mar  5 21:16:26 2013
New Revision: 1452998

URL: http://svn.apache.org/r1452998
Log:
[FILEUPLOAD-217] #comment drop JDK1.3 support and update to Java5 #resolve

Modified:
    commons/proper/fileupload/trunk/src/changes/changes.xml
    commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/DiskFileUpload.java
    commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/FileItemHeaders.java
    commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/FileUploadBase.java
    commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/ParameterParser.java
    commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/disk/DiskFileItem.java
    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/main/java/org/apache/commons/fileupload/util/FileItemHeadersImpl.java
    commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/FileItemHeadersTest.java
    commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/FileUploadTestCase.java
    commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/MockHttpServletRequest.java
    commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/MockPortletRequest.java
    commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/MockPortletSession.java
    commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/ParameterParserTest.java
    commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/ServletFileUploadTest.java
    commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/SizesTest.java
    commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/StreamingTest.java

Modified: commons/proper/fileupload/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/changes/changes.xml?rev=1452998&r1=1452997&r2=1452998&view=diff
==============================================================================
--- commons/proper/fileupload/trunk/src/changes/changes.xml (original)
+++ commons/proper/fileupload/trunk/src/changes/changes.xml Tue Mar  5 21:16:26 2013
@@ -47,6 +47,9 @@ The <action> type attribute can be add,u
       <action dev="simonetripodi" type="add" issue="FILEUPLOAD-218">
         Update version in POM
       </action>
+      <action dev="simonetripodi" type="add" issue="FILEUPLOAD-217">
+        drop JDK1.3 support and update to Java5
+      </action>
       <action dev="simonetripodi" type="add" issue="FILEUPLOAD-216">
         Update the project tree dirs according to default Maven conventions
       </action>

Modified: commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/DiskFileUpload.java
URL: http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/DiskFileUpload.java?rev=1452998&r1=1452997&r2=1452998&view=diff
==============================================================================
--- commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/DiskFileUpload.java (original)
+++ commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/DiskFileUpload.java Tue Mar  5 21:16:26 2013
@@ -199,7 +199,7 @@ public class DiskFileUpload
      *
      * @deprecated Use <code>ServletFileUpload</code> instead.
      */
-    public List /* FileItem */ parseRequest(HttpServletRequest req,
+    public List<FileItem> parseRequest(HttpServletRequest req,
                                             int sizeThreshold,
                                             long sizeMax, String path)
         throws FileUploadException {

Modified: commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/FileItemHeaders.java
URL: http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/FileItemHeaders.java?rev=1452998&r1=1452997&r2=1452998&view=diff
==============================================================================
--- commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/FileItemHeaders.java (original)
+++ commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/FileItemHeaders.java Tue Mar  5 21:16:26 2013
@@ -57,7 +57,7 @@ public interface FileItemHeaders {
      *         requested header. If the item does not have any headers of
      *         that name, return an empty <code>Iterator</code>
      */
-    Iterator getHeaders(String name);
+    Iterator<String> getHeaders(String name);
 
     /**
      * <p>
@@ -68,5 +68,5 @@ public interface FileItemHeaders {
      *         headers provided with this file item. If the item does not have
      *         any headers return an empty <code>Iterator</code>
      */
-    Iterator getHeaderNames();
+    Iterator<String> getHeaderNames();
 }

Modified: commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/FileUploadBase.java
URL: http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/FileUploadBase.java?rev=1452998&r1=1452997&r2=1452998&view=diff
==============================================================================
--- commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/FileUploadBase.java (original)
+++ commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/FileUploadBase.java Tue Mar  5 21:16:26 2013
@@ -305,7 +305,7 @@ public abstract class FileUploadBase {
      *
      * @deprecated Use the method in <code>ServletFileUpload</code> instead.
      */
-    public List /* FileItem */ parseRequest(HttpServletRequest req)
+    public List<FileItem> parseRequest(HttpServletRequest req)
     throws FileUploadException {
         return parseRequest(new ServletRequestContext(req));
     }
@@ -343,9 +343,9 @@ public abstract class FileUploadBase {
      * @throws FileUploadException if there are problems reading/parsing
      *                             the request or storing files.
      */
-    public List /* FileItem */ parseRequest(RequestContext ctx)
+    public List<FileItem> parseRequest(RequestContext ctx)
             throws FileUploadException {
-        List items = new ArrayList();
+        List<FileItem> items = new ArrayList<FileItem>();
         boolean successful = false;
         try {
             FileItemIterator iter = getItemIterator(ctx);
@@ -385,8 +385,7 @@ public abstract class FileUploadBase {
             throw new FileUploadException(e.getMessage(), e);
         } finally {
             if (!successful) {
-                for (Iterator iterator = items.iterator(); iterator.hasNext();) {
-                    FileItem fileItem = (FileItem) iterator.next();
+                for (FileItem fileItem : items) {
                     try {
                         fileItem.delete();
                     } catch (Throwable e) {
@@ -413,7 +412,7 @@ public abstract class FileUploadBase {
         ParameterParser parser = new ParameterParser();
         parser.setLowerCaseNames(true);
         // Parameter parser can handle null input
-        Map params = parser.parse(contentType, new char[] {';', ','});
+        Map<String, String> params = parser.parse(contentType, new char[] {';', ','});
         String boundaryStr = (String) params.get("boundary");
 
         if (boundaryStr == null) {
@@ -438,7 +437,7 @@ public abstract class FileUploadBase {
      * @return The file name for the current <code>encapsulation</code>.
      * @deprecated Use {@link #getFileName(FileItemHeaders)}.
      */
-    protected String getFileName(Map /* String, String */ headers) {
+    protected String getFileName(Map<String, String> headers) {
         return getFileName(getHeader(headers, CONTENT_DISPOSITION));
     }
 
@@ -467,7 +466,7 @@ public abstract class FileUploadBase {
                 ParameterParser parser = new ParameterParser();
                 parser.setLowerCaseNames(true);
                 // Parameter parser can handle null input
-                Map params = parser.parse(pContentDisposition, ';');
+                Map<String, String> params = parser.parse(pContentDisposition, ';');
                 if (params.containsKey("filename")) {
                     fileName = (String) params.get("filename");
                     if (fileName != null) {
@@ -510,7 +509,7 @@ public abstract class FileUploadBase {
             ParameterParser parser = new ParameterParser();
             parser.setLowerCaseNames(true);
             // Parameter parser can handle null input
-            Map params = parser.parse(pContentDisposition, ';');
+            Map<String, String> params = parser.parse(pContentDisposition, ';');
             fieldName = (String) params.get("name");
             if (fieldName != null) {
                 fieldName = fieldName.trim();
@@ -528,7 +527,7 @@ public abstract class FileUploadBase {
      * @return The field name for the current <code>encapsulation</code>.
      * @deprecated Use {@link #getFieldName(FileItemHeaders)}.
      */
-    protected String getFieldName(Map /* String, String */ headers) {
+    protected String getFieldName(Map<String, String> headers) {
         return getFieldName(getHeader(headers, CONTENT_DISPOSITION));
     }
 
@@ -547,7 +546,7 @@ public abstract class FileUploadBase {
      * @deprecated This method is no longer used in favour of
      *   internally created instances of {@link FileItem}.
      */
-    protected FileItem createItem(Map /* String, String */ headers,
+    protected FileItem createItem(Map<String, String> headers,
                                   boolean isFormField)
         throws FileUploadException {
         return getFileItemFactory().createItem(getFieldName(headers),
@@ -622,12 +621,12 @@ public abstract class FileUploadBase {
      * @return A <code>Map</code> containing the parsed HTTP request headers.
      * @deprecated Use {@link #getParsedHeaders(String)}
      */
-    protected Map /* String, String */ parseHeaders(String headerPart) {
+    protected Map<String, String> parseHeaders(String headerPart) {
         FileItemHeaders headers = getParsedHeaders(headerPart);
-        Map result = new HashMap();
-        for (Iterator iter = headers.getHeaderNames();  iter.hasNext();) {
-            String headerName = (String) iter.next();
-            Iterator iter2 = headers.getHeaders(headerName);
+        Map<String, String> result = new HashMap<String, String>();
+        for (Iterator<String> iter = headers.getHeaderNames();  iter.hasNext();) {
+            String headerName = iter.next();
+            Iterator<String> iter2 = headers.getHeaders(headerName);
             String headerValue = (String) iter2.next();
             while (iter2.hasNext()) {
                 headerValue += "," + iter2.next();
@@ -688,7 +687,7 @@ public abstract class FileUploadBase {
      *         there were multiple headers of that name.
      * @deprecated Use {@link FileItemHeaders#getHeader(String)}.
      */
-    protected final String getHeader(Map /* String, String */ headers,
+    protected final String getHeader(Map<String, String> headers,
             String name) {
         return (String) headers.get(name.toLowerCase());
     }

Modified: commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/ParameterParser.java
URL: http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/ParameterParser.java?rev=1452998&r1=1452997&r2=1452998&view=diff
==============================================================================
--- commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/ParameterParser.java (original)
+++ commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/ParameterParser.java Tue Mar  5 21:16:26 2013
@@ -224,9 +224,9 @@ public class ParameterParser {
      *
      * @return a map of name/value pairs
      */
-    public Map parse(final String str, char[] separators) {
+    public Map<String, String> parse(final String str, char[] separators) {
         if (separators == null || separators.length == 0) {
-            return new HashMap();
+            return new HashMap<String, String>();
         }
         char separator = separators[0];
         if (str != null) {
@@ -253,9 +253,9 @@ public class ParameterParser {
      *
      * @return a map of name/value pairs
      */
-    public Map parse(final String str, char separator) {
+    public Map<String, String> parse(final String str, char separator) {
         if (str == null) {
-            return new HashMap();
+            return new HashMap<String, String>();
         }
         return parse(str.toCharArray(), separator);
     }
@@ -270,9 +270,9 @@ public class ParameterParser {
      *
      * @return a map of name/value pairs
      */
-    public Map parse(final char[] chars, char separator) {
+    public Map<String, String> parse(final char[] chars, char separator) {
         if (chars == null) {
-            return new HashMap();
+            return new HashMap<String, String>();
         }
         return parse(chars, 0, chars.length, separator);
     }
@@ -289,16 +289,16 @@ public class ParameterParser {
      *
      * @return a map of name/value pairs
      */
-    public Map parse(
+    public Map<String, String> parse(
         final char[] chars,
         int offset,
         int length,
         char separator) {
 
         if (chars == null) {
-            return new HashMap();
+            return new HashMap<String, String>();
         }
-        HashMap params = new HashMap();
+        HashMap<String, String> params = new HashMap<String, String>();
         this.chars = chars;
         this.pos = offset;
         this.len = length;

Modified: commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/disk/DiskFileItem.java
URL: http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/disk/DiskFileItem.java?rev=1452998&r1=1452997&r2=1452998&view=diff
==============================================================================
--- commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/disk/DiskFileItem.java (original)
+++ commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/disk/DiskFileItem.java Tue Mar  5 21:16:26 2013
@@ -266,7 +266,7 @@ public class DiskFileItem
         ParameterParser parser = new ParameterParser();
         parser.setLowerCaseNames(true);
         // Parameter parser can handle null input
-        Map params = parser.parse(getContentType(), ';');
+        Map<String, String> params = parser.parse(getContentType(), ';');
         return (String) params.get("charset");
     }
 

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=1452998&r1=1452997&r2=1452998&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  5 21:16:26 2013
@@ -21,6 +21,7 @@ import java.util.List;
 
 import javax.portlet.ActionRequest;
 
+import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.fileupload.FileItemFactory;
 import org.apache.commons.fileupload.FileItemIterator;
 import org.apache.commons.fileupload.FileUpload;
@@ -114,7 +115,7 @@ public class PortletFileUpload extends F
      * @throws FileUploadException if there are problems reading/parsing
      *                             the request or storing files.
      */
-    public List /* FileItem */ parseRequest(ActionRequest request)
+    public List<FileItem> parseRequest(ActionRequest request)
             throws FileUploadException {
         return parseRequest(new PortletRequestContext(request));
     }

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=1452998&r1=1452997&r2=1452998&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  5 21:16:26 2013
@@ -21,6 +21,7 @@ import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 
+import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.fileupload.FileItemFactory;
 import org.apache.commons.fileupload.FileItemIterator;
 import org.apache.commons.fileupload.FileUpload;
@@ -121,7 +122,7 @@ public class ServletFileUpload extends F
      * @throws FileUploadException if there are problems reading/parsing
      *                             the request or storing files.
      */
-    public List /* FileItem */ parseRequest(HttpServletRequest request)
+    public List<FileItem> parseRequest(HttpServletRequest request)
     throws FileUploadException {
         return parseRequest(new ServletRequestContext(request));
     }

Modified: commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/util/FileItemHeadersImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/util/FileItemHeadersImpl.java?rev=1452998&r1=1452997&r2=1452998&view=diff
==============================================================================
--- commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/util/FileItemHeadersImpl.java (original)
+++ commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/util/FileItemHeadersImpl.java Tue Mar  5 21:16:26 2013
@@ -39,31 +39,31 @@ public class FileItemHeadersImpl impleme
      * Map of <code>String</code> keys to a <code>List</code> of
      * <code>String</code> instances.
      */
-    private final Map headerNameToValueListMap = new HashMap();
+    private final Map<String, List<String>> headerNameToValueListMap = new HashMap<String, List<String>>();
 
     /**
      * List to preserve order of headers as added.  This would not be
      * needed if a <code>LinkedHashMap</code> could be used, but don't
      * want to depend on 1.4.
      */
-    private final List headerNameList = new ArrayList();
+    private final List<String> headerNameList = new ArrayList<String>();
 
     public String getHeader(String name) {
         String nameLower = name.toLowerCase();
-        List headerValueList = (List) headerNameToValueListMap.get(nameLower);
+        List<String> headerValueList = headerNameToValueListMap.get(nameLower);
         if (null == headerValueList) {
             return null;
         }
         return (String) headerValueList.get(0);
     }
 
-    public Iterator getHeaderNames() {
+    public Iterator<String> getHeaderNames() {
         return headerNameList.iterator();
     }
 
-    public Iterator getHeaders(String name) {
+    public Iterator<String> getHeaders(String name) {
         String nameLower = name.toLowerCase();
-        List headerValueList = (List) headerNameToValueListMap.get(nameLower);
+        List<String> headerValueList = headerNameToValueListMap.get(nameLower);
         if (null == headerValueList) {
             return Collections.EMPTY_LIST.iterator();
         }
@@ -78,9 +78,9 @@ public class FileItemHeadersImpl impleme
      */
     public synchronized void addHeader(String name, String value) {
         String nameLower = name.toLowerCase();
-        List headerValueList = (List) headerNameToValueListMap.get(nameLower);
+        List<String> headerValueList = headerNameToValueListMap.get(nameLower);
         if (null == headerValueList) {
-            headerValueList = new ArrayList();
+            headerValueList = new ArrayList<String>();
             headerNameToValueListMap.put(nameLower, headerValueList);
             headerNameList.add(nameLower);
         }

Modified: commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/FileItemHeadersTest.java
URL: http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/FileItemHeadersTest.java?rev=1452998&r1=1452997&r2=1452998&view=diff
==============================================================================
--- commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/FileItemHeadersTest.java (original)
+++ commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/FileItemHeadersTest.java Tue Mar  5 21:16:26 2013
@@ -42,7 +42,7 @@ public class FileItemHeadersTest extends
     	aMutableFileItemHeaders.addHeader("TestHeader", "headerValue3");
     	aMutableFileItemHeaders.addHeader("testheader", "headerValue4");
 
-    	Iterator headerNameEnumeration = aMutableFileItemHeaders.getHeaderNames();
+    	Iterator<String> headerNameEnumeration = aMutableFileItemHeaders.getHeaderNames();
     	assertEquals("content-disposition", (String) headerNameEnumeration.next());
     	assertEquals("content-type", (String) headerNameEnumeration.next());
     	assertEquals("testheader", (String) headerNameEnumeration.next());
@@ -54,7 +54,7 @@ public class FileItemHeadersTest extends
     	assertEquals(aMutableFileItemHeaders.getHeader("TestHeader"), "headerValue1");
     	assertNull(aMutableFileItemHeaders.getHeader("DummyHeader"));
 
-    	Iterator headerValueEnumeration;
+    	Iterator<String> headerValueEnumeration;
 
     	headerValueEnumeration = aMutableFileItemHeaders.getHeaders("Content-Type");
     	assertTrue(headerValueEnumeration.hasNext());

Modified: commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/FileUploadTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/FileUploadTestCase.java?rev=1452998&r1=1452997&r2=1452998&view=diff
==============================================================================
--- commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/FileUploadTestCase.java (original)
+++ commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/FileUploadTestCase.java Tue Mar  5 21:16:26 2013
@@ -33,19 +33,19 @@ import junit.framework.TestCase;
 public abstract class FileUploadTestCase extends TestCase {
 	protected static final String CONTENT_TYPE = "multipart/form-data; boundary=---1234";
 
-	protected List parseUpload(byte[] bytes) throws FileUploadException {
+	protected List<FileItem> parseUpload(byte[] bytes) throws FileUploadException {
         return parseUpload(bytes, CONTENT_TYPE);
     }
 
-	protected List parseUpload(byte[] bytes, String contentType) throws FileUploadException {
+	protected List<FileItem> parseUpload(byte[] bytes, String contentType) throws FileUploadException {
 		ServletFileUpload upload = new ServletFileUpload(new DiskFileItemFactory());
         HttpServletRequest request = new MockHttpServletRequest(bytes, contentType);
 
-        List fileItems = upload.parseRequest(request);
+        List<FileItem> fileItems = upload.parseRequest(request);
         return fileItems;
 	}
 
-	protected List parseUpload(String content)
+	protected List<FileItem> parseUpload(String content)
     	throws UnsupportedEncodingException, FileUploadException
     {
 		byte[] bytes = content.getBytes("US-ASCII");

Modified: commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/MockHttpServletRequest.java
URL: http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/MockHttpServletRequest.java?rev=1452998&r1=1452997&r2=1452998&view=diff
==============================================================================
--- commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/MockHttpServletRequest.java (original)
+++ commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/MockHttpServletRequest.java Tue Mar  5 21:16:26 2013
@@ -46,7 +46,7 @@ class MockHttpServletRequest implements 
 	private final InputStream m_requestData;
 	private final int length;
 	private String m_strContentType;
-	private Map m_headers = new java.util.HashMap();
+	private Map<String, String> m_headers = new java.util.HashMap<String, String>();
 
 	/**
 	 * Creates a new instance with the given request data
@@ -110,7 +110,7 @@ class MockHttpServletRequest implements 
 	/**
 	 * @see javax.servlet.http.HttpServletRequest#getHeaders(String)
 	 */
-	public Enumeration getHeaders(String arg0)
+	public Enumeration<String> getHeaders(String arg0)
 	{
 		// todo - implement
 		return null;
@@ -119,7 +119,7 @@ class MockHttpServletRequest implements 
 	/**
 	 * @see javax.servlet.http.HttpServletRequest#getHeaderNames()
 	 */
-	public Enumeration getHeaderNames()
+	public Enumeration<String> getHeaderNames()
 	{
 		// todo - implement
 		return null;
@@ -289,7 +289,7 @@ class MockHttpServletRequest implements 
 	/**
 	 * @see javax.servlet.ServletRequest#getAttributeNames()
 	 */
-	public Enumeration getAttributeNames()
+	public Enumeration<String> getAttributeNames()
 	{
 		return null;
 	}
@@ -356,7 +356,7 @@ class MockHttpServletRequest implements 
 	/**
 	 * @see javax.servlet.ServletRequest#getParameterNames()
 	 */
-	public Enumeration getParameterNames()
+	public Enumeration<String> getParameterNames()
 	{
 		return null;
 	}
@@ -372,7 +372,7 @@ class MockHttpServletRequest implements 
 	/**
 	 * @see javax.servlet.ServletRequest#getParameterMap()
 	 */
-	public Map getParameterMap()
+	public Map<String, String[]> getParameterMap()
 	{
 		return null;
 	}
@@ -490,7 +490,7 @@ class MockHttpServletRequest implements 
 	/**
 	 * @see javax.servlet.ServletRequest#getLocales()
 	 */
-	public Enumeration getLocales()
+	public Enumeration<Locale> getLocales()
 	{
 		return null;
 	}
@@ -545,7 +545,7 @@ class MockHttpServletRequest implements 
 			return in.read();
 		}
 
-		public int read(byte b[], int off, int len) throws IOException 
+		public int read(byte b[], int off, int len) throws IOException
 		{
 		    return in.read(b, off, len);
 		}

Modified: commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/MockPortletRequest.java
URL: http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/MockPortletRequest.java?rev=1452998&r1=1452997&r2=1452998&view=diff
==============================================================================
--- commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/MockPortletRequest.java (original)
+++ commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/MockPortletRequest.java Tue Mar  5 21:16:26 2013
@@ -30,19 +30,19 @@ import javax.portlet.WindowState;
 
 /**
  * A mock portlet request, useful for unit testing and offline utilities
- * 
+ *
  * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
  * @version $Id$
  */
 public class MockPortletRequest implements PortletRequest
 {
     MockPortletSession session = null;
-    
+
     public MockPortletRequest()
     {
-        session = new MockPortletSession();     
+        session = new MockPortletSession();
     }
-    
+
     /* (non-Javadoc)
      * @see javax.portlet.PortletRequest#isWindowStateAllowed(javax.portlet.WindowState)
      */
@@ -112,7 +112,7 @@ public class MockPortletRequest implemen
     /* (non-Javadoc)
      * @see javax.portlet.PortletRequest#getProperties(java.lang.String)
      */
-    public Enumeration getProperties(String name)
+    public Enumeration<String> getProperties(String name)
     {
         // TODO Auto-generated method stub
         return null;
@@ -120,7 +120,7 @@ public class MockPortletRequest implemen
     /* (non-Javadoc)
      * @see javax.portlet.PortletRequest#getPropertyNames()
      */
-    public Enumeration getPropertyNames()
+    public Enumeration<String> getPropertyNames()
     {
         // TODO Auto-generated method stub
         return null;
@@ -184,7 +184,7 @@ public class MockPortletRequest implemen
     /* (non-Javadoc)
      * @see javax.portlet.PortletRequest#getAttributeNames()
      */
-    public Enumeration getAttributeNames()
+    public Enumeration<String> getAttributeNames()
     {
         // TODO Auto-generated method stub
         return null;
@@ -200,7 +200,7 @@ public class MockPortletRequest implemen
     /* (non-Javadoc)
      * @see javax.portlet.PortletRequest#getParameterNames()
      */
-    public Enumeration getParameterNames()
+    public Enumeration<String> getParameterNames()
     {
         // TODO Auto-generated method stub
         return null;
@@ -216,7 +216,7 @@ public class MockPortletRequest implemen
     /* (non-Javadoc)
      * @see javax.portlet.PortletRequest#getParameterMap()
      */
-    public Map getParameterMap()
+    public Map<String, String[]> getParameterMap()
     {
         // TODO Auto-generated method stub
         return null;
@@ -270,7 +270,7 @@ public class MockPortletRequest implemen
     /* (non-Javadoc)
      * @see javax.portlet.PortletRequest#getResponseContentTypes()
      */
-    public Enumeration getResponseContentTypes()
+    public Enumeration<String> getResponseContentTypes()
     {
         // TODO Auto-generated method stub
         return null;
@@ -307,10 +307,10 @@ public class MockPortletRequest implemen
         // TODO Auto-generated method stub
         return 0;
     }
-    
-    public Enumeration getLocales()
+
+    public Enumeration<Locale> getLocales()
     {
         return null;
     }
-    
+
 }

Modified: commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/MockPortletSession.java
URL: http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/MockPortletSession.java?rev=1452998&r1=1452997&r2=1452998&view=diff
==============================================================================
--- commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/MockPortletSession.java (original)
+++ commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/MockPortletSession.java Tue Mar  5 21:16:26 2013
@@ -24,20 +24,20 @@ import javax.portlet.PortletSession;
 /**
  * A mock portlet session, useful for unit testing and offline utilities
  * Note: currently doesn't support scoping
- * 
+ *
  * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
  * @version $Id$
  */
 public class MockPortletSession implements PortletSession
 {
     // Hashtable (not HashMap) makes enumerations easier to work with
-    Hashtable attributes = new Hashtable();
+    Hashtable<String, Object> attributes = new Hashtable<String, Object>();
 
     public MockPortletSession()
-    {     
+    {
     }
-    
-    
+
+
     /* (non-Javadoc)
      * @see javax.portlet.PortletSession#getAttribute(java.lang.String)
      */
@@ -45,7 +45,7 @@ public class MockPortletSession implemen
     {
         return attributes.get(name);
     }
-    
+
     /* (non-Javadoc)
      * @see javax.portlet.PortletSession#getAttribute(java.lang.String, int)
      */
@@ -53,15 +53,15 @@ public class MockPortletSession implemen
     {
         return attributes.get(name);
     }
-    
+
     /* (non-Javadoc)
      * @see javax.portlet.PortletSession#getAttributeNames(int)
      */
-    public Enumeration getAttributeNames(int scope)
+    public Enumeration<String> getAttributeNames(int scope)
     {
         return attributes.keys();
     }
-    
+
     /* (non-Javadoc)
      * @see javax.portlet.PortletSession#getCreationTime()
      */
@@ -70,7 +70,7 @@ public class MockPortletSession implemen
         // TODO Auto-generated method stub
         return 0;
     }
-    
+
     /* (non-Javadoc)
      * @see javax.portlet.PortletSession#getId()
      */
@@ -79,7 +79,7 @@ public class MockPortletSession implemen
         // TODO Auto-generated method stub
         return null;
     }
-    
+
     /* (non-Javadoc)
      * @see javax.portlet.PortletSession#getLastAccessedTime()
      */
@@ -88,7 +88,7 @@ public class MockPortletSession implemen
         // TODO Auto-generated method stub
         return 0;
     }
-    
+
     /* (non-Javadoc)
      * @see javax.portlet.PortletSession#getMaxInactiveInterval()
      */
@@ -97,7 +97,7 @@ public class MockPortletSession implemen
         // TODO Auto-generated method stub
         return 0;
     }
-    
+
     /* (non-Javadoc)
      * @see javax.portlet.PortletSession#invalidate()
      */
@@ -105,7 +105,7 @@ public class MockPortletSession implemen
     {
         // TODO Auto-generated method stub
     }
-    
+
     /* (non-Javadoc)
      * @see javax.portlet.PortletSession#isNew()
      */
@@ -114,7 +114,7 @@ public class MockPortletSession implemen
         // TODO Auto-generated method stub
         return false;
     }
-    
+
     /* (non-Javadoc)
      * @see javax.portlet.PortletSession#removeAttribute(java.lang.String)
      */
@@ -122,7 +122,7 @@ public class MockPortletSession implemen
     {
         attributes.remove(name);
     }
-    
+
     /* (non-Javadoc)
      * @see javax.portlet.PortletSession#removeAttribute(java.lang.String, int)
      */
@@ -130,7 +130,7 @@ public class MockPortletSession implemen
     {
         attributes.remove(name);
     }
-    
+
     /* (non-Javadoc)
      * @see javax.portlet.PortletSession#setAttribute(java.lang.String, java.lang.Object)
      */
@@ -139,12 +139,12 @@ public class MockPortletSession implemen
         attributes.put(name, value);
     }
 
-    public Enumeration getAttributeNames()
+    public Enumeration<String> getAttributeNames()
     {
         return this.getAttributeNames(PortletSession.PORTLET_SCOPE);
-    }    
-    
-    
+    }
+
+
     /* (non-Javadoc)
      * @see javax.portlet.PortletSession#setAttribute(java.lang.String, java.lang.Object, int)
      */
@@ -152,7 +152,7 @@ public class MockPortletSession implemen
     {
         attributes.put(name, value);
     }
-    
+
     /* (non-Javadoc)
      * @see javax.portlet.PortletSession#setMaxInactiveInterval(int)
      */

Modified: commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/ParameterParserTest.java
URL: http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/ParameterParserTest.java?rev=1452998&r1=1452997&r2=1452998&view=diff
==============================================================================
--- commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/ParameterParserTest.java (original)
+++ commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/ParameterParserTest.java Tue Mar  5 21:16:26 2013
@@ -54,7 +54,7 @@ public class ParameterParserTest extends
         String s =
             "test; test1 =  stuff   ; test2 =  \"stuff; stuff\"; test3=\"stuff";
         ParameterParser parser = new ParameterParser();
-        Map params = parser.parse(s, ';');
+        Map<String, String> params = parser.parse(s, ';');
         assertEquals(null, params.get("test"));
         assertEquals("stuff", params.get("test1"));
         assertEquals("stuff; stuff", params.get("test2"));
@@ -91,7 +91,7 @@ public class ParameterParserTest extends
         String s = "text/plain; Charset=UTF-8";
         ParameterParser parser = new ParameterParser();
         parser.setLowerCaseNames(true);
-        Map params = parser.parse(s, ';');
+        Map<String, String> params = parser.parse(s, ';');
         assertEquals("UTF-8", params.get("charset"));
     }
 
@@ -99,7 +99,7 @@ public class ParameterParserTest extends
     {
         String s = "param = \"stuff\\\"; more stuff\"";
         ParameterParser parser = new ParameterParser();
-        Map params = parser.parse(s, ';');
+        Map<String, String> params = parser.parse(s, ';');
         assertEquals(1, params.size());
         assertEquals("stuff\\\"; more stuff", params.get("param"));
 
@@ -111,11 +111,11 @@ public class ParameterParserTest extends
     }
 
     // See: http://issues.apache.org/jira/browse/FILEUPLOAD-139
-    public void testFileUpload139() 
+    public void testFileUpload139()
     {
         ParameterParser parser = new ParameterParser();
         String s = "Content-type: multipart/form-data , boundary=AaB03x";
-        Map params = parser.parse(s, new char[] { ',', ';' });
+        Map<String, String> params = parser.parse(s, new char[] { ',', ';' });
         assertEquals("AaB03x", params.get("boundary"));
 
         s = "Content-type: multipart/form-data, boundary=AaB03x";

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=1452998&r1=1452997&r2=1452998&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  5 21:16:26 2013
@@ -79,25 +79,25 @@ public class ServletFileUploadTest exten
     public void testFileUpload()
             throws IOException, FileUploadException
     {
-        List fileItems = parseUpload("-----1234\r\n" +
-                        "Content-Disposition: form-data; name=\"file\"; filename=\"foo.tab\"\r\n" +
-                        "Content-Type: text/whatever\r\n" +
-                        "\r\n" +
-                        "This is the content of the file\n" +
-                        "\r\n" +
-                        "-----1234\r\n" +
-                        "Content-Disposition: form-data; name=\"field\"\r\n" +
-                        "\r\n" +
-                        "fieldValue\r\n" +
-                        "-----1234\r\n" +
-                        "Content-Disposition: form-data; name=\"multi\"\r\n" +
-                        "\r\n" +
-                        "value1\r\n" +
-                        "-----1234\r\n" +
-                        "Content-Disposition: form-data; name=\"multi\"\r\n" +
-                        "\r\n" +
-                        "value2\r\n" +
-                        "-----1234--\r\n");
+        List<FileItem> fileItems = parseUpload("-----1234\r\n" +
+                                               "Content-Disposition: form-data; name=\"file\"; filename=\"foo.tab\"\r\n" +
+                                               "Content-Type: text/whatever\r\n" +
+                                               "\r\n" +
+                                               "This is the content of the file\n" +
+                                               "\r\n" +
+                                               "-----1234\r\n" +
+                                               "Content-Disposition: form-data; name=\"field\"\r\n" +
+                                               "\r\n" +
+                                               "fieldValue\r\n" +
+                                               "-----1234\r\n" +
+                                               "Content-Disposition: form-data; name=\"multi\"\r\n" +
+                                               "\r\n" +
+                                               "value1\r\n" +
+                                               "-----1234\r\n" +
+                                               "Content-Disposition: form-data; name=\"multi\"\r\n" +
+                                               "\r\n" +
+                                               "value2\r\n" +
+                                               "-----1234--\r\n");
         assertEquals(4, fileItems.size());
 
         FileItem file = (FileItem) fileItems.get(0);
@@ -123,16 +123,16 @@ public class ServletFileUploadTest exten
         assertEquals("value2", multi1.getString());
     }
 
-    public void testFilenameCaseSensitivity() 
+    public void testFilenameCaseSensitivity()
             throws IOException, FileUploadException
     {
-        List fileItems = parseUpload("-----1234\r\n" +
-                        "Content-Disposition: form-data; name=\"FiLe\"; filename=\"FOO.tab\"\r\n" +
-                        "Content-Type: text/whatever\r\n" +
-                        "\r\n" +
-                        "This is the content of the file\n" +
-                        "\r\n" +
-                        "-----1234--\r\n");
+        List<FileItem> fileItems = parseUpload("-----1234\r\n" +
+                                               "Content-Disposition: form-data; name=\"FiLe\"; filename=\"FOO.tab\"\r\n" +
+                                               "Content-Type: text/whatever\r\n" +
+                                               "\r\n" +
+                                               "This is the content of the file\n" +
+                                               "\r\n" +
+                                               "-----1234--\r\n");
         assertEquals(1, fileItems.size());
 
         FileItem file = (FileItem) fileItems.get(0);
@@ -146,11 +146,11 @@ public class ServletFileUploadTest exten
     public void testEmptyFile()
             throws UnsupportedEncodingException, FileUploadException
     {
-        List fileItems = parseUpload ("-----1234\r\n" +
-                "Content-Disposition: form-data; name=\"file\"; filename=\"\"\r\n" +
-                "\r\n" +
-                "\r\n" +
-                "-----1234--\r\n");
+        List<FileItem> fileItems = parseUpload ("-----1234\r\n" +
+                                                "Content-Disposition: form-data; name=\"file\"; filename=\"\"\r\n" +
+                                                "\r\n" +
+                                                "\r\n" +
+                                                "-----1234--\r\n");
         assertEquals(1, fileItems.size());
 
         FileItem file = (FileItem) fileItems.get(0);
@@ -167,23 +167,23 @@ public class ServletFileUploadTest exten
     public void testIE5MacBug()
             throws UnsupportedEncodingException, FileUploadException
     {
-        List fileItems = parseUpload("-----1234\r\n" +
-                "Content-Disposition: form-data; name=\"field1\"\r\n" +
-                "\r\n" +
-                "fieldValue\r\n" +
-                "-----1234\n" + // NOTE \r missing
-                "Content-Disposition: form-data; name=\"submitName.x\"\r\n" +
-                "\r\n" +
-                "42\r\n" +
-                "-----1234\n" + // NOTE \r missing
-                "Content-Disposition: form-data; name=\"submitName.y\"\r\n" +
-                "\r\n" +
-                "21\r\n" +
-                "-----1234\r\n" +
-                "Content-Disposition: form-data; name=\"field2\"\r\n" +
-                "\r\n" +
-                "fieldValue2\r\n" +
-                "-----1234--\r\n");
+        List<FileItem> fileItems = parseUpload("-----1234\r\n" +
+                                               "Content-Disposition: form-data; name=\"field1\"\r\n" +
+                                               "\r\n" +
+                                               "fieldValue\r\n" +
+                                               "-----1234\n" + // NOTE \r missing
+                                               "Content-Disposition: form-data; name=\"submitName.x\"\r\n" +
+                                               "\r\n" +
+                                               "42\r\n" +
+                                               "-----1234\n" + // NOTE \r missing
+                                               "Content-Disposition: form-data; name=\"submitName.y\"\r\n" +
+                                               "\r\n" +
+                                               "21\r\n" +
+                                               "-----1234\r\n" +
+                                               "Content-Disposition: form-data; name=\"field2\"\r\n" +
+                                               "\r\n" +
+                                               "fieldValue2\r\n" +
+                                               "-----1234--\r\n");
 
         assertEquals(4, fileItems.size());
 
@@ -235,7 +235,7 @@ public class ServletFileUploadTest exten
     		"...contents of file2.gif...\r\n" +
     		"--BbC04y--\r\n" +
     		"--AaB03x--";
-    	List fileItems = parseUpload(request.getBytes("US-ASCII"), contentType);
+    	List<FileItem> fileItems = parseUpload(request.getBytes("US-ASCII"), contentType);
         assertEquals(3, fileItems.size());
         FileItem item0 = (FileItem) fileItems.get(0);
         assertEquals("field1", item0.getFieldName());
@@ -256,7 +256,7 @@ public class ServletFileUploadTest exten
      */
     public void testFoldedHeaders()
     		throws IOException, FileUploadException {
-    	List fileItems = parseUpload("-----1234\r\n" +
+    	List<FileItem> fileItems = parseUpload("-----1234\r\n" +
     			"Content-Disposition: form-data; name=\"file\"; filename=\"foo.tab\"\r\n" +
     			"Content-Type: text/whatever\r\n" +
     			"\r\n" +
@@ -317,31 +317,31 @@ public class ServletFileUploadTest exten
         {
             "present", "Is there", "Here", "Is That"
         };
-        List fileItems = parseUpload("-----1234\r\n" +
-                "Content-Disposition: form-data; name=\"file\"; filename=\"foo.tab\"\r\n" +
-                "Content-Type: text/whatever\r\n" +
-                headerNames[0] + ": " + headerValues[0] + "\r\n" +
-                "\r\n" +
-                "This is the content of the file\n" +
-                "\r\n" +
-                "-----1234\r\n" +
-                "Content-Disposition: form-data; \r\n" +
-                "\tname=\"field\"\r\n" +
-                headerNames[1] + ": " + headerValues[1] + "\r\n" +
-                "\r\n" +
-                "fieldValue\r\n" +
-                "-----1234\r\n" +
-                "Content-Disposition: form-data;\r\n" +
-                "     name=\"multi\"\r\n" +
-                headerNames[2] + ": " + headerValues[2] + "\r\n" +
-                "\r\n" +
-                "value1\r\n" +
-                "-----1234\r\n" +
-                "Content-Disposition: form-data; name=\"multi\"\r\n" +
-                headerNames[3] + ": " + headerValues[3] + "\r\n" +
-                "\r\n" +
-                "value2\r\n" +
-                "-----1234--\r\n");
+        List<FileItem> fileItems = parseUpload("-----1234\r\n" +
+                                               "Content-Disposition: form-data; name=\"file\"; filename=\"foo.tab\"\r\n" +
+                                               "Content-Type: text/whatever\r\n" +
+                                               headerNames[0] + ": " + headerValues[0] + "\r\n" +
+                                               "\r\n" +
+                                               "This is the content of the file\n" +
+                                               "\r\n" +
+                                               "-----1234\r\n" +
+                                               "Content-Disposition: form-data; \r\n" +
+                                               "\tname=\"field\"\r\n" +
+                                               headerNames[1] + ": " + headerValues[1] + "\r\n" +
+                                               "\r\n" +
+                                               "fieldValue\r\n" +
+                                               "-----1234\r\n" +
+                                               "Content-Disposition: form-data;\r\n" +
+                                               "     name=\"multi\"\r\n" +
+                                               headerNames[2] + ": " + headerValues[2] + "\r\n" +
+                                               "\r\n" +
+                                               "value1\r\n" +
+                                               "-----1234\r\n" +
+                                               "Content-Disposition: form-data; name=\"multi\"\r\n" +
+                                               headerNames[3] + ": " + headerValues[3] + "\r\n" +
+                                               "\r\n" +
+                                               "value2\r\n" +
+                                               "-----1234--\r\n");
         assertEquals(4, fileItems.size());
 
         FileItem file = (FileItem) fileItems.get(0);

Modified: commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/SizesTest.java
URL: http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/SizesTest.java?rev=1452998&r1=1452997&r2=1452998&view=diff
==============================================================================
--- commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/SizesTest.java (original)
+++ commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/SizesTest.java Tue Mar  5 21:16:26 2013
@@ -55,8 +55,8 @@ public class SizesTest extends FileUploa
         }
         baos.write("-----1234--\r\n".getBytes("US-ASCII"));
 
-        List fileItems = parseUpload(baos.toByteArray());
-        Iterator fileIter = fileItems.iterator();
+        List<FileItem> fileItems = parseUpload(baos.toByteArray());
+        Iterator<FileItem> fileIter = fileItems.iterator();
         add = 16;
         num = 0;
         for (int i = 0;  i < 16384;  i += add) {
@@ -91,11 +91,11 @@ public class SizesTest extends FileUploa
 		ServletFileUpload upload = new ServletFileUpload(new DiskFileItemFactory());
 		upload.setFileSizeMax(-1);
         HttpServletRequest req = new MockHttpServletRequest(request.getBytes("US-ASCII"), CONTENT_TYPE);
-        List fileItems = upload.parseRequest(req);
+        List<FileItem> fileItems = upload.parseRequest(req);
         assertEquals(1, fileItems.size());
         FileItem item = (FileItem) fileItems.get(0);
         assertEquals("This is the content of the file\n", new String(item.get()));
-        
+
 		upload = new ServletFileUpload(new DiskFileItemFactory());
 		upload.setFileSizeMax(40);
         req = new MockHttpServletRequest(request.getBytes("US-ASCII"), CONTENT_TYPE);

Modified: commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/StreamingTest.java
URL: http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/StreamingTest.java?rev=1452998&r1=1452997&r2=1452998&view=diff
==============================================================================
--- commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/StreamingTest.java (original)
+++ commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/StreamingTest.java Tue Mar  5 21:16:26 2013
@@ -46,8 +46,8 @@ public class StreamingTest extends TestC
             throws IOException, FileUploadException
     {
     	byte[] request = newRequest();
-        List fileItems = parseUpload(request);
-        Iterator fileIter = fileItems.iterator();
+        List<FileItem> fileItems = parseUpload(request);
+        Iterator<FileItem> fileIter = fileItems.iterator();
         int add = 16;
         int num = 0;
         for (int i = 0;  i < 16384;  i += add) {
@@ -115,8 +115,8 @@ public class StreamingTest extends TestC
     	} catch (FileUploadException e) {
     		assertTrue(e.getCause() instanceof IOException);
     		assertEquals("123", e.getCause().getMessage());
-        }     
-    }         
+        }
+    }
 
     /**
      * Test for FILEUPLOAD-135
@@ -126,19 +126,19 @@ public class StreamingTest extends TestC
     {
         byte[] request = newShortRequest();
         final ByteArrayInputStream bais = new ByteArrayInputStream(request);
-        List fileItems = parseUpload(new InputStream() {
+        List<FileItem> fileItems = parseUpload(new InputStream() {
             public int read()
             throws IOException
             {
                 return bais.read();
             }
-            public int read(byte b[], int off, int len) throws IOException 
+            public int read(byte b[], int off, int len) throws IOException
             {
                 return bais.read(b, off, Math.min(len, 3));
             }
 
         }, request.length);
-        Iterator fileIter = fileItems.iterator();
+        Iterator<FileItem> fileIter = fileItems.iterator();
         assertTrue(fileIter.hasNext());
         FileItem item = (FileItem) fileIter.next();
         assertEquals("field", item.getFieldName());
@@ -150,7 +150,7 @@ public class StreamingTest extends TestC
         assertTrue(!fileIter.hasNext());
     }
 
-    private List parseUpload(byte[] bytes) throws FileUploadException {
+    private List<FileItem> parseUpload(byte[] bytes) throws FileUploadException {
     	return parseUpload(new ByteArrayInputStream(bytes), bytes.length);
     }
 
@@ -166,7 +166,7 @@ public class StreamingTest extends TestC
         return upload.getItemIterator(new ServletRequestContext(request));
     }
 
-    private List parseUpload(InputStream pStream, int pLength)
+    private List<FileItem> parseUpload(InputStream pStream, int pLength)
     		throws FileUploadException {
         String contentType = "multipart/form-data; boundary=---1234";
 
@@ -175,7 +175,7 @@ public class StreamingTest extends TestC
         HttpServletRequest request = new MockHttpServletRequest(pStream,
         		pLength, contentType);
 
-        List fileItems = upload.parseRequest(new ServletRequestContext(request));
+        List<FileItem> fileItems = upload.parseRequest(new ServletRequestContext(request));
         return fileItems;
     }
 
@@ -223,7 +223,7 @@ public class StreamingTest extends TestC
     }
 
     /**
-     * Tests, whether an {@link InvalidFileNameException} is thrown. 
+     * Tests, whether an {@link InvalidFileNameException} is thrown.
      */
     public void testInvalidFileNameException() throws Exception {
         final String fileName = "foo.exe\u0000.png";
@@ -248,7 +248,7 @@ public class StreamingTest extends TestC
             "value2\r\n" +
             "-----1234--\r\n";
         final byte[] reqBytes = request.getBytes("US-ASCII");
-        
+
         FileItemIterator fileItemIter = parseUpload(reqBytes.length, new ByteArrayInputStream(reqBytes));
         final FileItemStream fileItemStream = fileItemIter.next();
         try {
@@ -260,7 +260,7 @@ public class StreamingTest extends TestC
             assertTrue(e.getMessage().indexOf("foo.exe\\0.png") != -1);
         }
 
-        List fileItems = parseUpload(reqBytes);
+        List<FileItem> fileItems = parseUpload(reqBytes);
         final FileItem fileItem = (FileItem) fileItems.get(0);
         try {
             fileItem.getName();