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

ResponseStatusException reason as message code for ProblemDetail 

See gh-30300
This commit is contained in:
Yanming Zhou 2023-04-06 17:18:27 +08:00 committed by rstoyanchev
parent 6697f01d05
commit a3532bfccc
2 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
spring-web/src/main/java/org/springframework/web/ErrorResponse.java
View File

@ -40,6 +40,7 @@ import org.springframework.lang.Nullable;
* {@code @RestController} or {@code RestControllerAdvice} class. * {@code @RestController} or {@code RestControllerAdvice} class.
* *
* @author Rossen Stoyanchev * @author Rossen Stoyanchev
* @author Yanming Zhou
* @since 6.0 * @since 6.0
* @see ErrorResponseException * @see ErrorResponseException
*/ */
@ -142,6 +143,14 @@ public interface ErrorResponse {
if (detail != null) { if (detail != null) {
getBody().setDetail(detail); 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); String title = messageSource.getMessage(getTitleMessageCode(), null, null, locale);
if (title != null) { if (title != null) {
getBody().setTitle(title); getBody().setTitle(title);

26
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ResponseEntityExceptionHandlerTests.java
View File

@ -63,6 +63,7 @@ import org.springframework.web.context.support.StaticWebApplicationContext;
import org.springframework.web.method.annotation.HandlerMethodValidationException; import org.springframework.web.method.annotation.HandlerMethodValidationException;
import org.springframework.web.multipart.MaxUploadSizeExceededException; import org.springframework.web.multipart.MaxUploadSizeExceededException;
import org.springframework.web.multipart.support.MissingServletRequestPartException; import org.springframework.web.multipart.support.MissingServletRequestPartException;
import org.springframework.web.server.ResponseStatusException;
import org.springframework.web.servlet.DispatcherServlet; import org.springframework.web.servlet.DispatcherServlet;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.NoHandlerFoundException; import org.springframework.web.servlet.NoHandlerFoundException;
@ -80,6 +81,7 @@ import static org.mockito.BDDMockito.mock;
* *
* @author Rossen Stoyanchev * @author Rossen Stoyanchev
* @author Sebastien Deleuze * @author Sebastien Deleuze
* @author Yanming Zhou
*/ */
public class ResponseEntityExceptionHandlerTests { public class ResponseEntityExceptionHandlerTests {
@ -199,6 +201,30 @@ public class ResponseEntityExceptionHandlerTests {
} }
} }
@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 @Test
public void conversionNotSupported() { public void conversionNotSupported() {
testException(new ConversionNotSupportedException(new Object(), Object.class, null)); testException(new ConversionNotSupportedException(new Object(), Object.class, null));