Skip to content

Allow parsing of responses from DELETE requests #248

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
choran merged 2 commits into from
Nov 13, 2018
Merged

Allow parsing of responses from DELETE requests #248

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68cd4f9
Allow parsing of responses from DELETE requests
Nov 1, 2018
361802e
Merge branch 'master' into timlim/process-response-for-DELETE-requests
choran Nov 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions intercom-java/src/main/java/io/intercom/api/HttpClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,19 +178,18 @@ private <T> T handleSuccess(JavaType javaType, HttpURLConnection conn, int respo
}

private boolean shouldSkipResponseEntity(JavaType javaType, HttpURLConnection conn, int responseCode) {
return responseCode == 204 || Void.class.equals(javaType.getRawClass()) || "DELETE".equals(conn.getRequestMethod());
return responseCode == 204 || Void.class.equals(javaType.getRawClass());
}

private <T> T readEntity(HttpURLConnection conn, int responseCode, JavaType javaType) throws IOException {
final InputStream entityStream = conn.getInputStream();
try {
final String text = CharStreams.toString(new InputStreamReader(entityStream));
if (logger.isDebugEnabled()) {
final String text = CharStreams.toString(new InputStreamReader(entityStream));
logger.debug("api server response status[{}] --\n{}\n-- ", responseCode, text);
return objectMapper.readValue(text, javaType);
} else {
return objectMapper.readValue(entityStream, javaType);
}
if (text.isEmpty()) return null;
return objectMapper.readValue(text, javaType);
} finally {
IOUtils.closeQuietly(entityStream);
}
Expand Down