Skip to content

Fix missing response body in UnknownHttpStatusCodeException instances #24678

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

Closed
wants to merge 1 commit into from
Closed

Fix missing response body in UnknownHttpStatusCodeException instances #24678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions spring-web/src/main/java/org/springframework/web/client/DefaultResponseErrorHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,13 @@ protected boolean hasError(int unknownStatusCode) {
public void handleError(ClientHttpResponse response) throws IOException {
HttpStatus statusCode = HttpStatus.resolve(response.getRawStatusCode());
if (statusCode == null) {
byte[] responseBody = getResponseBody(response);
String message = getErrorMessage(
response.getRawStatusCode(), response.getStatusText(),
getResponseBody(response), getCharset(response));
responseBody, getCharset(response));
throw new UnknownHttpStatusCodeException(message,
response.getRawStatusCode(), response.getStatusText(),
response.getHeaders(), getResponseBody(response), getCharset(response));
response.getHeaders(), responseBody, getCharset(response));
}
handleError(response, statusCode);
}
Expand Down
20 changes: 20 additions & 0 deletions ...ng-web/src/test/java/org/springframework/web/client/DefaultResponseErrorHandlerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.assertj.core.api.Assertions.catchThrowableOfType;
import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock;

Expand Down Expand Up @@ -213,6 +214,25 @@ public void bodyAvailableAfterHasErrorForUnknownStatusCode() throws Exception {
}


@Test
public void bodyAvailableAfterHandlingUnknownStatusClientError() throws Exception {
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.TEXT_PLAIN);
TestByteArrayInputStream body = new TestByteArrayInputStream("Hello World".getBytes(StandardCharsets.UTF_8));

given(response.getRawStatusCode()).willReturn(432);
given(response.getStatusText()).willReturn("Custom status code");
given(response.getHeaders()).willReturn(headers);
given(response.getBody()).willReturn(body);

UnknownHttpStatusCodeException caught = catchThrowableOfType(() -> handler.handleError(response),
UnknownHttpStatusCodeException.class);

assertThat(caught.getResponseBodyAsString()).isEqualTo("Hello World");

}


private static class TestByteArrayInputStream extends ByteArrayInputStream {

private boolean closed;
Expand Down