SPR-13033: Use @RequestMapping of correct class

MvcUriComponentsBuilder::fromMethodCall creates wrong URLs with derived
controller classes. The @RequestMapping of the declaring class of the
method that is called is used instead of the @RequstMapping of the
given controller class.

https://jira.spring.io/browse/SPR-13033

spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilder.java

@@ -254,7 +254,7 @@ public class MvcUriComponentsBuilder {
 	public static UriComponentsBuilder fromMethodCall(UriComponentsBuilder builder, Object invocationInfo) {
 		Assert.isInstanceOf(MethodInvocationInfo.class, invocationInfo);
 		MethodInvocationInfo info = (MethodInvocationInfo) invocationInfo;
-		return fromMethod(builder, info.getControllerMethod(), info.getArgumentValues());
+		return fromMethod(builder, info.getControllerType(), info.getControllerMethod(), info.getArgumentValues());
 	}
 
 	/**
@@ -362,8 +362,12 @@ public class MvcUriComponentsBuilder {
 	 * @return a UriComponentsBuilder instance, never {@code null}
 	 */
 	public static UriComponentsBuilder fromMethod(UriComponentsBuilder baseUrl, Method method, Object... args) {
+		return fromMethod(baseUrl, method.getDeclaringClass(), method, args);
+	}
+	
+	private static UriComponentsBuilder fromMethod(UriComponentsBuilder baseUrl, Class<?> controllerType, Method method, Object... args) {
 		baseUrl = getBaseUrlToUse(baseUrl);
-		String typePath = getTypeRequestMapping(method.getDeclaringClass());
+		String typePath = getTypeRequestMapping(controllerType);
 		String methodPath = getMethodRequestMapping(method);
 		String path = pathMatcher.combine(typePath, methodPath);
 		baseUrl.path(path);
@@ -560,7 +564,7 @@ public class MvcUriComponentsBuilder {
 	 */
 	public static <T> T controller(Class<T> controllerType) {
 		Assert.notNull(controllerType, "'controllerType' must not be null");
-		return initProxy(controllerType, new ControllerMethodInvocationInterceptor());
+		return initProxy(controllerType, new ControllerMethodInvocationInterceptor(controllerType));
 	}
 
 	@SuppressWarnings("unchecked")
@@ -634,11 +638,19 @@ public class MvcUriComponentsBuilder {
 		private static final Method getArgumentValues =
 				ReflectionUtils.findMethod(MethodInvocationInfo.class, "getArgumentValues");
 
+		private static final Method getControllerType =
+				ReflectionUtils.findMethod(MethodInvocationInfo.class, "getControllerType");
+
 		private Method controllerMethod;
 
 		private Object[] argumentValues;
 
+		private Class<?> controllerType;
 
+		ControllerMethodInvocationInterceptor(Class<?> controllerType) {
+			this.controllerType = controllerType;
+		}
+		
 		@Override
 		public Object intercept(Object obj, Method method, Object[] args, MethodProxy proxy) {
 			if (getControllerMethod.equals(method)) {
@@ -647,6 +659,9 @@ public class MvcUriComponentsBuilder {
 			else if (getArgumentValues.equals(method)) {
 				return this.argumentValues;
 			}
+			else if (getControllerType.equals(method)) {
+				return this.controllerType;
+			}
 			else if (ReflectionUtils.isObjectMethod(method)) {
 				return ReflectionUtils.invokeMethod(method, obj, args);
 			}
@@ -670,6 +685,8 @@ public class MvcUriComponentsBuilder {
 		Method getControllerMethod();
 
 		Object[] getArgumentValues();
+
+		Class<?> getControllerType();
 	}
 
 

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

@@ -229,6 +229,14 @@ public class MvcUriComponentsBuilderTests {
 		assertThat(uriComponents.toUriString(), endsWith("/something/else"));
 	}
 
+ 	@Test
+	public void testFromMethodCallOnSubclass() {
+		UriComponents uriComponents = fromMethodCall(on(ExtendedController.class).myMethod(null)).build();
+
+		assertThat(uriComponents.toUriString(), startsWith("http://localhost"));
+		assertThat(uriComponents.toUriString(), endsWith("/extended/else"));
+	}
+ 
 	@Test
 	public void testFromMethodCallWithTypeLevelUriVars() {
 		UriComponents uriComponents = fromMethodCall(on(
@@ -418,6 +426,11 @@ public class MvcUriComponentsBuilderTests {
 		}
 	}
 
+	@RequestMapping("/extended")
+	static class ExtendedController extends ControllerWithMethods {
+
+	}
+	
 	@RequestMapping("/user/{userId}/contacts")
 	static class UserContactController {