Fix multipart/form-data, close AsyncHttpClient#1119, close AsyncHttpClient#1120, close AsyncHttpClient#1121

Author: slandelle

client/src/main/java/org/asynchttpclient/request/body/multipart/ByteArrayPart.java

@@ -41,9 +41,8 @@ public ByteArrayPart(String name, byte[] bytes, String contentType, Charset char
     }
 
     public ByteArrayPart(String name, byte[] bytes, String contentType, Charset charset, String fileName, String contentId, String transferEncoding) {
-        super(name, contentType, charset, contentId, transferEncoding);
+        super(name, contentType, charset, fileName, contentId, transferEncoding);
         this.bytes = assertNotNull(bytes, "bytes");
-        setFileName(fileName);
     }
 
     public byte[] getBytes() {

client/src/main/java/org/asynchttpclient/request/body/multipart/FileLikePart.java

@@ -13,40 +13,58 @@
 package org.asynchttpclient.request.body.multipart;
 
 import static org.asynchttpclient.util.MiscUtils.withDefault;
-import static io.netty.handler.codec.http.HttpHeaders.Values.*;
 
+import java.io.IOException;
+import java.io.InputStream;
 import java.nio.charset.Charset;
 
+import javax.activation.MimetypesFileTypeMap;
+
 /**
  * This class is an adaptation of the Apache HttpClient implementation
  */
 public abstract class FileLikePart extends PartBase {
 
+    private static final MimetypesFileTypeMap MIME_TYPES_FILE_TYPE_MAP;
+
+    static {
+        try (InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream("ahc-mime.types")) {
+            MIME_TYPES_FILE_TYPE_MAP = new MimetypesFileTypeMap(is);
+        } catch (IOException e) {
+            throw new ExceptionInInitializerError(e);
+        }
+    }
+
     /**
      * Default content encoding of file attachments.
      */
-    public static final String DEFAULT_CONTENT_TYPE = "application/octet-stream";
-
     private String fileName;
 
+    private static String computeContentType(String contentType, String fileName) {
+        if (contentType == null) {
+            // TODO use a ThreadLocal to get work around synchronized?
+            contentType = MIME_TYPES_FILE_TYPE_MAP.getContentType(withDefault(fileName, ""));
+        }
+
+        return contentType;
+    }
+
     /**
      * FilePart Constructor.
      * 
      * @param name the name for this part
-     * @param contentType the content type for this part, if <code>null</code> the {@link #DEFAULT_CONTENT_TYPE default} is used
+     * @param contentType the content type for this part, if <code>null</code> try to figure out from the fileName mime type
      * @param charset the charset encoding for this part
+     * @param fileName the fileName
      * @param contentId the content id
      * @param transfertEncoding the transfer encoding
      */
-    public FileLikePart(String name, String contentType, Charset charset, String contentId, String transfertEncoding) {
+    public FileLikePart(String name, String contentType, Charset charset, String fileName, String contentId, String transfertEncoding) {
         super(name,//
-                withDefault(contentType, DEFAULT_CONTENT_TYPE),//
+                computeContentType(contentType, fileName),//
                 charset,//
                 contentId,//
-                withDefault(transfertEncoding, BINARY));
-    }
-
-    public final void setFileName(String fileName) {
+                transfertEncoding);
         this.fileName = fileName;
     }
 

client/src/main/java/org/asynchttpclient/request/body/multipart/FilePart.java

@@ -42,13 +42,17 @@ public FilePart(String name, File file, String contentType, Charset charset, Str
     }
 
     public FilePart(String name, File file, String contentType, Charset charset, String fileName, String contentId, String transferEncoding) {
-        super(name, contentType, charset, contentId, transferEncoding);
+        super(name,//
+                contentType,//
+                charset,//
+                fileName != null ? fileName : file.getName(),//
+                contentId,//
+                transferEncoding);
         if (!assertNotNull(file, "file").isFile())
             throw new IllegalArgumentException("File is not a normal file " + file.getAbsolutePath());
         if (!file.canRead())
             throw new IllegalArgumentException("File is not readable " + file.getAbsolutePath());
         this.file = file;
-        setFileName(fileName != null ? fileName : file.getName());
     }
 
     public File getFile() {

client/src/main/java/org/asynchttpclient/request/body/multipart/MultipartUtils.java

@@ -13,8 +13,8 @@
  */
 package org.asynchttpclient.request.body.multipart;
 
+import static io.netty.handler.codec.http.HttpHeaders.Values.MULTIPART_FORM_DATA;
 import static java.nio.charset.StandardCharsets.US_ASCII;
-import static io.netty.handler.codec.http.HttpHeaders.Values.*;
 import static org.asynchttpclient.util.Assertions.assertNotNull;
 import static org.asynchttpclient.util.MiscUtils.isNonEmpty;
 import io.netty.handler.codec.http.HttpHeaders;
@@ -27,6 +27,7 @@
 import org.asynchttpclient.request.body.multipart.part.FileMultipartPart;
 import org.asynchttpclient.request.body.multipart.part.MessageEndMultipartPart;
 import org.asynchttpclient.request.body.multipart.part.MultipartPart;
+import org.asynchttpclient.request.body.multipart.part.StringMultipartPart;
 import org.asynchttpclient.util.StringUtils;
 
 public class MultipartUtils {
@@ -81,19 +82,7 @@ public static List<MultipartPart<? extends Part>> generateMultipartParts(List<Pa
                 multipartParts.add(new ByteArrayMultipartPart((ByteArrayPart) part, boundary));
 
             } else if (part instanceof StringPart) {
-                // convert to a byte array
-                StringPart stringPart = (StringPart) part;
-                byte[] bytes = stringPart.getValue().getBytes(stringPart.getCharset());
-                ByteArrayPart byteArrayPart = new ByteArrayPart(//
-                        stringPart.getName(),//
-                        bytes, //
-                        stringPart.getContentType(), //
-                        stringPart.getCharset(), //
-                        null, //
-                        stringPart.getContentId(), //
-                        stringPart.getTransferEncoding());
-                byteArrayPart.setCustomHeaders(stringPart.getCustomHeaders());
-                multipartParts.add(new ByteArrayMultipartPart(byteArrayPart, boundary));
+                multipartParts.add(new StringMultipartPart((StringPart) part, boundary));
 
             } else {
                 throw new IllegalArgumentException("Unknown part type: " + part);

client/src/main/java/org/asynchttpclient/request/body/multipart/StringPart.java

@@ -20,21 +20,11 @@
 
 public class StringPart extends PartBase {
 
-    /**
-     * Default content encoding of string parameters.
-     */
-    public static final String DEFAULT_CONTENT_TYPE = "text/plain";
-
     /**
      * Default charset of string parameters
      */
     public static final Charset DEFAULT_CHARSET = UTF_8;
 
-    /**
-     * Default transfer encoding of string parameters
-     */
-    public static final String DEFAULT_TRANSFER_ENCODING = "8bit";
-
     /**
      * Contents of this StringPart.
      */
@@ -44,14 +34,6 @@ private static Charset charsetOrDefault(Charset charset) {
         return withDefault(charset, DEFAULT_CHARSET);
     }
 
-    private static String contentTypeOrDefault(String contentType) {
-        return withDefault(contentType, DEFAULT_CONTENT_TYPE);
-    }
-
-    private static String transferEncodingOrDefault(String transferEncoding) {
-        return withDefault(transferEncoding, DEFAULT_TRANSFER_ENCODING);
-    }
-
     public StringPart(String name, String value) {
         this(name, value, null);
     }
@@ -69,7 +51,7 @@ public StringPart(String name, String value, String contentType, Charset charset
     }
 
     public StringPart(String name, String value, String contentType, Charset charset, String contentId, String transferEncoding) {
-        super(name, contentTypeOrDefault(contentType), charsetOrDefault(charset), contentId, transferEncodingOrDefault(transferEncoding));
+        super(name, contentType, charsetOrDefault(charset), contentId, transferEncoding);
         assertNotNull(value, "value");
 
         if (value.indexOf(0) != -1)

client/src/main/java/org/asynchttpclient/request/body/multipart/part/ByteArrayMultipartPart.java

@@ -21,10 +21,9 @@
 
 import org.asynchttpclient.request.body.multipart.ByteArrayPart;
 
-public class ByteArrayMultipartPart extends MultipartPart<ByteArrayPart> {
+public class ByteArrayMultipartPart extends FileLikeMultipartPart<ByteArrayPart> {
 
-    // lazy
-    private ByteBuf contentBuffer;
+    private final ByteBuf contentBuffer;
 
     public ByteArrayMultipartPart(ByteArrayPart part, byte[] boundary) {
         super(part, boundary);
@@ -38,18 +37,12 @@ protected long getContentLength() {
 
     @Override
     protected long transferContentTo(ByteBuf target) throws IOException {
-        return transfer(lazyLoadContentBuffer(), target, MultipartState.POST_CONTENT);
+        return transfer(contentBuffer, target, MultipartState.POST_CONTENT);
     }
 
     @Override
     protected long transferContentTo(WritableByteChannel target) throws IOException {
-        return transfer(lazyLoadContentBuffer(), target, MultipartState.POST_CONTENT);
-    }
-
-    private ByteBuf lazyLoadContentBuffer() {
-        if (contentBuffer == null)
-            contentBuffer = Unpooled.wrappedBuffer(part.getBytes());
-        return contentBuffer;
+        return transfer(contentBuffer, target, MultipartState.POST_CONTENT);
     }
 
     @Override

client/src/main/java/org/asynchttpclient/request/body/multipart/part/FileLikeMultipartPart.java

@@ -0,0 +1,27 @@
+package org.asynchttpclient.request.body.multipart.part;
+
+import static java.nio.charset.StandardCharsets.US_ASCII;
+
+import org.asynchttpclient.request.body.multipart.FileLikePart;
+
+public abstract class FileLikeMultipartPart<T extends FileLikePart> extends MultipartPart<T> {
+
+    /**
+     * Attachment's file name as a byte array
+     */
+    private static final byte[] FILE_NAME_BYTES = "; filename=".getBytes(US_ASCII);
+    
+    public FileLikeMultipartPart(T part, byte[] boundary) {
+        super(part, boundary);
+    }
+    
+    protected void visitDispositionHeader(PartVisitor visitor) {
+        super.visitDispositionHeader(visitor);
+        if (part.getFileName() != null) {
+            visitor.withBytes(FILE_NAME_BYTES);
+            visitor.withByte(QUOTE_BYTE);
+            visitor.withBytes(part.getFileName().getBytes(part.getCharset() != null ? part.getCharset() : US_ASCII));
+            visitor.withByte(QUOTE_BYTE);
+        }
+    }
+}

client/src/main/java/org/asynchttpclient/request/body/multipart/part/FileMultipartPart.java

@@ -25,7 +25,7 @@
 import org.asynchttpclient.netty.request.body.BodyChunkedInput;
 import org.asynchttpclient.request.body.multipart.FilePart;
 
-public class FileMultipartPart extends MultipartPart<FilePart> {
+public class FileMultipartPart extends FileLikeMultipartPart<FilePart> {
 
     private final FileChannel channel;
     private final long length;

client/src/main/java/org/asynchttpclient/request/body/multipart/part/MultipartPart.java

@@ -26,11 +26,11 @@
 import java.nio.charset.Charset;
 
 import org.asynchttpclient.Param;
-import org.asynchttpclient.request.body.multipart.FileLikePart;
+import org.asynchttpclient.request.body.multipart.PartBase;
 import org.asynchttpclient.request.body.multipart.part.PartVisitor.ByteBufVisitor;
 import org.asynchttpclient.request.body.multipart.part.PartVisitor.CounterPartVisitor;
 
-public abstract class MultipartPart<T extends FileLikePart> implements Closeable {
+public abstract class MultipartPart<T extends PartBase> implements Closeable {
 
     /**
      * Carriage return/linefeed as a byte array
@@ -40,7 +40,7 @@ public abstract class MultipartPart<T extends FileLikePart> implements Closeable
     /**
      * Content disposition as a byte
      */
-    private static final byte QUOTE_BYTE = '\"';
+    protected static final byte QUOTE_BYTE = '\"';
 
     /**
      * Extra characters as a byte array
@@ -82,11 +82,6 @@ public abstract class MultipartPart<T extends FileLikePart> implements Closeable
      */
     private static final byte[] CONTENT_ID_BYTES = "Content-ID: ".getBytes(US_ASCII);
 
-    /**
-     * Attachment's file name as a byte array
-     */
-    private static final byte[] FILE_NAME_BYTES = "; filename=".getBytes(US_ASCII);
-
     protected final T part;
     protected final byte[] boundary;
 
@@ -269,12 +264,6 @@ protected void visitDispositionHeader(PartVisitor visitor) {
             visitor.withBytes(part.getName().getBytes(US_ASCII));
             visitor.withByte(QUOTE_BYTE);
         }
-        if (part.getFileName() != null) {
-            visitor.withBytes(FILE_NAME_BYTES);
-            visitor.withByte(QUOTE_BYTE);
-            visitor.withBytes(part.getFileName().getBytes(part.getCharset() != null ? part.getCharset() : US_ASCII));
-            visitor.withByte(QUOTE_BYTE);
-        }
     }
 
     protected void visitContentTypeHeader(PartVisitor visitor) {

client/src/main/java/org/asynchttpclient/request/body/multipart/part/StringMultipartPart.java

@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2015 AsyncHttpClient Project. All rights reserved.
+ *
+ * This program is licensed to you under the Apache License Version 2.0,
+ * and you may not use this file except in compliance with the Apache License Version 2.0.
+ * You may obtain a copy of the Apache License Version 2.0 at
+ *     http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the Apache License Version 2.0 is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
+ */
+package org.asynchttpclient.request.body.multipart.part;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+
+import java.io.IOException;
+import java.nio.channels.WritableByteChannel;
+
+import org.asynchttpclient.request.body.multipart.StringPart;
+
+public class StringMultipartPart extends MultipartPart<StringPart> {
+
+    private final ByteBuf contentBuffer;
+
+    public StringMultipartPart(StringPart part, byte[] boundary) {
+        super(part, boundary);
+        contentBuffer = Unpooled.wrappedBuffer(part.getValue().getBytes(part.getCharset()));
+    }
+
+    @Override
+    protected long getContentLength() {
+        return contentBuffer.capacity();
+    }
+
+    @Override
+    protected long transferContentTo(ByteBuf target) throws IOException {
+        return transfer(contentBuffer, target, MultipartState.POST_CONTENT);
+    }
+
+    @Override
+    protected long transferContentTo(WritableByteChannel target) throws IOException {
+        return transfer(contentBuffer, target, MultipartState.POST_CONTENT);
+    }
+
+    @Override
+    public void close() {
+        super.close();
+        contentBuffer.release();
+    }
+}