loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-12-07 21:06:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: java apache httpclient should support UTF-8 by default (#17395)

Browse Source 
* fix(java): apache-httpclient serialization error

fixes following related issue:
https://github.com/OpenAPITools/openapi-generator/issues/12797

* docs(java): update samples and docs
This commit is contained in:
renaud-twd
2023-12-14 15:01:10 -10:00
committed by GitHub
parent 0062d1c8da
commit a9179e95dd
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/ApiClient.mustache vendored
View File

@@ -61,6 +61,7 @@ import java.io.InputStream;
import java.io.IOException; import java.io.IOException;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.nio.charset.UnsupportedCharsetException; import java.nio.charset.UnsupportedCharsetException;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.StandardCopyOption; import java.nio.file.StandardCopyOption;
@@ -785,7 +786,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
String mimeType = contentType.getMimeType(); String mimeType = contentType.getMimeType();
if (isJsonMime(mimeType)) { if (isJsonMime(mimeType)) {
try { try {
return new StringEntity(objectMapper.writeValueAsString(obj), contentType); return new StringEntity(objectMapper.writeValueAsString(obj), contentType.withCharset(StandardCharsets.UTF_8));
} catch (JsonProcessingException e) { } catch (JsonProcessingException e) {
throw new ApiException(e); throw new ApiException(e);
} }

3
samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/ApiClient.java
View File

@@ -67,6 +67,7 @@ import java.io.InputStream;
import java.io.IOException; import java.io.IOException;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.nio.charset.UnsupportedCharsetException; import java.nio.charset.UnsupportedCharsetException;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.StandardCopyOption; import java.nio.file.StandardCopyOption;
@@ -703,7 +704,7 @@ public class ApiClient extends JavaTimeFormatter {
String mimeType = contentType.getMimeType(); String mimeType = contentType.getMimeType();
if (isJsonMime(mimeType)) { if (isJsonMime(mimeType)) {
try { try {
return new StringEntity(objectMapper.writeValueAsString(obj), contentType); return new StringEntity(objectMapper.writeValueAsString(obj), contentType.withCharset(StandardCharsets.UTF_8));
} catch (JsonProcessingException e) { } catch (JsonProcessingException e) {
throw new ApiException(e); throw new ApiException(e);
} }

3
samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/ApiClient.java
View File

@@ -67,6 +67,7 @@ import java.io.InputStream;
import java.io.IOException; import java.io.IOException;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.nio.charset.UnsupportedCharsetException; import java.nio.charset.UnsupportedCharsetException;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.StandardCopyOption; import java.nio.file.StandardCopyOption;
@@ -796,7 +797,7 @@ public class ApiClient extends JavaTimeFormatter {
String mimeType = contentType.getMimeType(); String mimeType = contentType.getMimeType();
if (isJsonMime(mimeType)) { if (isJsonMime(mimeType)) {
try { try {
return new StringEntity(objectMapper.writeValueAsString(obj), contentType); return new StringEntity(objectMapper.writeValueAsString(obj), contentType.withCharset(StandardCharsets.UTF_8));
} catch (JsonProcessingException e) { } catch (JsonProcessingException e) {
throw new ApiException(e); throw new ApiException(e);
} }