fix: java apache httpclient should support UTF-8 by default (OpenAPIT…

…ools#17395) * fix(java): apache-httpclient serialization error fixes following related issue: OpenAPITools#12797 * docs(java): update samples and docs
dabdirb · Dec 15, 2023 · a9179e9 · a9179e9
1 parent 0062d1c
commit a9179e9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/.../openapi-generator/src/main/resources/Java/libraries/apache-httpclient/ApiClient.mustache b/.../openapi-generator/src/main/resources/Java/libraries/apache-httpclient/ApiClient.mustache
@@ -61,6 +61,7 @@ import java.io.InputStream;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.nio.charset.UnsupportedCharsetException;
 import java.nio.file.Files;
 import java.nio.file.StandardCopyOption;
@@ -785,7 +786,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
     String mimeType = contentType.getMimeType();
     if (isJsonMime(mimeType)) {
       try {
-        return new StringEntity(objectMapper.writeValueAsString(obj), contentType);
+        return new StringEntity(objectMapper.writeValueAsString(obj), contentType.withCharset(StandardCharsets.UTF_8));
       } catch (JsonProcessingException e) {
         throw new ApiException(e);
       }

diff --git a/...ient/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/ApiClient.java b/...ient/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/ApiClient.java
@@ -67,6 +67,7 @@
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.nio.charset.UnsupportedCharsetException;
 import java.nio.file.Files;
 import java.nio.file.StandardCopyOption;
@@ -703,7 +704,7 @@ public HttpEntity serialize(Object obj, Map<String, Object> formParams, ContentT
     String mimeType = contentType.getMimeType();
     if (isJsonMime(mimeType)) {
       try {
-        return new StringEntity(objectMapper.writeValueAsString(obj), contentType);
+        return new StringEntity(objectMapper.writeValueAsString(obj), contentType.withCharset(StandardCharsets.UTF_8));
       } catch (JsonProcessingException e) {
         throw new ApiException(e);
       }

diff --git a/...ient/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/ApiClient.java b/...ient/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/ApiClient.java
@@ -67,6 +67,7 @@
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.nio.charset.UnsupportedCharsetException;
 import java.nio.file.Files;
 import java.nio.file.StandardCopyOption;
@@ -796,7 +797,7 @@ public HttpEntity serialize(Object obj, Map<String, Object> formParams, ContentT
     String mimeType = contentType.getMimeType();
     if (isJsonMime(mimeType)) {
       try {
-        return new StringEntity(objectMapper.writeValueAsString(obj), contentType);
+        return new StringEntity(objectMapper.writeValueAsString(obj), contentType.withCharset(StandardCharsets.UTF_8));
       } catch (JsonProcessingException e) {
         throw new ApiException(e);
       }