Remove ugly hack that consists of passing the boundary from MultipartRequestEntity to MultipartBody in the Content-Type

Author: Stephane Landelle

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

@@ -28,7 +28,6 @@
 import java.util.Set;
 
 import org.asynchttpclient.RandomAccessBody;
-import org.asynchttpclient.util.StandardCharsets;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -55,8 +54,8 @@ enum FileLocation {
         NONE, START, MIDDLE, END
     }
 
-    public MultipartBody(List<Part> parts, String contentType, long contentLength) {
-        this.boundary = contentType.substring(contentType.indexOf("boundary=") + "boundary=".length()).getBytes(StandardCharsets.US_ASCII);
+    public MultipartBody(List<Part> parts, String contentType, long contentLength, byte[] boundary) {
+        this.boundary = boundary;
         this.contentLength = contentLength;
         this.parts = parts;
     }

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

@@ -17,8 +17,6 @@
 
 import static org.asynchttpclient.util.MiscUtil.*;
 
-import java.io.IOException;
-import java.io.OutputStream;
 import java.util.List;
 import java.util.Random;
 
@@ -56,11 +54,6 @@ private static byte[] generateMultipartBoundary() {
         return bytes;
     }
 
-    /**
-     * The MIME parts as set by the constructor
-     */
-    private final List<Part> parts;
-
     private final byte[] multipartBoundary;
 
     private final String contentType;
@@ -77,7 +70,6 @@ public MultipartRequestEntity(List<Part> parts, FluentCaseInsensitiveStringsMap
         if (parts == null) {
             throw new IllegalArgumentException("parts cannot be null");
         }
-        this.parts = parts;
         String contentTypeHeader = requestHeaders.getFirstValue("Content-Type");
         if (isNonEmpty(contentTypeHeader)) {
             int boundaryLocation = contentTypeHeader.indexOf("boundary=");
@@ -111,26 +103,10 @@ private String computeContentType(String base) {
      * 
      * @return The boundary string of this entity in ASCII encoding.
      */
-    protected byte[] getMultipartBoundary() {
+    public byte[] getMultipartBoundary() {
         return multipartBoundary;
     }
 
-    /**
-     * Returns <code>true</code> if all parts are repeatable, <code>false</code> otherwise.
-     */
-    public boolean isRepeatable() {
-        for (Part part : parts) {
-            if (!part.isRepeatable()) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    public void writeRequest(OutputStream out) throws IOException {
-        Part.sendParts(out, parts, multipartBoundary);
-    }
-
     public long getContentLength() {
         return contentLength;
     }

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

@@ -406,36 +406,6 @@ public String toString() {
         return this.getName();
     }
 
-    /**
-     * Write all parts and the last boundary to the specified output stream.
-     * 
-     * @param out
-     *            The stream to write to.
-     * @param parts
-     *            The parts to write.
-     * @param partBoundary
-     *            The ASCII bytes to use as the part boundary.
-     * @throws IOException
-     *             If an I/O error occurs while writing the parts.
-     * @since 3.0
-     */
-    public static void sendParts(OutputStream out, List<Part> parts, byte[] partBoundary) throws IOException {
-
-        if (parts == null) {
-            throw new IllegalArgumentException("Parts may not be null");
-        }
-        if (partBoundary == null || partBoundary.length == 0) {
-            throw new IllegalArgumentException("partBoundary may not be empty");
-        }
-        for (Part part : parts) {
-            part.send(out, partBoundary);
-        }
-        out.write(EXTRA_BYTES);
-        out.write(partBoundary);
-        out.write(EXTRA_BYTES);
-        out.write(CRLF_BYTES);
-    }
-
     public static void sendMessageEnd(OutputStream out, byte[] partBoundary) throws IOException {
 
         if (partBoundary == null || partBoundary.length == 0) {

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

@@ -15,49 +15,22 @@
  */
 package org.asynchttpclient.multipart;
 
-import java.io.IOException;
-import java.io.OutputStream;
-
-/**
- * This class is an adaptation of the Apache HttpClient implementation
- *
- * @link http://hc.apache.org/httpclient-3.x/
- */
 public interface RequestEntity {
 
     /**
-     * Tests if {@link #writeRequest(java.io.OutputStream)} can be called more than once.
-     *
-     * @return <tt>true</tt> if the entity can be written to {@link java.io.OutputStream} more than once,
-     *         <tt>false</tt> otherwise.
-     */
-    boolean isRepeatable();
-
-    /**
-     * Writes the request entity to the given stream.
-     *
-     * @param out
-     * @throws java.io.IOException
-     */
-    void writeRequest(OutputStream out) throws IOException;
-
-    /**
-     * Gets the request entity's length. This method should return a non-negative value if the content
-     * length is known or a negative value if it is not. In the latter case the
-     * EntityEnclosingMethod will use chunk encoding to
-     * transmit the request entity.
-     *
-     * @return a non-negative value when content length is known or a negative value when content length
-     *         is not known
+     * Gets the request entity's length. This method should return a non-negative value if the content length is known or a negative value if it is not. In the latter case the
+     * EntityEnclosingMethod will use chunk encoding to transmit the request entity.
+     * 
+     * @return a non-negative value when content length is known or a negative value when content length is not known
      */
     long getContentLength();
 
     /**
-     * Gets the entity's content type.  This content type will be used as the value for the
-     * "Content-Type" header.
-     *
+     * Gets the entity's content type. This content type will be used as the value for the "Content-Type" header.
+     * 
      * @return the entity's content type
      */
     String getContentType();
 
+    byte[] getMultipartBoundary();
 }

api/src/test/java/org/asynchttpclient/multipart/MultipartBodyTest.java

@@ -68,7 +68,7 @@ private static void compareContentLength(final List<Part> parts) {
         final long expectedContentLength = mre.getContentLength();
 
         // get real bytes
-        final Body multipartBody = new MultipartBody(parts, mre.getContentType(), expectedContentLength);
+        final Body multipartBody = new MultipartBody(parts, mre.getContentType(), expectedContentLength, mre.getMultipartBoundary());
         try {
             final ByteBuffer buffer = ByteBuffer.allocate(8192);
             boolean last = false;

providers/grizzly/src/main/java/org/asynchttpclient/providers/grizzly/bodyhandler/PartsBodyHandler.java

@@ -49,6 +49,7 @@ public boolean doHandle(final FilterChainContext ctx,
         final MultipartRequestEntity mre = new MultipartRequestEntity(parts, request.getHeaders());
         final long contentLength = mre.getContentLength();
         final String contentType = mre.getContentType();
+        final byte[] multipartBoundary = mre.getMultipartBoundary();
         requestPacket.setContentLengthLong(contentLength);
         requestPacket.setContentType(contentType);
         if (GrizzlyAsyncHttpProvider.LOGGER.isDebugEnabled()) {
@@ -63,7 +64,7 @@ public boolean doHandle(final FilterChainContext ctx,
         final FeedableBodyGenerator generator = new FeedableBodyGenerator() {
             @Override
             public Body createBody() throws IOException {
-                return new MultipartBody(parts, contentType, contentLength);
+                return new MultipartBody(parts, contentType, contentLength, multipartBoundary);
             }
         };
         generator.setFeeder(new FeedableBodyGenerator.BaseFeeder(generator) {

providers/netty/src/main/java/org/asynchttpclient/providers/netty/request/body/NettyMultipartBody.java

@@ -32,7 +32,7 @@ public NettyMultipartBody(List<Part> parts, FluentCaseInsensitiveStringsMap head
         MultipartRequestEntity mre = new MultipartRequestEntity(parts, headers);
         contentType = mre.getContentType();
         contentLength = mre.getContentLength();
-        multipartBody = new MultipartBody(parts, contentType, contentLength);
+        multipartBody = new MultipartBody(parts, contentType, contentLength, mre.getMultipartBoundary());
     }
 
     public MultipartBody getMultipartBody() {