Make transferEncoding configurable, fix FilePart constructors, close AsyncHttpClient#647

Author: Stephane Landelle

src/main/java/com/ning/http/client/multipart/AbstractFilePart.java

@@ -55,9 +55,12 @@ public abstract class AbstractFilePart extends PartBase {
      * @param charset
      *            the charset encoding for this part
      */
-    public AbstractFilePart(String name, String contentType, String charset, String contentId) {
-        super(name, contentType == null ? DEFAULT_CONTENT_TYPE : contentType, charset,
-                DEFAULT_TRANSFER_ENCODING, contentId);
+    public AbstractFilePart(String name, String contentType, String charset, String contentId, String transferEncoding) {
+        super(name,//
+                contentType == null ? DEFAULT_CONTENT_TYPE : contentType,//
+                charset,//
+                contentId, //
+                transferEncoding == null ? DEFAULT_TRANSFER_ENCODING : transferEncoding);
     }
 
     protected void visitDispositionHeader(PartVisitor visitor) throws IOException {

src/main/java/com/ning/http/client/multipart/ByteArrayPart.java

@@ -37,14 +37,17 @@ public ByteArrayPart(String name, byte[] bytes, String contentType, String chars
     }
 
     public ByteArrayPart(String name, byte[] bytes, String contentType, String charset, String fileName, String contentId) {
-        super(name, contentType, charset, contentId);
-        if (bytes == null) {
+        this(name, bytes, contentType, charset, fileName, contentId, null);
+    }
+
+    public ByteArrayPart(String name, byte[] bytes, String contentType, String charset, String fileName, String contentId, String transferEncoding) {
+        super(name, contentType, charset, contentId, transferEncoding);
+        if (bytes == null)
             throw new NullPointerException("bytes");
-        }
         this.bytes = bytes;
         setFileName(fileName);
     }
-
+    
     @Override
     protected void sendData(OutputStream out) throws IOException {
         out.write(bytes);

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

@@ -31,36 +31,37 @@ public class FilePart extends AbstractFilePart {
     private final File file;
 
     public FilePart(String name, File file) {
-        this(name, file, null, null);
+        this(name, file, null);
     }
 
     public FilePart(String name, File file, String contentType) {
-        this(name, file, null, contentType, null);
+        this(name, file, contentType, null);
     }
 
     public FilePart(String name, File file, String contentType, String charset) {
-        this(name, file, null, contentType, charset, null);
+        this(name, file, contentType, charset, null);
     }
 
     public FilePart(String name, File file, String contentType, String charset, String fileName) {
-        this(name, file, null, contentType, charset, fileName);
+        this(name, file, contentType, charset, fileName, null);
     }
 
     public FilePart(String name, File file, String contentType, String charset, String fileName, String contentId) {
-        super(name, contentType, charset, contentId);
-        this.file = file;
-        if (file == null) {
+        this(name, file, contentType, charset, fileName, contentId, null);
+    }
+
+    public FilePart(String name, File file, String contentType, String charset, String fileName, String contentId, String transferEncoding) {
+        super(name, contentType, charset, contentId, transferEncoding);
+        if (file == null)
             throw new NullPointerException("file");
-        }
-        if (!file.isFile()) {
+        if (!file.isFile())
             throw new IllegalArgumentException("File is not a normal file " + file.getAbsolutePath());
-        }
-        if (!file.canRead()) {
+        if (!file.canRead())
             throw new IllegalArgumentException("File is not readable " + file.getAbsolutePath());
-        }
+        this.file = file;
         setFileName(fileName != null ? fileName : file.getName());
     }
-
+    
     @Override
     protected void sendData(OutputStream out) throws IOException {
         if (getDataLength() == 0) {

src/main/java/com/ning/http/client/multipart/PartBase.java

@@ -49,21 +49,25 @@ public abstract class PartBase implements Part {
      */
     private String dispositionType;
 
+    public PartBase(String name, String contentType, String charSet, String contentId) {
+        this(name, contentType, charSet, contentId, null);
+    }
+
     /**
      * Constructor.
      * 
      * @param name The name of the part, or <code>null</code>
      * @param contentType The content type, or <code>null</code>
      * @param charSet The character encoding, or <code>null</code>
-     * @param transferEncoding The transfer encoding, or <code>null</code>
      * @param contentId The content id, or <code>null</code>
+     * @param transferEncoding The transfer encoding, or <code>null</code>
      */
-    public PartBase(String name, String contentType, String charSet, String transferEncoding, String contentId) {
+    public PartBase(String name, String contentType, String charSet, String contentId, String transferEncoding) {
         this.name = name;
         this.contentType = contentType;
         this.charSet = charSet;
-        this.transferEncoding = transferEncoding;
         this.contentId = contentId;
+        this.transferEncoding = transferEncoding;
     }
 
     protected void visitStart(PartVisitor visitor, byte[] boundary) throws IOException {

src/main/java/com/ning/http/client/multipart/StringPart.java

@@ -58,8 +58,7 @@ public StringPart(String name, String value, String charset) {
      *            the content id
      */
     public StringPart(String name, String value, String charset, String contentId) {
-
-        super(name, DEFAULT_CONTENT_TYPE, charset == null ? DEFAULT_CHARSET : charset, DEFAULT_TRANSFER_ENCODING, contentId);
+        super(name, DEFAULT_CONTENT_TYPE, charset == null ? DEFAULT_CHARSET : charset, contentId, DEFAULT_TRANSFER_ENCODING);
         if (value == null) {
             throw new NullPointerException("value");
         }