Commit 798b3780 authored by Stephane Nicoll's avatar Stephane Nicoll

Polish "Add support for @ResponseStatus in DefaultErrorAttributes"

Closes gh-14744
parent 17919749
...@@ -94,14 +94,11 @@ public class DefaultErrorAttributes implements ErrorAttributes { ...@@ -94,14 +94,11 @@ public class DefaultErrorAttributes implements ErrorAttributes {
if (error instanceof ResponseStatusException) { if (error instanceof ResponseStatusException) {
return ((ResponseStatusException) error).getStatus(); return ((ResponseStatusException) error).getStatus();
} }
ResponseStatus responseStatus = AnnotatedElementUtils ResponseStatus responseStatus = AnnotatedElementUtils
.findMergedAnnotation(error.getClass(), ResponseStatus.class); .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;
} }
...@@ -109,18 +106,14 @@ public class DefaultErrorAttributes implements ErrorAttributes { ...@@ -109,18 +106,14 @@ public class DefaultErrorAttributes implements ErrorAttributes {
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 ResponseStatus responseStatus = AnnotatedElementUtils
.findMergedAnnotation(error.getClass(), ResponseStatus.class); .findMergedAnnotation(error.getClass(), ResponseStatus.class);
if (responseStatus != null) { if (responseStatus != null) {
return responseStatus.reason(); return responseStatus.reason();
} }
return error.getMessage(); return error.getMessage();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment