Remove some more deprecated code

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@881530 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java b/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java
index c35ad12..0ce66c7 100644 (file)
--- a/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java
+++ b/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java
@@ -1053,38 +1053,6 @@ public abstract class FileUploadBase {
     }
 
     /**
-     * Thrown to indicate that the request size is not specified. In other
-     * words, it is thrown, if the content-length header is missing or
-     * contains the value -1.
-     * @deprecated As of commons-fileupload 1.2, the presence of a
-     *   content-length header is no longer required.
-     */
-    public static class UnknownSizeException
-        extends FileUploadException {
-        /** The exceptions UID, for serializing an instance.
-         */
-        private static final long serialVersionUID = 7062279004812015273L;
-
-        /**
-         * Constructs a <code>UnknownSizeException</code> with no
-         * detail message.
-         */
-        public UnknownSizeException() {
-            super();
-        }
-
-        /**
-         * Constructs an <code>UnknownSizeException</code> with
-         * the specified detail message.
-         *
-         * @param message The detail message.
-         */
-        public UnknownSizeException(String message) {
-            super(message);
-        }
-    }
-
-    /**
      * Thrown to indicate that the request size exceeds the configured maximum.
      */
     public static class SizeLimitExceededException

diff --git a/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java b/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
index 5f03f4d..ec04d52 100644 (file)
--- a/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
+++ b/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
@@ -270,40 +270,6 @@ public class MultipartStream {
     // ----------------------------------------------------------- Constructors
 
     /**
-     * Creates a new instance.
-     * @deprecated Use {@link #MultipartStream(InputStream, byte[],
-     * org.apache.commons.fileupload.MultipartStream.ProgressNotifier)},
-     * or {@link #MultipartStream(InputStream, byte[], int,
-     * org.apache.commons.fileupload.MultipartStream.ProgressNotifier)}
-     */
-    public MultipartStream() {
-        this(null, null, null);
-    }
-
-    /**
-     * <p> Constructs a <code>MultipartStream</code> with a custom size buffer
-     * and no progress notifier.
-     *
-     * <p> Note that the buffer must be at least big enough to contain the
-     * boundary string, plus 4 characters for CR/LF and double dash, plus at
-     * least one byte of data.  Too small a buffer size setting will degrade
-     * performance.
-     *
-     * @param input    The <code>InputStream</code> to serve as a data source.
-     * @param boundary The token used for dividing the stream into
-     *                 <code>encapsulations</code>.
-     * @param bufSize  The size of the buffer to be used, in bytes.
-     *
-     * @see #MultipartStream(InputStream, byte[],
-     *   MultipartStream.ProgressNotifier)
-     * @deprecated Use {@link #MultipartStream(InputStream, byte[], int,
-     *  org.apache.commons.fileupload.MultipartStream.ProgressNotifier)}.
-     */
-    public MultipartStream(InputStream input, byte[] boundary, int bufSize) {
-        this(input, boundary, bufSize, null);
-    }
-
-    /**
      * <p> Constructs a <code>MultipartStream</code> with a custom size buffer.
      *
      * <p> Note that the buffer must be at least big enough to contain the
@@ -363,23 +329,6 @@ public class MultipartStream {
         this(input, boundary, DEFAULT_BUFSIZE, pNotifier);
     }
 
-    /**
-     * <p> Constructs a <code>MultipartStream</code> with a default size buffer.
-     *
-     * @param input    The <code>InputStream</code> to serve as a data source.
-     * @param boundary The token used for dividing the stream into
-     *                 <code>encapsulations</code>.
-     *
-     * @deprecated Use {@link #MultipartStream(InputStream, byte[],
-     *  MultipartStream.ProgressNotifier)}.
-     * @see #MultipartStream(InputStream, byte[], int,
-     *  MultipartStream.ProgressNotifier)
-     */
-    public MultipartStream(InputStream input,
-            byte[] boundary) {
-        this(input, boundary, DEFAULT_BUFSIZE, null);
-    }
-
     // --------------------------------------------------------- Public methods