[JAVA][apache-httpclient] Use EntityUtils#toString instead of ``S…

…canner`` ``EntityUtils#toString`` automatically selects the correct encoding based on the received request. Scanner currently uses the JVM default encoding, which doesn't always work.
OpenAPITools · Mar 1, 2024 · 844661b · 844661b
1 parent d4e1050
commit 844661b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 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
@@ -853,8 +853,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
     if (mimeType == null || isJsonMime(mimeType)) {
       // Assume json if no mime type
       // convert input stream to string
-      java.util.Scanner s = new java.util.Scanner(entity.getContent()).useDelimiter("\\A");
-      String content = (String) (s.hasNext() ? s.next() : "");
+      String content = EntityUtils.toString(entity);
 
       if ("".equals(content)) { // returns null for empty body
         return null;
@@ -863,8 +862,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
       return objectMapper.readValue(content, valueType);
     } else if ("text/plain".equalsIgnoreCase(mimeType)) {
       // convert input stream to string
-      java.util.Scanner s = new java.util.Scanner(entity.getContent()).useDelimiter("\\A");
-      return (T) (s.hasNext() ? s.next() : "");
+      return (T) EntityUtils.toString(entity);
     } else {
       throw new ApiException(
           "Deserialization for content type '" + mimeType + "' not supported for type '" + valueType + "'",

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
@@ -771,8 +771,7 @@ public <T> T deserialize(CloseableHttpResponse response, TypeReference<T> valueT
     if (mimeType == null || isJsonMime(mimeType)) {
       // Assume json if no mime type
       // convert input stream to string
-      java.util.Scanner s = new java.util.Scanner(entity.getContent()).useDelimiter("\\A");
-      String content = (String) (s.hasNext() ? s.next() : "");
+      String content = EntityUtils.toString(entity);
 
       if ("".equals(content)) { // returns null for empty body
         return null;
@@ -781,8 +780,7 @@ public <T> T deserialize(CloseableHttpResponse response, TypeReference<T> valueT
       return objectMapper.readValue(content, valueType);
     } else if ("text/plain".equalsIgnoreCase(mimeType)) {
       // convert input stream to string
-      java.util.Scanner s = new java.util.Scanner(entity.getContent()).useDelimiter("\\A");
-      return (T) (s.hasNext() ? s.next() : "");
+      return (T) EntityUtils.toString(entity);
     } else {
       throw new ApiException(
           "Deserialization for content type '" + mimeType + "' not supported for type '" + valueType + "'",

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
@@ -864,8 +864,7 @@ public <T> T deserialize(CloseableHttpResponse response, TypeReference<T> valueT
     if (mimeType == null || isJsonMime(mimeType)) {
       // Assume json if no mime type
       // convert input stream to string
-      java.util.Scanner s = new java.util.Scanner(entity.getContent()).useDelimiter("\\A");
-      String content = (String) (s.hasNext() ? s.next() : "");
+      String content = EntityUtils.toString(entity);
 
       if ("".equals(content)) { // returns null for empty body
         return null;
@@ -874,8 +873,7 @@ public <T> T deserialize(CloseableHttpResponse response, TypeReference<T> valueT
       return objectMapper.readValue(content, valueType);
     } else if ("text/plain".equalsIgnoreCase(mimeType)) {
       // convert input stream to string
-      java.util.Scanner s = new java.util.Scanner(entity.getContent()).useDelimiter("\\A");
-      return (T) (s.hasNext() ? s.next() : "");
+      return (T) EntityUtils.toString(entity);
     } else {
       throw new ApiException(
           "Deserialization for content type '" + mimeType + "' not supported for type '" + valueType + "'",