Skip to content

SPR-13033: Use @RequestMapping of correct class #799

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

Closed
wants to merge 1 commit into from
Closed

SPR-13033: Use @RequestMapping of correct class #799

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
23 changes: 20 additions & 3 deletions ...n/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ public static UriComponentsBuilder fromMethodCall(Object invocationInfo) {
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());
}

/**
Expand Down Expand Up @@ -362,8 +362,12 @@ public static UriComponentsBuilder fromMethod(Method method, Object... args) {
* @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);
Expand Down Expand Up @@ -560,7 +564,7 @@ public static <T> T on(Class<T> controllerType) {
*/
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")
Expand Down Expand Up @@ -634,11 +638,19 @@ private static class ControllerMethodInvocationInterceptor
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)) {
Expand All @@ -647,6 +659,9 @@ public Object intercept(Object obj, Method method, Object[] args, MethodProxy pr
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);
}
Expand All @@ -670,6 +685,8 @@ public interface MethodInvocationInfo {
Method getControllerMethod();

Object[] getArgumentValues();

Class<?> getControllerType();
}


Expand Down
13 changes: 13 additions & 0 deletions ...a/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilderTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,14 @@ public void testFromMethodCall() {
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(
Expand Down Expand Up @@ -418,6 +426,11 @@ HttpEntity<Void> methodWithMultiValueRequestParams(@PathVariable String id,
}
}

@RequestMapping("/extended")
static class ExtendedController extends ControllerWithMethods {

}

@RequestMapping("/user/{userId}/contacts")
static class UserContactController {

Expand Down