root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Polish contribution 

See gh-19901
This commit is contained in:
Stephane Nicoll 2020-02-03 18:20:48 +01:00
parent aead3a7c44
commit 12b644d73c
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/error/DefaultErrorAttributes.java
View File

@ -81,39 +81,37 @@ public class DefaultErrorAttributes implements ErrorAttributes {
errorAttributes.put("timestamp", new Date()); errorAttributes.put("timestamp", new Date());
errorAttributes.put("path", request.path()); errorAttributes.put("path", request.path());
Throwable error = getError(request); Throwable error = getError(request);
HttpStatus errorStatus = determineHttpStatus(error); ResponseStatus responseStatus = AnnotatedElementUtils.findMergedAnnotation(error.getClass(),
ResponseStatus.class);
HttpStatus errorStatus = determineHttpStatus(error, responseStatus);
errorAttributes.put("status", errorStatus.value()); errorAttributes.put("status", errorStatus.value());
errorAttributes.put("error", errorStatus.getReasonPhrase()); errorAttributes.put("error", errorStatus.getReasonPhrase());
errorAttributes.put("message", determineMessage(error)); errorAttributes.put("message", determineMessage(error, responseStatus));
handleException(errorAttributes, determineException(error), includeStackTrace); handleException(errorAttributes, determineException(error), includeStackTrace);
return errorAttributes; return errorAttributes;
} }
private HttpStatus determineHttpStatus(Throwable error) { private HttpStatus determineHttpStatus(Throwable error, ResponseStatus responseStatus) {
if (error instanceof ResponseStatusException) { if (error instanceof ResponseStatusException) {
return ((ResponseStatusException) error).getStatus(); return ((ResponseStatusException) error).getStatus();
} }
ResponseStatus responseStatus = AnnotatedElementUtils.findMergedAnnotation(error.getClass(),
ResponseStatus.class);
if (responseStatus != null) { if (responseStatus != null) {
return responseStatus.code(); return responseStatus.code();
} }
return HttpStatus.INTERNAL_SERVER_ERROR; return HttpStatus.INTERNAL_SERVER_ERROR;
} }
private String determineMessage(Throwable error) { private String determineMessage(Throwable error, ResponseStatus responseStatus) {
if (error instanceof WebExchangeBindException) { if (error instanceof WebExchangeBindException) {
return error.getMessage(); return error.getMessage();
} }
if (error instanceof ResponseStatusException) { if (error instanceof ResponseStatusException) {
return ((ResponseStatusException) error).getReason(); return ((ResponseStatusException) error).getReason();
} }
ResponseStatus responseStatus = AnnotatedElementUtils.findMergedAnnotation(error.getClass(), if (responseStatus != null && StringUtils.hasText(responseStatus.reason())) {
ResponseStatus.class);
if (responseStatus != null) {
return responseStatus.reason(); return responseStatus.reason();
} }
return error.getMessage(); return (error.getMessage() != null) ? error.getMessage() : "";
} }
private Throwable determineException(Throwable error) { private Throwable determineException(Throwable error) {

2
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/error/DefaultErrorAttributesTests.java
View File

@ -94,7 +94,7 @@ public class DefaultErrorAttributesTests {
} }
@Test @Test
void annotatedResponseStatusCodeWithExceptionMessage() { public void annotatedResponseStatusCodeWithExceptionMessage() {
Exception error = new CustomException("Test Message"); Exception error = new CustomException("Test Message");
MockServerHttpRequest request = MockServerHttpRequest.get("/test").build(); MockServerHttpRequest request = MockServerHttpRequest.get("/test").build();
Map<String, Object> attributes = this.errorAttributes.getErrorAttributes(buildServerRequest(request, error), Map<String, Object> attributes = this.errorAttributes.getErrorAttributes(buildServerRequest(request, error),