Skip to content

Unwrap JSON messages in ResponseStatusExceptionFilter #1180

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
KostyaSha merged 3 commits into from
Jun 25, 2019
Merged

Unwrap JSON messages in ResponseStatusExceptionFilter #1180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4b3d908
ResponseStatusExceptionFilter: Remove a "throws" declaration
sschuberth Mar 20, 2019
32b4db6
ResponseStatusExceptionFilter: Unwrap a JSON message
sschuberth Mar 20, 2019
2769032
LoadImageCmdIT: Trivially fix a typo in a comment
sschuberth Mar 20, 2019
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
17 changes: 15 additions & 2 deletions src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@

import org.apache.commons.io.IOUtils;

import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;

import com.github.dockerjava.api.exception.BadRequestException;
import com.github.dockerjava.api.exception.ConflictException;
import com.github.dockerjava.api.exception.DockerException;
Expand Down Expand Up @@ -55,7 +58,7 @@ public void filter(ClientRequestContext requestContext, ClientResponseContext re
}
}

private String getBodyAsMessage(ClientResponseContext responseContext) throws IOException {
private String getBodyAsMessage(ClientResponseContext responseContext) {
if (responseContext.hasEntity()) {
try (InputStream entityStream = responseContext.getEntityStream()) {
Charset charset = null;
Expand All @@ -73,7 +76,17 @@ private String getBodyAsMessage(ClientResponseContext responseContext) throws IO
charset = Charset.defaultCharset();
}

return IOUtils.toString(entityStream, charset);
String message = IOUtils.toString(entityStream, charset);

if (MediaType.APPLICATION_JSON_TYPE.equals(mediaType)) {
ObjectMapper mapper = new ObjectMapper();
JsonNode node = mapper.readTree(entityStream).get("message");
if (node != null) {
message = node.textValue();
}
}

return message;
} catch (Exception ignored) { }
}
return null;
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/github/dockerjava/cmd/LoadImageCmdIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public void loadImageFromTar() throws Exception {
dockerRule.getClient().loadImageCmd(uploadStream).exec();
}

//swarm needs some time to refelct new images
//swarm needs some time to reflect new images
synchronized (this) {
wait(5000);
}
Expand Down