Use UTF-8 instead of US-ASCII when no charset parameter is present.

Author: arturobernalg

httpclient5/src/main/java/org/apache/hc/client5/http/async/methods/SimpleBody.java

@@ -50,31 +50,13 @@ public final class SimpleBody {
         this.contentType = contentType;
     }
 
-    private static Charset getCharset(final ContentType contentType) {
-        if (contentType != null) {
-            final Charset charset = contentType.getCharset();
-            if (charset != null) {
-                return charset;
-            }
-            final String mimeType = contentType.getMimeType();
-            if (contentType.isSameMimeType(ContentType.APPLICATION_JSON)
-                    || contentType.isSameMimeType(ContentType.APPLICATION_NDJSON)
-                    || contentType.isSameMimeType(ContentType.APPLICATION_PROBLEM_JSON)
-                    || mimeType != null && mimeType.length() >= 5
-                    && mimeType.regionMatches(true, mimeType.length() - 5, "+json", 0, 5)) {
-                return StandardCharsets.UTF_8;
-            }
-            return StandardCharsets.US_ASCII;
-        }
-        return ContentType.DEFAULT_TEXT.getCharset();
-    }
-
     static SimpleBody create(final String body, final ContentType contentType) {
         Args.notNull(body, "Body");
         if (body.length() > 2048) {
             return new SimpleBody(null, body, contentType);
         }
-        final byte[] bytes = body.getBytes(getCharset(contentType));
+        final Charset charset = (contentType != null ? contentType : ContentType.DEFAULT_TEXT).getCharset(StandardCharsets.UTF_8);
+        final byte[] bytes = body.getBytes(charset);
         return new SimpleBody(bytes, null, contentType);
     }
 
@@ -101,7 +83,8 @@ public byte[] getBodyBytes() {
         if (bodyAsBytes != null) {
             return bodyAsBytes;
         } else if (bodyAsText != null) {
-            return bodyAsText.getBytes(getCharset(contentType));
+            final Charset charset = (contentType != null ? contentType : ContentType.DEFAULT_TEXT).getCharset(StandardCharsets.UTF_8);
+            return bodyAsText.getBytes(charset);
         } else {
             return null;
         }
@@ -114,7 +97,8 @@ public byte[] getBodyBytes() {
      */
     public String getBodyText() {
         if (bodyAsBytes != null) {
-            return new String(bodyAsBytes, getCharset(contentType));
+            final Charset charset = (contentType != null ? contentType : ContentType.DEFAULT_TEXT).getCharset(StandardCharsets.UTF_8);
+            return new String(bodyAsBytes, charset);
         }
         return bodyAsText;
     }
@@ -143,5 +127,4 @@ public String toString() {
                 ", content type=" + contentType + "}";
     }
 
-}
-
+}