Turn MultipartRequestEntity into a static MultipartBodyFactory

Author: Stephane Landelle

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

@@ -37,6 +37,7 @@ public class MultipartBody implements RandomAccessBody {
 
     private final byte[] boundary;
     private final long contentLength;
+    private final String contentType;
     private final List<Part> parts;
     // FIXME why keep all of them open?
     private final List<RandomAccessFile> files = new ArrayList<RandomAccessFile>();
@@ -57,6 +58,7 @@ enum FileLocation {
     public MultipartBody(List<Part> parts, String contentType, long contentLength, byte[] boundary) {
         this.boundary = boundary;
         this.contentLength = contentLength;
+        this.contentType = contentType;
         this.parts = parts;
     }
 
@@ -70,6 +72,10 @@ public long getContentLength() {
         return contentLength;
     }
 
+    public String getContentType() {
+        return contentType;
+    }
+
     public long read(ByteBuffer buffer) throws IOException {
         try {
             int overallLength = 0;

api/src/main/java/org/asynchttpclient/multipart/MultipartRequestEntity.java renamed to api/src/main/java/org/asynchttpclient/multipart/MultipartBodyFactory.java

@@ -23,12 +23,7 @@
 import org.asynchttpclient.FluentCaseInsensitiveStringsMap;
 import org.asynchttpclient.util.StandardCharsets;
 
-/**
- * This class is an adaptation of the Apache HttpClient implementation
- * 
- * @link http://hc.apache.org/httpclient-3.x/
- */
-public class MultipartRequestEntity implements RequestEntity {
+public final class MultipartBodyFactory {
 
     /**
      * The Content-Type for multipart/form-data.
@@ -40,36 +35,23 @@ public class MultipartRequestEntity implements RequestEntity {
      */
     private static byte[] MULTIPART_CHARS = "-_1234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ".getBytes(StandardCharsets.US_ASCII);
 
-    /**
-     * Generates a random multipart boundary string.
-     * 
-     * @return
-     */
-    private static byte[] generateMultipartBoundary() {
-        Random rand = new Random();
-        byte[] bytes = new byte[rand.nextInt(11) + 30]; // a random size from 30 to 40
-        for (int i = 0; i < bytes.length; i++) {
-            bytes[i] = MULTIPART_CHARS[rand.nextInt(MULTIPART_CHARS.length)];
-        }
-        return bytes;
+    private MultipartBodyFactory() {
     }
-
-    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.
      */
-    public MultipartRequestEntity(List<Part> parts, FluentCaseInsensitiveStringsMap requestHeaders) {
+    public static MultipartBody newMultipartBody(List<Part> parts, FluentCaseInsensitiveStringsMap requestHeaders) {
         if (parts == null) {
             throw new IllegalArgumentException("parts cannot be null");
         }
+        
+        byte[] multipartBoundary;
+        String contentType;
+        
         String contentTypeHeader = requestHeaders.getFirstValue("Content-Type");
         if (isNonEmpty(contentTypeHeader)) {
             int boundaryLocation = contentTypeHeader.indexOf("boundary=");
@@ -80,38 +62,31 @@ public MultipartRequestEntity(List<Part> parts, FluentCaseInsensitiveStringsMap
             } else {
                 // generate boundary and append it to existing Content-Type
                 multipartBoundary = generateMultipartBoundary();
-                contentType = computeContentType(contentTypeHeader);
+                contentType = computeContentType(contentTypeHeader, multipartBoundary);
             }
         } else {
             multipartBoundary = generateMultipartBoundary();
-            contentType = computeContentType(MULTIPART_FORM_CONTENT_TYPE);
+            contentType = computeContentType(MULTIPART_FORM_CONTENT_TYPE, multipartBoundary);
         }
 
-        contentLength = Part.getLengthOfParts(parts, multipartBoundary);
+        long contentLength = Part.getLengthOfParts(parts, multipartBoundary);
+        
+        return new MultipartBody(parts, contentType, contentLength, multipartBoundary);
     }
 
-    private String computeContentType(String base) {
+    private static byte[] generateMultipartBoundary() {
+        Random rand = new Random();
+        byte[] bytes = new byte[rand.nextInt(11) + 30]; // a random size from 30 to 40
+        for (int i = 0; i < bytes.length; i++) {
+            bytes[i] = MULTIPART_CHARS[rand.nextInt(MULTIPART_CHARS.length)];
+        }
+        return bytes;
+    }
+    
+    private static String computeContentType(String base, byte[] multipartBoundary) {
         StringBuilder buffer = new StringBuilder(base);
         if (!base.endsWith(";"))
             buffer.append(";");
         return buffer.append(" boundary=").append(new String(multipartBoundary, StandardCharsets.US_ASCII)).toString();
     }
-
-    /**
-     * 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.
-     */
-    public byte[] getMultipartBoundary() {
-        return multipartBoundary;
-    }
-
-    public long getContentLength() {
-        return contentLength;
-    }
-
-    public String getContentType() {
-        return contentType;
-    }
 }

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

@@ -64,11 +64,10 @@ private static File getTestfile() {
     private static void compareContentLength(final List<Part> parts) {
         Assert.assertNotNull(parts);
         // get expected values
-        MultipartRequestEntity mre = new MultipartRequestEntity(parts, new FluentCaseInsensitiveStringsMap());
-        final long expectedContentLength = mre.getContentLength();
 
         // get real bytes
-        final Body multipartBody = new MultipartBody(parts, mre.getContentType(), expectedContentLength, mre.getMultipartBoundary());
+        final Body multipartBody = MultipartBodyFactory.newMultipartBody(parts, new FluentCaseInsensitiveStringsMap());
+        final long expectedContentLength = multipartBody.getContentLength();
         try {
             final ByteBuffer buffer = ByteBuffer.allocate(8192);
             boolean last = false;

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

@@ -16,7 +16,7 @@
 import org.asynchttpclient.Body;
 import org.asynchttpclient.Request;
 import org.asynchttpclient.multipart.MultipartBody;
-import org.asynchttpclient.multipart.MultipartRequestEntity;
+import org.asynchttpclient.multipart.MultipartBodyFactory;
 import org.asynchttpclient.multipart.Part;
 import org.asynchttpclient.providers.grizzly.FeedableBodyGenerator;
 import org.asynchttpclient.providers.grizzly.GrizzlyAsyncHttpProvider;
@@ -46,12 +46,9 @@ public boolean doHandle(final FilterChainContext ctx,
     throws IOException {
 
         final List<Part> parts = request.getParts();
-        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);
+        final MultipartBody multipartBody = MultipartBodyFactory.newMultipartBody(parts, request.getHeaders());
+        requestPacket.setContentLengthLong(multipartBody.getContentLength());
+        requestPacket.setContentType(multipartBody.getContentType());
         if (GrizzlyAsyncHttpProvider.LOGGER.isDebugEnabled()) {
             GrizzlyAsyncHttpProvider.LOGGER.debug(
                     "REQUEST(modified): contentLength={}, contentType={}",
@@ -64,7 +61,7 @@ public boolean doHandle(final FilterChainContext ctx,
         final FeedableBodyGenerator generator = new FeedableBodyGenerator() {
             @Override
             public Body createBody() throws IOException {
-                return new MultipartBody(parts, contentType, contentLength, multipartBoundary);
+                return multipartBody;
             }
         };
         generator.setFeeder(new FeedableBodyGenerator.BaseFeeder(generator) {

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

@@ -19,20 +19,15 @@
 
 import org.asynchttpclient.FluentCaseInsensitiveStringsMap;
 import org.asynchttpclient.multipart.MultipartBody;
-import org.asynchttpclient.multipart.MultipartRequestEntity;
+import org.asynchttpclient.multipart.MultipartBodyFactory;
 import org.asynchttpclient.multipart.Part;
 
 public class NettyMultipartBody implements NettyBody {
 
-    private final long contentLength;
-    private final String contentType;
     private final MultipartBody multipartBody;
 
     public NettyMultipartBody(List<Part> parts, FluentCaseInsensitiveStringsMap headers) {
-        MultipartRequestEntity mre = new MultipartRequestEntity(parts, headers);
-        contentType = mre.getContentType();
-        contentLength = mre.getContentLength();
-        multipartBody = new MultipartBody(parts, contentType, contentLength, mre.getMultipartBoundary());
+        multipartBody = MultipartBodyFactory.newMultipartBody(parts, headers);
     }
 
     public MultipartBody getMultipartBody() {
@@ -41,11 +36,11 @@ public MultipartBody getMultipartBody() {
 
     @Override
     public long getContentLength() {
-        return contentLength;
+        return multipartBody.getContentLength();
     }
 
     @Override
     public String getContentType() {
-        return contentType;
+        return multipartBody.getContentType();
     }
 }