StringPart won't let configure contentType, close AsyncHttpClient#713

Author: Stephane Landelle

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

@@ -41,36 +41,47 @@ public class StringPart extends PartBase {
      * Contents of this StringPart.
      */
     private final byte[] content;
+    private final String value;
 
     private static Charset charsetOrDefault(Charset charset) {
         return charset == null ? DEFAULT_CHARSET : charset;
     }
+    
+    private static String contentTypeOrDefault(String contentType) {
+        return contentType == null ? DEFAULT_CONTENT_TYPE : contentType;
+    }
+    
+    private static String transferEncodingOrDefault(String transferEncoding) {
+        return transferEncoding == null ? DEFAULT_TRANSFER_ENCODING : transferEncoding;
+    }
+    
+    public StringPart(String name, String value) {
+        this(name, value, null);
+    }
 
-    public StringPart(String name, String value, Charset charset) {
-        this(name, value, charset, null);
+    public StringPart(String name, String value, String contentType) {
+        this(name, value, contentType, null);
     }
 
-    /**
-     * Constructor.
-     * 
-     * @param name
-     *            The name of the part
-     * @param value
-     *            the string to post
-     * @param charset
-     *            the charset to be used to encode the string, if <code>null</code> the {@link #DEFAULT_CHARSET default} is used
-     * @param contentId
-     *            the content id
-     */
-    public StringPart(String name, String value, Charset charset, String contentId) {
+    public StringPart(String name, String value, String contentType, Charset charset) {
+        this(name, value, contentType, charset, null);
+    }
 
-        super(name, DEFAULT_CONTENT_TYPE, charsetOrDefault(charset), DEFAULT_TRANSFER_ENCODING, contentId);
+    public StringPart(String name, String value, String contentType, Charset charset, String contentId) {
+        this(name, value, contentType, charset, contentId, null);
+    }
+
+    public StringPart(String name, String value, String contentType, Charset charset, String contentId, String transferEncoding) {
+        super(name, contentTypeOrDefault(contentType), charsetOrDefault(charset), contentId, transferEncodingOrDefault(transferEncoding));
         if (value == null)
             throw new NullPointerException("value");
+
         if (value.indexOf(0) != -1)
             // See RFC 2048, 2.8. "8bit Data"
             throw new IllegalArgumentException("NULs may not be present in string parts");
-        content = value.getBytes(charsetOrDefault(charset));
+
+        content = value.getBytes(getCharset());
+        this.value = value;
     }
 
     /**
@@ -104,4 +115,8 @@ public byte[] getBytes(byte[] boundary) throws IOException {
     public long write(WritableByteChannel target, byte[] boundary) throws IOException {
         return MultipartUtils.writeBytesToChannel(target, getBytes(boundary));
     }
+
+    public String getValue() {
+        return value;
+    }
 }

api/src/test/java/org/asynchttpclient/async/AsyncProvidersBasicTest.java

@@ -659,7 +659,7 @@ public void asyncDoPostMultiPartTest() throws Exception {
         try {
             final CountDownLatch l = new CountDownLatch(1);
 
-            Part p = new StringPart("foo", "bar", UTF_8);
+            Part p = new StringPart("foo", "bar");
 
             client.preparePost(getTargetUrl()).addBodyPart(p).execute(new AsyncCompletionHandlerAdapter() {
 

api/src/test/java/org/asynchttpclient/async/MultipartUploadTest.java

@@ -36,7 +36,6 @@
 import org.asynchttpclient.multipart.ByteArrayPart;
 import org.asynchttpclient.multipart.FilePart;
 import org.asynchttpclient.multipart.StringPart;
-import org.asynchttpclient.util.AsyncHttpProviderUtils;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
 import org.slf4j.Logger;
@@ -176,12 +175,12 @@ public void testSendingSmallFilesAndByteArray() {
             builder.setUrl("http://localhost" + ":" + port1 + "/upload/bob");
             builder.addBodyPart(new FilePart("file1", testResource1File, "text/plain", UTF_8));
             builder.addBodyPart(new FilePart("file2", testResource2File, "application/x-gzip", null));
-            builder.addBodyPart(new StringPart("Name", "Dominic", UTF_8));
+            builder.addBodyPart(new StringPart("Name", "Dominic"));
             builder.addBodyPart(new FilePart("file3", testResource3File, "text/plain", UTF_8));
 
-            builder.addBodyPart(new StringPart("Age", "3", AsyncHttpProviderUtils.DEFAULT_CHARSET));
-            builder.addBodyPart(new StringPart("Height", "shrimplike", AsyncHttpProviderUtils.DEFAULT_CHARSET));
-            builder.addBodyPart(new StringPart("Hair", "ridiculous", AsyncHttpProviderUtils.DEFAULT_CHARSET));
+            builder.addBodyPart(new StringPart("Age", "3"));
+            builder.addBodyPart(new StringPart("Height", "shrimplike"));
+            builder.addBodyPart(new StringPart("Hair", "ridiculous"));
 
             builder.addBodyPart(new ByteArrayPart("file4", expectedContents.getBytes(UTF_8), "text/plain", UTF_8, "bytearray.txt"));
 

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

@@ -41,7 +41,7 @@ public void testBasics() {
         parts.add(new ByteArrayPart("baPart", "testMultiPart".getBytes(UTF_8), "application/test", UTF_8, "fileName"));
 
         // add a string
-        parts.add(new StringPart("stringPart", "testString", UTF_8));
+        parts.add(new StringPart("stringPart", "testString"));
 
         compareContentLength(parts);
     }