Use MessageSource in HandlerMethod for error reason

Closes gh-27156

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethodTests.java

@@ -22,6 +22,7 @@ import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.Locale;
 
 import javax.servlet.FilterChain;
 import javax.servlet.http.HttpServletResponse;
@@ -29,6 +30,9 @@ import javax.servlet.http.HttpServletResponse;
 import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Flux;
 
+import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
+import org.springframework.context.i18n.LocaleContextHolder;
+import org.springframework.context.support.StaticApplicationContext;
 import org.springframework.core.MethodParameter;
 import org.springframework.core.ResolvableType;
 import org.springframework.core.annotation.AliasFor;
@@ -47,12 +51,14 @@ import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.context.request.ServletWebRequest;
 import org.springframework.web.context.request.async.DeferredResult;
 import org.springframework.web.filter.ShallowEtagHeaderFilter;
+import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.method.annotation.RequestParamMethodArgumentResolver;
 import org.springframework.web.method.support.HandlerMethodArgumentResolverComposite;
 import org.springframework.web.method.support.HandlerMethodReturnValueHandler;
 import org.springframework.web.method.support.HandlerMethodReturnValueHandlerComposite;
 import org.springframework.web.method.support.ModelAndViewContainer;
 import org.springframework.web.servlet.view.RedirectView;
+import org.springframework.web.testfixture.method.ResolvableMethod;
 import org.springframework.web.testfixture.servlet.MockHttpServletRequest;
 import org.springframework.web.testfixture.servlet.MockHttpServletResponse;
 
@@ -180,6 +186,39 @@ public class ServletInvocableHandlerMethodTests {
 				.as("When a status reason w/ used, the request is handled").isTrue();
 	}
 
+	@Test
+	public void invokeAndHandle_responseStatusAndReasonCode() throws Exception {
+		Locale locale = Locale.ENGLISH;
+
+		String beanName = "handler";
+		StaticApplicationContext context = new StaticApplicationContext();
+		context.registerBean(beanName, Handler.class);
+		context.addMessage("BadRequest.error", locale, "Bad request message");
+		context.refresh();
+
+		ConfigurableListableBeanFactory beanFactory = context.getBeanFactory();
+		System.out.println(beanFactory.getType(beanName));
+
+		LocaleContextHolder.setLocale(locale);
+		try {
+			Method method = ResolvableMethod.on(Handler.class)
+					.named("responseStatusWithReasonCode")
+					.resolveMethod();
+
+			HandlerMethod handlerMethod = new HandlerMethod(beanName, beanFactory, context, method);
+			handlerMethod = handlerMethod.createWithResolvedBean();
+
+			new ServletInvocableHandlerMethod(handlerMethod)
+					.invokeAndHandle(this.webRequest, this.mavContainer);
+		}
+		finally {
+			LocaleContextHolder.resetLocaleContext();
+		}
+
+		assertThat(this.response.getStatus()).isEqualTo(HttpStatus.BAD_REQUEST.value());
+		assertThat(this.response.getErrorMessage()).isEqualTo("Bad request message");
+	}
+
 	@Test // gh-23775, gh-24635
 	public void invokeAndHandle_ETagFilterHasNoImpactWhenETagPresent() throws Exception {
 
@@ -417,6 +456,11 @@ public class ServletInvocableHandlerMethodTests {
 			return "foo";
 		}
 
+		@ResponseStatus(code = HttpStatus.BAD_REQUEST, reason = "BadRequest.error")
+		public String responseStatusWithReasonCode() {
+			return "foo";
+		}
+
 		@ComposedResponseStatus(responseStatus = HttpStatus.BAD_REQUEST)
 		public void composedResponseStatus() {
 		}