commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From simonetrip...@apache.org
Subject svn commit: r1453047 - in /commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload: DefaultFileItem.java DefaultFileItemFactory.java DiskFileUpload.java FileUploadBase.java MultipartStream.java
Date Tue, 05 Mar 2013 22:27:48 GMT
Author: simonetripodi
Date: Tue Mar  5 22:27:47 2013
New Revision: 1453047

URL: http://svn.apache.org/r1453047
Log:
[FILEUPLOAD-215] #comment @deprecated method annotated with @Deprecated #resolve

Modified:
    commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/DefaultFileItem.java
    commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/DefaultFileItemFactory.java
    commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/DiskFileUpload.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/MultipartStream.java

Modified: commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/DefaultFileItem.java
URL: http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/DefaultFileItem.java?rev=1453047&r1=1453046&r2=1453047&view=diff
==============================================================================
--- commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/DefaultFileItem.java
(original)
+++ commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/DefaultFileItem.java
Tue Mar  5 22:27:47 2013
@@ -43,6 +43,7 @@ import org.apache.commons.fileupload.dis
  *
  * @deprecated Use <code>DiskFileItem</code> instead.
  */
+@Deprecated
 public class DefaultFileItem
     extends DiskFileItem {
 
@@ -67,6 +68,7 @@ public class DefaultFileItem
      *
      * @deprecated Use <code>DiskFileItem</code> instead.
      */
+    @Deprecated
     public DefaultFileItem(String fieldName, String contentType,
             boolean isFormField, String fileName, int sizeThreshold,
             File repository) {

Modified: commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/DefaultFileItemFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/DefaultFileItemFactory.java?rev=1453047&r1=1453046&r2=1453047&view=diff
==============================================================================
--- commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/DefaultFileItemFactory.java
(original)
+++ commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/DefaultFileItemFactory.java
Tue Mar  5 22:27:47 2013
@@ -43,6 +43,7 @@ import org.apache.commons.fileupload.dis
  *
  * @deprecated Use <code>DiskFileItemFactory</code> instead.
  */
+@Deprecated
 public class DefaultFileItemFactory extends DiskFileItemFactory {
 
     // ----------------------------------------------------------- Constructors
@@ -54,6 +55,7 @@ public class DefaultFileItemFactory exte
      *
      * @deprecated Use <code>DiskFileItemFactory</code> instead.
      */
+    @Deprecated
     public DefaultFileItemFactory() {
         super();
     }
@@ -71,6 +73,7 @@ public class DefaultFileItemFactory exte
      *
      * @deprecated Use <code>DiskFileItemFactory</code> instead.
      */
+    @Deprecated
     public DefaultFileItemFactory(int sizeThreshold, File repository) {
         super(sizeThreshold, repository);
     }
@@ -94,6 +97,7 @@ public class DefaultFileItemFactory exte
      *
      * @deprecated Use <code>DiskFileItemFactory</code> instead.
      */
+    @Deprecated
     public FileItem createItem(
             String fieldName,
             String contentType,

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=1453047&r1=1453046&r2=1453047&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 22:27:47 2013
@@ -46,6 +46,7 @@ import javax.servlet.http.HttpServletReq
  * @deprecated Use <code>ServletFileUpload</code> together with
  *             <code>DiskFileItemFactory</code> instead.
  */
+@Deprecated
 public class DiskFileUpload
     extends FileUploadBase {
 
@@ -69,6 +70,7 @@ public class DiskFileUpload
      *
      * @deprecated Use <code>FileUpload</code> instead.
      */
+    @Deprecated
     public DiskFileUpload() {
         super();
         this.fileItemFactory = new DefaultFileItemFactory();
@@ -84,6 +86,7 @@ public class DiskFileUpload
      *
      * @deprecated Use <code>FileUpload</code> instead.
      */
+    @Deprecated
     public DiskFileUpload(DefaultFileItemFactory fileItemFactory) {
         super();
         this.fileItemFactory = fileItemFactory;
@@ -100,6 +103,7 @@ public class DiskFileUpload
      *
      * @deprecated Use <code>FileUpload</code> instead.
      */
+    @Deprecated
     public FileItemFactory getFileItemFactory() {
         return fileItemFactory;
     }
@@ -114,6 +118,7 @@ public class DiskFileUpload
      *
      * @deprecated Use <code>FileUpload</code> instead.
      */
+    @Deprecated
     public void setFileItemFactory(FileItemFactory factory) {
         this.fileItemFactory = (DefaultFileItemFactory) factory;
     }
@@ -129,6 +134,7 @@ public class DiskFileUpload
      *
      * @deprecated Use <code>DiskFileItemFactory</code> instead.
      */
+    @Deprecated
     public int getSizeThreshold() {
         return fileItemFactory.getSizeThreshold();
     }
@@ -143,6 +149,7 @@ public class DiskFileUpload
      *
      * @deprecated Use <code>DiskFileItemFactory</code> instead.
      */
+    @Deprecated
     public void setSizeThreshold(int sizeThreshold) {
         fileItemFactory.setSizeThreshold(sizeThreshold);
     }
@@ -158,6 +165,7 @@ public class DiskFileUpload
      *
      * @deprecated Use <code>DiskFileItemFactory</code> instead.
      */
+    @Deprecated
     public String getRepositoryPath() {
         return fileItemFactory.getRepository().getPath();
     }
@@ -173,6 +181,7 @@ public class DiskFileUpload
      *
      * @deprecated Use <code>DiskFileItemFactory</code> instead.
      */
+    @Deprecated
     public void setRepositoryPath(String repositoryPath) {
         fileItemFactory.setRepository(new File(repositoryPath));
     }
@@ -199,6 +208,7 @@ public class DiskFileUpload
      *
      * @deprecated Use <code>ServletFileUpload</code> instead.
      */
+    @Deprecated
     public List<FileItem> parseRequest(HttpServletRequest req,
                                             int sizeThreshold,
                                             long sizeMax, String path)

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=1453047&r1=1453046&r2=1453047&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 22:27:47 2013
@@ -102,6 +102,7 @@ public abstract class FileUploadBase {
      *
      * @deprecated Use the method on <code>ServletFileUpload</code> instead.
      */
+    @Deprecated
     public static boolean isMultipartContent(HttpServletRequest req) {
         return ServletFileUpload.isMultipartContent(req);
     }
@@ -164,6 +165,7 @@ public abstract class FileUploadBase {
      *   1.2, the only applicable limit is the total size of a parts headers,
      *   {@link MultipartStream#HEADER_PART_SIZE_MAX}.
      */
+    @Deprecated
     public static final int MAX_HEADER_SIZE = 1024;
 
 
@@ -305,6 +307,7 @@ public abstract class FileUploadBase {
      *
      * @deprecated Use the method in <code>ServletFileUpload</code> instead.
      */
+    @Deprecated
     public List<FileItem> parseRequest(HttpServletRequest req)
     throws FileUploadException {
         return parseRequest(new ServletRequestContext(req));
@@ -437,6 +440,7 @@ public abstract class FileUploadBase {
      * @return The file name for the current <code>encapsulation</code>.
      * @deprecated Use {@link #getFileName(FileItemHeaders)}.
      */
+    @Deprecated
     protected String getFileName(Map<String, String> headers) {
         return getFileName(getHeader(headers, CONTENT_DISPOSITION));
     }
@@ -527,6 +531,7 @@ public abstract class FileUploadBase {
      * @return The field name for the current <code>encapsulation</code>.
      * @deprecated Use {@link #getFieldName(FileItemHeaders)}.
      */
+    @Deprecated
     protected String getFieldName(Map<String, String> headers) {
         return getFieldName(getHeader(headers, CONTENT_DISPOSITION));
     }
@@ -546,6 +551,7 @@ public abstract class FileUploadBase {
      * @deprecated This method is no longer used in favour of
      *   internally created instances of {@link FileItem}.
      */
+    @Deprecated
     protected FileItem createItem(Map<String, String> headers,
                                   boolean isFormField)
         throws FileUploadException {
@@ -621,6 +627,7 @@ public abstract class FileUploadBase {
      * @return A <code>Map</code> containing the parsed HTTP request headers.
      * @deprecated Use {@link #getParsedHeaders(String)}
      */
+    @Deprecated
     protected Map<String, String> parseHeaders(String headerPart) {
         FileItemHeaders headers = getParsedHeaders(headerPart);
         Map<String, String> result = new HashMap<String, String>();
@@ -687,6 +694,7 @@ public abstract class FileUploadBase {
      *         there were multiple headers of that name.
      * @deprecated Use {@link FileItemHeaders#getHeader(String)}.
      */
+    @Deprecated
     protected final String getHeader(Map<String, String> headers,
             String name) {
         return (String) headers.get(name.toLowerCase());
@@ -1230,6 +1238,7 @@ public abstract class FileUploadBase {
      * @deprecated As of commons-fileupload 1.2, the presence of a
      *   content-length header is no longer required.
      */
+    @Deprecated
     public static class UnknownSizeException
         extends FileUploadException {
         /** The exceptions UID, for serializing an instance.
@@ -1268,6 +1277,7 @@ public abstract class FileUploadBase {
          * @deprecated Replaced by
          * {@link #SizeLimitExceededException(String, long, long)}
          */
+        @Deprecated
         public SizeLimitExceededException() {
             this(null, 0, 0);
         }
@@ -1277,6 +1287,7 @@ public abstract class FileUploadBase {
          * {@link #SizeLimitExceededException(String, long, long)}
          * @param message The exceptions detail message.
          */
+        @Deprecated
         public SizeLimitExceededException(String message) {
             this(message, 0, 0);
         }

Modified: commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/MultipartStream.java
URL: http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/MultipartStream.java?rev=1453047&r1=1453046&r2=1453047&view=diff
==============================================================================
--- commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/MultipartStream.java
(original)
+++ commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/MultipartStream.java
Tue Mar  5 22:27:47 2013
@@ -277,6 +277,7 @@ public class MultipartStream {
      * or {@link #MultipartStream(InputStream, byte[], int,
      * org.apache.commons.fileupload.MultipartStream.ProgressNotifier)}
      */
+    @Deprecated
     public MultipartStream() {
         this(null, null, null);
     }
@@ -300,6 +301,7 @@ public class MultipartStream {
      * @deprecated Use {@link #MultipartStream(InputStream, byte[], int,
      *  org.apache.commons.fileupload.MultipartStream.ProgressNotifier)}.
      */
+    @Deprecated
     public MultipartStream(InputStream input, byte[] boundary, int bufSize) {
         this(input, boundary, bufSize, null);
     }
@@ -376,6 +378,7 @@ public class MultipartStream {
      * @see #MultipartStream(InputStream, byte[], int,
      *  MultipartStream.ProgressNotifier)
      */
+    @Deprecated
     public MultipartStream(InputStream input,
             byte[] boundary) {
         this(input, boundary, DEFAULT_BUFSIZE, null);



Mime
View raw message