Various multipart fixes, close AsyncHttpClient#296, AsyncHttpClient#297, AsyncHttpClient#298

Author: Stephane Landelle

api/src/main/java/com/ning/http/client/providers/jdk/JDKAsyncHttpProvider.java

@@ -608,7 +608,7 @@ private void configure(URI uri, HttpURLConnection urlConnection, Request request
                         lenght = MAX_BUFFERED_BYTES;
                     }
 
-                    MultipartRequestEntity mre = AsyncHttpProviderUtils.createMultipartRequestEntity(request.getParts(), request.getParams());
+                    MultipartRequestEntity mre = AsyncHttpProviderUtils.createMultipartRequestEntity(request.getParts(), request.getHeaders());
 
                     urlConnection.setRequestProperty("Content-Type", mre.getContentType());
                     urlConnection.setRequestProperty("Content-Length", String.valueOf(mre.getContentLength()));

api/src/main/java/com/ning/http/multipart/FilePart.java

@@ -23,7 +23,7 @@
 
 /**
  * This class is an adaptation of the Apache HttpClient implementation
- *
+ * 
  * @link http://hc.apache.org/httpclient-3.x/
  */
 public class FilePart extends PartBase {
@@ -51,43 +51,40 @@ public class FilePart extends PartBase {
     /**
      * Attachment's file name as a byte array
      */
-    private static final byte[] FILE_NAME_BYTES =
-            MultipartEncodingUtil.getAsciiBytes(FILE_NAME);
+    private static final byte[] FILE_NAME_BYTES = MultipartEncodingUtil.getAsciiBytes(FILE_NAME);
 
     /**
      * Source of the file part.
      */
-    private PartSource source;
+    private final PartSource source;
 
     /**
      * FilePart Constructor.
-     *
-     * @param name        the name for this part
-     * @param partSource  the source for this part
-     * @param contentType the content type for this part, if <code>null</code> the
-     *                    {@link #DEFAULT_CONTENT_TYPE default} is used
-     * @param charset     the charset encoding for this part, if <code>null</code> the
-     *                    {@link #DEFAULT_CHARSET default} is used
+     * 
+     * @param name the name for this part
+     * @param partSource the source for this part
+     * @param contentType the content type for this part, if <code>null</code> the {@link #DEFAULT_CONTENT_TYPE default} is used
+     * @param charset the charset encoding for this part, if <code>null</code> the {@link #DEFAULT_CHARSET default} is used
+     * @param contentId
      */
-    public FilePart(String name, PartSource partSource, String contentType, String charset) {
+    public FilePart(String name, PartSource partSource, String contentType, String charset, String contentId) {
 
-        super(
-                name,
-                contentType == null ? DEFAULT_CONTENT_TYPE : contentType,
-                charset == null ? "ISO-8859-1" : charset,
-                DEFAULT_TRANSFER_ENCODING
-        );
+        super(name, contentType == null ? DEFAULT_CONTENT_TYPE : contentType, charset == null ? "ISO-8859-1" : charset, DEFAULT_TRANSFER_ENCODING, contentId);
 
         if (partSource == null) {
             throw new IllegalArgumentException("Source may not be null");
         }
         this.source = partSource;
     }
+    
+    public FilePart(String name, PartSource partSource, String contentType, String charset) {
+        this(name, partSource, contentType, charset, null);
+    }
 
     /**
      * FilePart Constructor.
-     *
-     * @param name       the name for this part
+     * 
+     * @param name the name for this part
      * @param partSource the source for this part
      */
     public FilePart(String name, PartSource partSource) {
@@ -96,77 +93,64 @@ public FilePart(String name, PartSource partSource) {
 
     /**
      * FilePart Constructor.
-     *
+     * 
      * @param name the name of the file part
      * @param file the file to post
-     * @throws java.io.FileNotFoundException if the <i>file</i> is not a normal
-     *                                       file or if it is not readable.
+     * @throws java.io.FileNotFoundException if the <i>file</i> is not a normal file or if it is not readable.
      */
-    public FilePart(String name, File file)
-            throws FileNotFoundException {
+    public FilePart(String name, File file) throws FileNotFoundException {
         this(name, new FilePartSource(file), null, null);
     }
 
     /**
      * FilePart Constructor.
-     *
-     * @param name        the name of the file part
-     * @param file        the file to post
-     * @param contentType the content type for this part, if <code>null</code> the
-     *                    {@link #DEFAULT_CONTENT_TYPE default} is used
-     * @param charset     the charset encoding for this part, if <code>null</code> the
-     *                    {@link #DEFAULT_CHARSET default} is used
-     * @throws FileNotFoundException if the <i>file</i> is not a normal
-     *                               file or if it is not readable.
-     */
-    public FilePart(String name, File file, String contentType, String charset)
-            throws FileNotFoundException {
+     * 
+     * @param name the name of the file part
+     * @param file the file to post
+     * @param contentType the content type for this part, if <code>null</code> the {@link #DEFAULT_CONTENT_TYPE default} is used
+     * @param charset the charset encoding for this part, if <code>null</code> the {@link #DEFAULT_CHARSET default} is used
+     * @throws FileNotFoundException if the <i>file</i> is not a normal file or if it is not readable.
+     */
+    public FilePart(String name, File file, String contentType, String charset) throws FileNotFoundException {
         this(name, new FilePartSource(file), contentType, charset);
     }
 
     /**
      * FilePart Constructor.
-     *
-     * @param name     the name of the file part
+     * 
+     * @param name the name of the file part
      * @param fileName the file name
-     * @param file     the file to post
-     * @throws FileNotFoundException if the <i>file</i> is not a normal
-     *                               file or if it is not readable.
+     * @param file the file to post
+     * @throws FileNotFoundException if the <i>file</i> is not a normal file or if it is not readable.
      */
-    public FilePart(String name, String fileName, File file)
-            throws FileNotFoundException {
+    public FilePart(String name, String fileName, File file) throws FileNotFoundException {
         this(name, new FilePartSource(fileName, file), null, null);
     }
 
     /**
      * FilePart Constructor.
-     *
-     * @param name        the name of the file part
-     * @param fileName    the file name
-     * @param file        the file to post
-     * @param contentType the content type for this part, if <code>null</code> the
-     *                    {@link #DEFAULT_CONTENT_TYPE default} is used
-     * @param charset     the charset encoding for this part, if <code>null</code> the
-     *                    {@link #DEFAULT_CHARSET default} is used
-     * @throws FileNotFoundException if the <i>file</i> is not a normal
-     *                               file or if it is not readable.
-     */
-    public FilePart(String name, String fileName, File file, String contentType, String charset)
-            throws FileNotFoundException {
+     * 
+     * @param name the name of the file part
+     * @param fileName the file name
+     * @param file the file to post
+     * @param contentType the content type for this part, if <code>null</code> the {@link #DEFAULT_CONTENT_TYPE default} is used
+     * @param charset the charset encoding for this part, if <code>null</code> the {@link #DEFAULT_CHARSET default} is used
+     * @throws FileNotFoundException if the <i>file</i> is not a normal file or if it is not readable.
+     */
+    public FilePart(String name, String fileName, File file, String contentType, String charset) throws FileNotFoundException {
         this(name, new FilePartSource(fileName, file), contentType, charset);
     }
 
     /**
      * Write the disposition header to the output stream
-     *
+     * 
      * @param out The output stream
      * @throws java.io.IOException If an IO problem occurs
      */
-    protected void sendDispositionHeader(OutputStream out)
-            throws IOException {
-        super.sendDispositionHeader(out);
+    protected void sendDispositionHeader(OutputStream out) throws IOException {
         String filename = this.source.getFileName();
         if (filename != null) {
+            super.sendDispositionHeader(out);
             out.write(FILE_NAME_BYTES);
             out.write(QUOTE_BYTES);
             out.write(MultipartEncodingUtil.getAsciiBytes(filename));
@@ -176,7 +160,7 @@ protected void sendDispositionHeader(OutputStream out)
 
     /**
      * Write the data in "source" to the specified stream.
-     *
+     * 
      * @param out The output stream.
      * @throws IOException if an IO problem occurs.
      */
@@ -202,17 +186,17 @@ protected void sendData(OutputStream out) throws IOException {
         }
     }
 
-	public void setStalledTime(long ms) {
-		_stalledTime = ms;
-	}
+    public void setStalledTime(long ms) {
+        _stalledTime = ms;
+    }
 
-	public long getStalledTime() {
-		return _stalledTime;
-	}
+    public long getStalledTime() {
+        return _stalledTime;
+    }
 
     /**
      * Returns the source of the file part.
-     *
+     * 
      * @return The source.
      */
     protected PartSource getSource() {
@@ -221,14 +205,14 @@ protected PartSource getSource() {
 
     /**
      * Return the length of the data.
-     *
+     * 
      * @return The length.
      * @throws IOException if an IO problem occurs
      */
     protected long lengthOfData() throws IOException {
         return source.getLength();
     }
 
-	private long _stalledTime = -1;
+    private long _stalledTime = -1;
 
 }

api/src/main/java/com/ning/http/multipart/FilePartSource.java

@@ -24,7 +24,7 @@
 
 /**
  * This class is an adaptation of the Apache HttpClient implementation
- *
+ * 
  * @link http://hc.apache.org/httpclient-3.x/
  */
 public class FilePartSource implements PartSource {
@@ -41,22 +41,19 @@ public class FilePartSource implements PartSource {
 
     /**
      * Constructor for FilePartSource.
-     *
+     * 
      * @param file the FilePart source File.
-     * @throws java.io.FileNotFoundException if the file does not exist or
-     *                                       cannot be read
+     * @throws java.io.FileNotFoundException if the file does not exist or cannot be read
      */
     public FilePartSource(File file) throws FileNotFoundException {
         this.file = file;
         if (file != null) {
             if (!file.isFile()) {
-                final String errorMessage = 
-                    String.format("File is not a normal file (%s).", file.getAbsolutePath());
+                final String errorMessage = String.format("File is not a normal file (%s).", file.getAbsolutePath());
                 throw new FileNotFoundException(errorMessage);
             }
             if (!file.canRead()) {
-                final String errorMessage = 
-                    String.format("File is not readable (%s).", file.getAbsolutePath());
+                final String errorMessage = String.format("File is not readable (%s).", file.getAbsolutePath());
                 throw new FileNotFoundException(errorMessage);
             }
             this.fileName = file.getName();
@@ -65,23 +62,19 @@ public FilePartSource(File file) throws FileNotFoundException {
 
     /**
      * Constructor for FilePartSource.
-     *
+     * 
      * @param fileName the file name of the FilePart
-     * @param file     the source File for the FilePart
-     * @throws FileNotFoundException if the file does not exist or
-     *                               cannot be read
+     * @param file the source File for the FilePart
+     * @throws FileNotFoundException if the file does not exist or cannot be read
      */
-    public FilePartSource(String fileName, File file)
-            throws FileNotFoundException {
+    public FilePartSource(String fileName, File file) throws FileNotFoundException {
         this(file);
-        if (fileName != null) {
-            this.fileName = fileName;
-        }
+        this.fileName = fileName;
     }
 
     /**
      * Return the length of the file
-     *
+     * 
      * @return the length of the file.
      * @see PartSource#getLength()
      */
@@ -95,17 +88,17 @@ public long getLength() {
 
     /**
      * Return the current filename
-     *
+     * 
      * @return the filename.
      * @see PartSource#getFileName()
      */
     public String getFileName() {
-        return (fileName == null) ? "noname" : fileName;
+        return fileName;
     }
 
     /**
      * Return a new {@link java.io.FileInputStream} for the current filename.
-     *
+     * 
      * @return the new input stream.
      * @throws java.io.IOException If an IO problem occurs.
      * @see PartSource#createInputStream()
@@ -114,13 +107,12 @@ public InputStream createInputStream() throws IOException {
         if (this.file != null) {
             return new FileInputStream(this.file);
         } else {
-            return new ByteArrayInputStream(new byte[]{});
+            return new ByteArrayInputStream(new byte[] {});
         }
     }
 
     public File getFile() {
         return file;
     }
 
-
 }

api/src/main/java/com/ning/http/multipart/MultipartBody.java

@@ -48,8 +48,8 @@ public class MultipartBody implements RandomAccessBody {
 
     enum FileLocation {NONE, START, MIDDLE, END}
 
-    public MultipartBody(List<com.ning.http.client.Part> parts, String boundary, String contentLength) {
-        this.boundary = MultipartEncodingUtil.getAsciiBytes(boundary.substring("multipart/form-data; boundary=".length()));
+    public MultipartBody(List<com.ning.http.client.Part> parts, String contentType, String contentLength) {
+        this.boundary = MultipartEncodingUtil.getAsciiBytes(contentType.substring(contentType.indexOf("boundary=") + "boundary=".length()));
         this.contentLength = Long.parseLong(contentLength);
         this.parts = parts;
 
@@ -430,6 +430,7 @@ private ByteArrayOutputStream generateFileStart(FilePart filePart)
         filePart.sendDispositionHeader(overhead);
         filePart.sendContentTypeHeader(overhead);
         filePart.sendTransferEncodingHeader(overhead);
+        filePart.sendContentIdHeader(overhead);
         filePart.sendEndOfHeader(overhead);
         return overhead;
     }