Don't create byte arrays for computing multipart Content-Length

Author: Stephane Landelle

api/src/main/java/org/asynchttpclient/multipart/FilePart.java

@@ -61,10 +61,14 @@ public class FilePart extends PartBase {
     /**
      * 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, String contentId) {
@@ -76,16 +80,18 @@ public FilePart(String name, PartSource partSource, String contentType, String c
         }
         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 partSource the source for this part
+     * @param name
+     *            the name for this part
+     * @param partSource
+     *            the source for this part
      */
     public FilePart(String name, PartSource partSource) {
         this(name, partSource, null, null);
@@ -94,9 +100,12 @@ 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.
+     * @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.
      */
     public FilePart(String name, File file) throws FileNotFoundException {
         this(name, new FilePartSource(file), null, null);
@@ -105,11 +114,16 @@ public FilePart(String name, File file) throws FileNotFoundException {
     /**
      * 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.
+     * @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);
@@ -118,10 +132,14 @@ public FilePart(String name, File file, String contentType, String charset) thro
     /**
      * FilePart Constructor.
      * 
-     * @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 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.
      */
     public FilePart(String name, String fileName, File file) throws FileNotFoundException {
         this(name, new FilePartSource(fileName, file), null, null);
@@ -130,12 +148,18 @@ public FilePart(String name, String fileName, File file) throws FileNotFoundExce
     /**
      * 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.
+     * @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);
@@ -144,8 +168,10 @@ public FilePart(String name, String fileName, File file, String contentType, Str
     /**
      * Write the disposition header to the output stream
      * 
-     * @param out The output stream
-     * @throws java.io.IOException If an IO problem occurs
+     * @param out
+     *            The output stream
+     * @throws java.io.IOException
+     *             If an IO problem occurs
      */
     protected void sendDispositionHeader(OutputStream out) throws IOException {
         super.sendDispositionHeader(out);
@@ -158,11 +184,25 @@ protected void sendDispositionHeader(OutputStream out) throws IOException {
         }
     }
 
+    protected long dispositionHeaderLength() {
+        String filename = this.source.getFileName();
+        long length = super.dispositionHeaderLength();
+        if (filename != null) {
+            length += FILE_NAME_BYTES.length;
+            length += QUOTE_BYTES.length;
+            length += MultipartEncodingUtil.getAsciiBytes(filename).length;
+            length += QUOTE_BYTES.length;
+        }
+        return length;
+    }
+
     /**
      * Write the data in "source" to the specified stream.
      * 
-     * @param out The output stream.
-     * @throws IOException if an IO problem occurs.
+     * @param out
+     *            The output stream.
+     * @throws IOException
+     *             if an IO problem occurs.
      */
     protected void sendData(OutputStream out) throws IOException {
         if (lengthOfData() == 0) {
@@ -207,9 +247,8 @@ protected PartSource getSource() {
      * Return the length of the data.
      * 
      * @return The length.
-     * @throws IOException if an IO problem occurs
      */
-    protected long lengthOfData() throws IOException {
+    protected long lengthOfData() {
         return source.getLength();
     }
 

api/src/main/java/org/asynchttpclient/multipart/MultipartBody.java

@@ -154,16 +154,6 @@ public long read(ByteBuffer buffer) throws IOException {
         }
     }
 
-    private void initializeByteArrayBody(FilePart filePart) throws IOException {
-
-        ByteArrayOutputStream output = new ByteArrayOutputStream();
-        filePart.sendData(output);
-
-        initializeBuffer(output);
-
-        fileLocation = FileLocation.MIDDLE;
-    }
-
     private void initializeFileEnd(FilePart currentPart) throws IOException {
 
         ByteArrayOutputStream output = generateFileEnd(currentPart);
@@ -206,22 +196,15 @@ private void initializeFileBody(FilePart currentPart) throws IOException {
 
     private void initializeFilePart(FilePart filePart) throws IOException {
 
-        filePart.setPartBoundary(boundary);
-
         ByteArrayOutputStream output = generateFileStart(filePart);
-
         initializeBuffer(output);
-
         fileLocation = FileLocation.START;
     }
 
     private void initializeStringPart(StringPart currentPart) throws IOException {
-        currentPart.setPartBoundary(boundary);
 
         ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-
         Part.sendPart(outputStream, currentPart, boundary);
-
         initializeBuffer(outputStream);
     }
 
@@ -281,33 +264,25 @@ public long transferTo(long position, long count, WritableByteChannel target) th
     }
 
     private long handleFileEnd(WritableByteChannel target, FilePart filePart) throws IOException {
-
         ByteArrayOutputStream endOverhead = generateFileEnd(filePart);
-
         return this.writeToTarget(target, endOverhead);
     }
 
     private ByteArrayOutputStream generateFileEnd(FilePart filePart) throws IOException {
         ByteArrayOutputStream endOverhead = new ByteArrayOutputStream();
-
         filePart.sendEnd(endOverhead);
         return endOverhead;
     }
 
     private long handleFileHeaders(WritableByteChannel target, FilePart filePart) throws IOException {
-        filePart.setPartBoundary(boundary);
-
         ByteArrayOutputStream overhead = generateFileStart(filePart);
-
         return writeToTarget(target, overhead);
     }
 
     private ByteArrayOutputStream generateFileStart(FilePart filePart) throws IOException {
         ByteArrayOutputStream overhead = new ByteArrayOutputStream();
 
-        filePart.setPartBoundary(boundary);
-
-        filePart.sendStart(overhead);
+        filePart.sendStart(overhead, boundary);
         filePart.sendDispositionHeader(overhead);
         filePart.sendContentTypeHeader(overhead);
         filePart.sendTransferEncodingHeader(overhead);
@@ -418,20 +393,13 @@ private long handlePartSource(WritableByteChannel target, FilePart filePart) thr
     }
 
     private long handleStringPart(WritableByteChannel target, StringPart currentPart) throws IOException {
-
-        currentPart.setPartBoundary(boundary);
-
         ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-
         Part.sendPart(outputStream, currentPart, boundary);
-
         return writeToTarget(target, outputStream);
     }
 
     private long handleMultiPart(WritableByteChannel target, Part currentPart) throws IOException {
 
-        currentPart.setPartBoundary(boundary);
-
         if (currentPart.getClass().equals(StringPart.class)) {
             return handleStringPart(target, (StringPart) currentPart);
         } else if (currentPart.getClass().equals(FilePart.class)) {

api/src/main/java/org/asynchttpclient/multipart/MultipartRequestEntity.java

@@ -15,17 +15,15 @@
  */
 package org.asynchttpclient.multipart;
 
-import static org.asynchttpclient.util.MiscUtil.isNonEmpty;
-
-import org.asynchttpclient.FluentCaseInsensitiveStringsMap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import static org.asynchttpclient.util.MiscUtil.*;
 
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.List;
 import java.util.Random;
 
+import org.asynchttpclient.FluentCaseInsensitiveStringsMap;
+
 /**
  * This class is an adaptation of the Apache HttpClient implementation
  * 
@@ -57,21 +55,22 @@ private static byte[] generateMultipartBoundary() {
         return bytes;
     }
 
-    private final Logger log = LoggerFactory.getLogger(MultipartRequestEntity.class);
-
     /**
      * The MIME parts as set by the constructor
      */
-    protected final List<Part>parts;
+    private final List<Part> parts;
 
     private final byte[] multipartBoundary;
 
     private final String contentType;
 
+    private final long contentLength;
+
     /**
      * Creates a new multipart entity containing the given parts.
      * 
-     * @param parts The parts to include.
+     * @param parts
+     *            The parts to include.
      */
     public MultipartRequestEntity(List<Part> parts, FluentCaseInsensitiveStringsMap requestHeaders) {
         if (parts == null) {
@@ -94,6 +93,8 @@ public MultipartRequestEntity(List<Part> parts, FluentCaseInsensitiveStringsMap
             multipartBoundary = generateMultipartBoundary();
             contentType = computeContentType(MULTIPART_FORM_CONTENT_TYPE);
         }
+
+        contentLength = Part.getLengthOfParts(parts, multipartBoundary);
     }
 
     private String computeContentType(String base) {
@@ -104,8 +105,8 @@ private String computeContentType(String base) {
     }
 
     /**
-     * Returns the MIME boundary string that is used to demarcate boundaries of this part. The first call to this method will implicitly create a new boundary string. To create a boundary string first the HttpMethodParams.MULTIPART_BOUNDARY parameter is considered. Otherwise a
-     * random one is generated.
+     * Returns the MIME boundary string that is used to demarcate boundaries of this part. The first call to this method will implicitly create a new boundary string. To create a
+     * boundary string first the HttpMethodParams.MULTIPART_BOUNDARY parameter is considered. Otherwise a random one is generated.
      * 
      * @return The boundary string of this entity in ASCII encoding.
      */
@@ -117,7 +118,7 @@ protected byte[] getMultipartBoundary() {
      * Returns <code>true</code> if all parts are repeatable, <code>false</code> otherwise.
      */
     public boolean isRepeatable() {
-        for (Part part: parts) {
+        for (Part part : parts) {
             if (!part.isRepeatable()) {
                 return false;
             }
@@ -130,16 +131,10 @@ public void writeRequest(OutputStream out) throws IOException {
     }
 
     public long getContentLength() {
-        try {
-            return Part.getLengthOfParts(parts, multipartBoundary);
-        } catch (Exception e) {
-            log.error("An exception occurred while getting the length of the parts", e);
-            return 0;
-        }
+        return contentLength;
     }
 
     public String getContentType() {
         return contentType;
     }
 }
-