Port missing AsyncHttpClient#540 on master

Author: Stephane Landelle

api/src/main/java/org/asynchttpclient/RequestBuilderBase.java

@@ -634,8 +634,7 @@ public T setConnectionPoolKeyStrategy(ConnectionPoolKeyStrategy connectionPoolKe
         return derived.cast(this);
     }
 
-    public Request build() {
-        
+    private void executeSignatureCalculator() {
         /* Let's first calculate and inject signature, before finalizing actual build
          * (order does not matter with current implementation but may in future)
          */
@@ -647,8 +646,28 @@ public Request build() {
                 url = url.substring(0, i);
             }
             signatureCalculator.calculateAndAddSignature(url, request, this);
+        } 
+    }
+
+    private void computeRequestCharset() {
+        if (request.charset != null) {
+            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
+            }
         }
-        
+    }
+
+    private void computeRequestContentLength() {
         if (request.length < 0 && request.streamData == null) {
             // can't concatenate content-length
             String contentLength = null;
@@ -664,6 +683,14 @@ public Request build() {
                 }
             }
         }
+    }
+
+    public Request build() {
+        
+        executeSignatureCalculator();
+        computeRequestCharset();
+        computeRequestContentLength();
+
         if (request.cookies != null) {
             request.cookies = Collections.unmodifiableCollection(request.cookies);
         }

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

@@ -112,4 +112,12 @@ public void testPercentageEncodedUserInfo() {
         assertEquals(req.getMethod(), "GET");
         assertEquals(req.getUrl(), "http://hello:wor%[email protected]");
     }
+
+    @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");
+    }
 }