From 5aad745e5c4301695c152eb5294402a04ee68518 Mon Sep 17 00:00:00 2001 From: markt Date: Tue, 17 Nov 2009 22:03:22 +0000 Subject: [PATCH] Generics git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@881562 13f79535-47bb-0310-9956-ffa450edef68 --- .../http/fileupload/ByteArrayOutputStream.java | 4 ++-- .../tomcat/util/http/fileupload/DiskFileItem.java | 4 ++-- .../util/http/fileupload/FileCleaningTracker.java | 2 +- .../util/http/fileupload/FileItemHeaders.java | 4 ++-- .../util/http/fileupload/FileItemHeadersImpl.java | 21 ++++++++--------- .../util/http/fileupload/FileUploadBase.java | 22 +++++++++++------- .../util/http/fileupload/MultipartStream.java | 8 ++++++- .../util/http/fileupload/ParameterParser.java | 26 +++++++++++----------- .../util/http/fileupload/ServletFileUpload.java | 2 +- 9 files changed, 53 insertions(+), 40 deletions(-) diff --git a/java/org/apache/tomcat/util/http/fileupload/ByteArrayOutputStream.java b/java/org/apache/tomcat/util/http/fileupload/ByteArrayOutputStream.java index 21e7c15f7..9a1908bb7 100644 --- a/java/org/apache/tomcat/util/http/fileupload/ByteArrayOutputStream.java +++ b/java/org/apache/tomcat/util/http/fileupload/ByteArrayOutputStream.java @@ -54,7 +54,7 @@ public class ByteArrayOutputStream extends OutputStream { private static final byte[] EMPTY_BYTE_ARRAY = new byte[0]; /** The list of buffers, which grows and never reduces. */ - private List buffers = new ArrayList(); + private List buffers = new ArrayList(); /** The index of the current buffer. */ private int currentBufferIndex; /** The total count of bytes in all the filled buffers. */ @@ -95,7 +95,7 @@ public class ByteArrayOutputStream extends OutputStream { * @return the buffer */ private byte[] getBuffer(int index) { - return (byte[]) buffers.get(index); + return buffers.get(index); } /** diff --git a/java/org/apache/tomcat/util/http/fileupload/DiskFileItem.java b/java/org/apache/tomcat/util/http/fileupload/DiskFileItem.java index f1e7251a6..3d48a0d07 100644 --- a/java/org/apache/tomcat/util/http/fileupload/DiskFileItem.java +++ b/java/org/apache/tomcat/util/http/fileupload/DiskFileItem.java @@ -252,8 +252,8 @@ public class DiskFileItem ParameterParser parser = new ParameterParser(); parser.setLowerCaseNames(true); // Parameter parser can handle null input - Map params = parser.parse(getContentType(), ';'); - return (String) params.get("charset"); + Map params = parser.parse(getContentType(), ';'); + return params.get("charset"); } diff --git a/java/org/apache/tomcat/util/http/fileupload/FileCleaningTracker.java b/java/org/apache/tomcat/util/http/fileupload/FileCleaningTracker.java index 360a06b2e..6b106b562 100644 --- a/java/org/apache/tomcat/util/http/fileupload/FileCleaningTracker.java +++ b/java/org/apache/tomcat/util/http/fileupload/FileCleaningTracker.java @@ -48,7 +48,7 @@ public class FileCleaningTracker { /** * Collection of Tracker instances in existence. */ - final Collection /* Tracker */ trackers = new Vector(); // synchronized + final Collection trackers = new Vector(); // synchronized /** * Whether to terminate the thread when the tracking is complete. */ diff --git a/java/org/apache/tomcat/util/http/fileupload/FileItemHeaders.java b/java/org/apache/tomcat/util/http/fileupload/FileItemHeaders.java index 7d46743d5..87c5f0a9d 100644 --- a/java/org/apache/tomcat/util/http/fileupload/FileItemHeaders.java +++ b/java/org/apache/tomcat/util/http/fileupload/FileItemHeaders.java @@ -57,7 +57,7 @@ public interface FileItemHeaders { * requested header. If the item does not have any headers of * that name, return an empty Enumeration */ - Iterator getHeaders(String name); + Iterator getHeaders(String name); /** *

@@ -73,5 +73,5 @@ public interface FileItemHeaders { * requested header. If the item does not have any headers of * that name return an empty Enumeration */ - Iterator getHeaderNames(); + Iterator getHeaderNames(); } diff --git a/java/org/apache/tomcat/util/http/fileupload/FileItemHeadersImpl.java b/java/org/apache/tomcat/util/http/fileupload/FileItemHeadersImpl.java index 0c6ee19d3..2e77cf8bf 100644 --- a/java/org/apache/tomcat/util/http/fileupload/FileItemHeadersImpl.java +++ b/java/org/apache/tomcat/util/http/fileupload/FileItemHeadersImpl.java @@ -38,33 +38,34 @@ public class FileItemHeadersImpl implements FileItemHeaders, Serializable { * Map of String keys to a List of * String instances. */ - private final Map headerNameToValueListMap = new HashMap(); + private final Map> headerNameToValueListMap = + new HashMap>(); /** * List to preserve order of headers as added. This would not be * needed if a LinkedHashMap could be used, but don't * want to depend on 1.4. */ - private final List headerNameList = new ArrayList(); + private final List headerNameList = new ArrayList(); public String getHeader(String name) { String nameLower = name.toLowerCase(); - List headerValueList = (List) headerNameToValueListMap.get(nameLower); + List headerValueList = headerNameToValueListMap.get(nameLower); if (null == headerValueList) { return null; } - return (String) headerValueList.get(0); + return headerValueList.get(0); } - public Iterator getHeaderNames() { + public Iterator getHeaderNames() { return headerNameList.iterator(); } - public Iterator getHeaders(String name) { + public Iterator getHeaders(String name) { String nameLower = name.toLowerCase(); - List headerValueList = (List) headerNameToValueListMap.get(nameLower); + List headerValueList = headerNameToValueListMap.get(nameLower); if (null == headerValueList) { - return Collections.EMPTY_LIST.iterator(); + return Collections.emptyList().iterator(); } return headerValueList.iterator(); } @@ -77,9 +78,9 @@ public class FileItemHeadersImpl implements FileItemHeaders, Serializable { */ public synchronized void addHeader(String name, String value) { String nameLower = name.toLowerCase(); - List headerValueList = (List) headerNameToValueListMap.get(nameLower); + List headerValueList = headerNameToValueListMap.get(nameLower); if (null == headerValueList) { - headerValueList = new ArrayList(); + headerValueList = new ArrayList(); headerNameToValueListMap.put(nameLower, headerValueList); headerNameList.add(nameLower); } diff --git a/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java b/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java index 46d20a17a..718f690d5 100644 --- a/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java +++ b/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java @@ -290,11 +290,11 @@ 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 parseRequest(RequestContext ctx) throws FileUploadException { try { FileItemIterator iter = getItemIterator(ctx); - List items = new ArrayList(); + List items = new ArrayList(); FileItemFactory fac = getFileItemFactory(); if (fac == null) { throw new NullPointerException( @@ -345,8 +345,9 @@ public abstract class FileUploadBase { ParameterParser parser = new ParameterParser(); parser.setLowerCaseNames(true); // Parameter parser can handle null input - Map params = parser.parse(contentType, new char[] {';', ','}); - String boundaryStr = (String) params.get("boundary"); + Map params = + parser.parse(contentType, new char[] {';', ','}); + String boundaryStr = params.get("boundary"); if (boundaryStr == null) { return null; @@ -386,9 +387,10 @@ public abstract class FileUploadBase { ParameterParser parser = new ParameterParser(); parser.setLowerCaseNames(true); // Parameter parser can handle null input - Map params = parser.parse(pContentDisposition, ';'); + Map params = + parser.parse(pContentDisposition, ';'); if (params.containsKey("filename")) { - fileName = (String) params.get("filename"); + fileName = params.get("filename"); if (fileName != null) { fileName = fileName.trim(); } else { @@ -429,8 +431,9 @@ public abstract class FileUploadBase { ParameterParser parser = new ParameterParser(); parser.setLowerCaseNames(true); // Parameter parser can handle null input - Map params = parser.parse(pContentDisposition, ';'); - fieldName = (String) params.get("name"); + Map params = + parser.parse(pContentDisposition, ';'); + fieldName = params.get("name"); if (fieldName != null) { fieldName = fieldName.trim(); } @@ -1013,6 +1016,9 @@ public abstract class FileUploadBase { * is exceeded. */ protected abstract static class SizeException extends FileUploadException { + + private static final long serialVersionUID = 1L; + /** * The actual size of the request. */ diff --git a/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java b/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java index 20c28fa6e..88c8f722f 100644 --- a/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java +++ b/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java @@ -680,7 +680,10 @@ public class MultipartStream { * required syntax. */ public static class MalformedStreamException - extends IOException { + extends IOException { + + private static final long serialVersionUID = 1L; + /** * Constructs a MalformedStreamException with no * detail message. @@ -706,6 +709,9 @@ public class MultipartStream { */ public static class IllegalBoundaryException extends IOException { + + private static final long serialVersionUID = 1L; + /** * Constructs an IllegalBoundaryException with no * detail message. diff --git a/java/org/apache/tomcat/util/http/fileupload/ParameterParser.java b/java/org/apache/tomcat/util/http/fileupload/ParameterParser.java index dce150777..f2d3aa2b0 100644 --- a/java/org/apache/tomcat/util/http/fileupload/ParameterParser.java +++ b/java/org/apache/tomcat/util/http/fileupload/ParameterParser.java @@ -224,9 +224,9 @@ public class ParameterParser { * * @return a map of name/value pairs */ - public Map parse(final String str, char[] separators) { + public Map parse(final String str, char[] separators) { if (separators == null || separators.length == 0) { - return new HashMap(); + return new HashMap(); } 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 parse(final String str, char separator) { if (str == null) { - return new HashMap(); + return new HashMap(); } return parse(str.toCharArray(), separator); } @@ -270,11 +270,11 @@ public class ParameterParser { * * @return a map of name/value pairs */ - public Map parse(final char[] chars, char separator) { - if (chars == null) { - return new HashMap(); + public Map parse(final char[] inputChars, char separator) { + if (inputChars == null) { + return new HashMap(); } - return parse(chars, 0, chars.length, separator); + return parse(inputChars, 0, inputChars.length, separator); } /** @@ -289,17 +289,17 @@ public class ParameterParser { * * @return a map of name/value pairs */ - public Map parse( - final char[] chars, + public Map parse( + final char[] inputChars, int offset, int length, char separator) { if (chars == null) { - return new HashMap(); + return new HashMap(); } - HashMap params = new HashMap(); - this.chars = chars; + HashMap params = new HashMap(); + this.chars = inputChars; this.pos = offset; this.len = length; diff --git a/java/org/apache/tomcat/util/http/fileupload/ServletFileUpload.java b/java/org/apache/tomcat/util/http/fileupload/ServletFileUpload.java index 589a22935..7c32eb2f6 100644 --- a/java/org/apache/tomcat/util/http/fileupload/ServletFileUpload.java +++ b/java/org/apache/tomcat/util/http/fileupload/ServletFileUpload.java @@ -117,7 +117,7 @@ public class ServletFileUpload extends FileUpload { * @throws FileUploadException if there are problems reading/parsing * the request or storing files. */ - public List /* FileItem */ parseRequest(HttpServletRequest request) + public List parseRequest(HttpServletRequest request) throws FileUploadException { return parseRequest(new ServletRequestContext(request)); } -- 2.11.0