loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

fix empty body in java apache client (#14574)

Browse Source
This commit is contained in:
William Cheng 2023-02-01 15:41:55 +08:00 committed by GitHub
parent 8d9816e193
commit 32499a19fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -830,7 +830,15 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
String mimeType = getResponseMimeType(response);
if (mimeType == null || isJsonMime(mimeType)) {
// Assume json if no mime type
return objectMapper.readValue(entity.getContent(), valueType);
// convert input stream to string
java.util.Scanner s = new java.util.Scanner(entity.getContent()).useDelimiter("\\A");
String content = (String) (s.hasNext() ? s.next() : "");
if ("".equals(content)) { // returns null for empty body
return null;
}
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");
@ -1069,7 +1077,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
}
} else {
// for empty body
builder.setEntity(serialize(null, null, contentTypeObj));
builder.setEntity(new StringEntity("", contentTypeObj));
}
try (CloseableHttpResponse response = httpClient.execute(builder.build(), context)) {

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

@ -703,7 +703,15 @@ public class ApiClient extends JavaTimeFormatter {
String mimeType = getResponseMimeType(response);
if (mimeType == null || isJsonMime(mimeType)) {
// Assume json if no mime type
return objectMapper.readValue(entity.getContent(), valueType);
// convert input stream to string
java.util.Scanner s = new java.util.Scanner(entity.getContent()).useDelimiter("\\A");
String content = (String) (s.hasNext() ? s.next() : "");
if ("".equals(content)) { // returns null for empty body
return null;
}
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");
@ -942,7 +950,7 @@ public class ApiClient extends JavaTimeFormatter {
}
} else {
// for empty body
builder.setEntity(serialize(null, null, contentTypeObj));
builder.setEntity(new StringEntity("", contentTypeObj));
}
try (CloseableHttpResponse response = httpClient.execute(builder.build(), context)) {

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

@ -846,7 +846,15 @@ public class ApiClient extends JavaTimeFormatter {
String mimeType = getResponseMimeType(response);
if (mimeType == null || isJsonMime(mimeType)) {
// Assume json if no mime type
return objectMapper.readValue(entity.getContent(), valueType);
// convert input stream to string
java.util.Scanner s = new java.util.Scanner(entity.getContent()).useDelimiter("\\A");
String content = (String) (s.hasNext() ? s.next() : "");
if ("".equals(content)) { // returns null for empty body
return null;
}
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");
@ -1085,7 +1093,7 @@ public class ApiClient extends JavaTimeFormatter {
}
} else {
// for empty body
builder.setEntity(serialize(null, null, contentTypeObj));
builder.setEntity(new StringEntity("", contentTypeObj));
}
try (CloseableHttpResponse response = httpClient.execute(builder.build(), context)) {