Merge pull request AsyncHttpClient#540 from kelvl/content-type-body-charset-sync

Propagate charset from Content-Type into Request's bodyEncoding

Author: jfarcand

src/main/java/com/ning/http/client/RequestBuilderBase.java

@@ -612,9 +612,22 @@ public T setConnectionPoolKeyStrategy(ConnectionPoolKeyStrategy connectionPoolKe
     }
 
     public Request build() {
+        try {
+            final String contentType = request.headers.getFirstValue("Content-Type");
+            if (contentType != null) {
+                final String charset = AsyncHttpProviderUtils.parseCharset(contentType);
+                if (charset != null) {
+                    // ensure that if charset is provided with the Content-Type header,
+                    // we propagate that down to the charset of the Request object
+                    request.charset = charset;
+                }
+            }
+        } catch (Throwable e) {
+            // NoOp -- we can't fix the Content-Type or charset from here
+        }
         if (request.length < 0 && request.streamData == null) {
             // can't concatenate content-length
-            String contentLength = request.headers.getFirstValue("Content-Length");
+            final String contentLength = request.headers.getFirstValue("Content-Length");
 
             if (contentLength != null) {
                 try {

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

@@ -105,4 +105,12 @@ public void testUserProvidedRequestMethod() {
         assertEquals(req.getMethod(), "ABC");
         assertEquals(req.getUrl(), "http://foo.com");
     }
+
+    @Test(groups = {"standalone", "default_provider"})
+    public void testContentTypeCharsetToBodyEncoding() {
+        final Request req = new RequestBuilder("GET").setHeader("Content-Type", "application/json; charset=utf-8").build();
+        assertEquals(req.getBodyEncoding(), "utf-8");
+        final Request req2 = new RequestBuilder("GET").setHeader("Content-Type", "application/json; charset=\"utf-8\"").build();
+        assertEquals(req2.getBodyEncoding(), "utf-8");
+    }
 }