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

Author: Stephane Landelle

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

@@ -43,36 +43,48 @@ public class StringPart extends PartBase {
     private final byte[] content;
     private final String value;
 
-    public StringPart(String name, String value, Charset charset) {
-        this(name, value, charset, null);
-    }
-
     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);
+    }
 
-    /**
-     * 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) {
-        super(name, DEFAULT_CONTENT_TYPE, charsetOrDefault(charset), contentId, DEFAULT_TRANSFER_ENCODING);
+    public StringPart(String name, String value, String contentType) {
+        this(name, value, contentType, null);
+    }
+
+    public StringPart(String name, String value, String contentType, Charset charset) {
+        this(name, value, contentType, charset, null);
+    }
+
+    public StringPart(String name, String value, String contentType, Charset charset, String fileName) {
+        this(name, value, contentType, charset, fileName, null);
+    }
+
+    public StringPart(String name, String value, String contentType, Charset charset, String fileName, String contentId) {
+        this(name, value, contentType, charset, fileName, contentId, null);
+    }
+
+    public StringPart(String name, String value, String contentType, Charset charset, String fileName, 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;
     }
 

src/test/java/com/ning/http/client/async/AsyncProvidersBasicTest.java

@@ -677,7 +677,7 @@ public void asyncDoPostMultiPartTest() throws Throwable {
         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() {
 
@@ -707,7 +707,7 @@ public Response onCompleted(Response response) throws Exception {
 
     @Test(groups = { "standalone", "default_provider", "async" })
     public void asyncDoPostBasicGZIPTest() throws Throwable {
-        AsyncHttpClientConfig cf = new AsyncHttpClientConfig.Builder().build();
+        AsyncHttpClientConfig cf = new AsyncHttpClientConfig.Builder().setCompressionEnforced(true).build();
         AsyncHttpClient client = getAsyncHttpClient(cf);
         try {
             final CountDownLatch l = new CountDownLatch(1);

src/test/java/com/ning/http/client/async/MultipartUploadTest.java

@@ -42,7 +42,6 @@
 import com.ning.http.client.multipart.ByteArrayPart;
 import com.ning.http.client.multipart.FilePart;
 import com.ning.http.client.multipart.StringPart;
-import com.ning.http.util.AsyncHttpProviderUtils;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
@@ -221,12 +220,12 @@ public void testSendingSmallFilesAndByteArray() {
             builder.setUrl(servletEndpointRedirectUrl + "/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"));
 

src/test/java/com/ning/http/client/multipart/MultipartBodyTest.java

@@ -46,7 +46,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);
     }