Skip to content
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

Jump to bottom

Check ResponseStatusException reason as MessageSource code for ProblemDetail #30300

Closed
wants to merge 1 commit into from
Closed

Check ResponseStatusException reason as MessageSource code for ProblemDetail #30300

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
9 changes: 9 additions & 0 deletions spring-web/src/main/java/org/springframework/web/ErrorResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
* {@code @RestController} or {@code RestControllerAdvice} class.
*
* @author Rossen Stoyanchev
* @author Yanming Zhou
* @since 6.0
* @see ErrorResponseException
*/
Expand Down Expand Up @@ -142,6 +143,14 @@ default ProblemDetail updateAndGetBody(@Nullable MessageSource messageSource, Lo
if (detail != null) {
getBody().setDetail(detail);
}
else {
// detail from ResponseStatusException reason may be message code
detail = getBody().getDetail();
if (detail != null) {
detail = messageSource.getMessage(detail, null, detail, locale);
getBody().setDetail(detail);
}
}
String title = messageSource.getMessage(getTitleMessageCode(), null, null, locale);
if (title != null) {
getBody().setTitle(title);
Expand Down
26 changes: 26 additions & 0 deletions ...pringframework/web/servlet/mvc/method/annotation/ResponseEntityExceptionHandlerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
import org.springframework.web.method.annotation.HandlerMethodValidationException;
import org.springframework.web.multipart.MaxUploadSizeExceededException;
import org.springframework.web.multipart.support.MissingServletRequestPartException;
import org.springframework.web.server.ResponseStatusException;
import org.springframework.web.servlet.DispatcherServlet;
import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.NoHandlerFoundException;
Expand All @@ -80,6 +81,7 @@
*
* @author Rossen Stoyanchev
* @author Sebastien Deleuze
* @author Yanming Zhou
*/
public class ResponseEntityExceptionHandlerTests {

Expand Down Expand Up @@ -199,6 +201,30 @@ public void errorResponseProblemDetailViaMessageSource() {
}
}

@Test
public void reasonAsDetailShouldBeUpdatedViaMessageSource() {

Locale locale = Locale.UK;
LocaleContextHolder.setLocale(locale);

String code = "bad.request";
String message = "Breaking Bad Request";
try {
StaticMessageSource messageSource = new StaticMessageSource();
messageSource.addMessage(code, locale, message);

this.exceptionHandler.setMessageSource(messageSource);

ResponseEntity<?> entity = testException(new ResponseStatusException(HttpStatus.BAD_REQUEST, code));

ProblemDetail body = (ProblemDetail) entity.getBody();
assertThat(body.getDetail()).isEqualTo(message);
}
finally {
LocaleContextHolder.resetLocaleContext();
}
}

@Test
public void conversionNotSupported() {
testException(new ConversionNotSupportedException(new Object(), Object.class, null));
Expand Down