Skip to content
Merged
Changes from all commits
Commits
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
20 changes: 15 additions & 5 deletions src/main/java/com/skyflow/errors/SkyflowException.java
Original file line number Diff line number Diff line change
Expand Up @@ -41,18 +41,18 @@
super(cause);
this.httpCode = httpCode;
setRequestId(responseHeaders);
setResponseBody(responseBody);
setResponseBody(responseBody, responseHeaders);
}

private void setResponseBody(String responseBody) {
private void setResponseBody(String responseBody, Map<String, List<String>> responseHeaders) {
try {
if (responseBody != null) {
this.responseBody = JsonParser.parseString(responseBody).getAsJsonObject();
if (this.responseBody.get("error") != null) {
setGrpcCode();
setHttpStatus();
setMessage();
setDetails();
setDetails(responseHeaders);
}
}
} catch (JsonSyntaxException e) {
Expand Down Expand Up @@ -86,9 +86,19 @@
this.httpStatus = statusElement == null ? null : statusElement.getAsString();
}

private void setDetails() {
private void setDetails(Map<String, List<String>> responseHeaders) {
JsonElement detailsElement = ((JsonObject) responseBody.get("error")).get("details");
this.details = detailsElement == null ? null : detailsElement.getAsJsonArray();
List<String> errorFromClientHeader = responseHeaders.get("error-from-client");
if (detailsElement != null) {
this.details = detailsElement.getAsJsonArray();
}
if (errorFromClientHeader != null) {
this.details = this.details == null ? new JsonArray() : this.details;
String errorFromClient = errorFromClientHeader.get(0);
JsonObject detailObject = new JsonObject();
detailObject.addProperty("errorFromClient", errorFromClient);
this.details.add(detailObject);

Check warning on line 100 in src/main/java/com/skyflow/errors/SkyflowException.java

View check run for this annotation

Codecov / codecov/patch

src/main/java/com/skyflow/errors/SkyflowException.java#L97-L100

Added lines #L97 - L100 were not covered by tests
}
}

public int getHttpCode() {
Expand Down
Loading