Adapt no-arg value from interface-based InvocationHandler callback

Closes gh-30756
spring-projects · Jun 26, 2023 · b77d4d0 · b77d4d0
1 parent 599ac58
commit b77d4d0
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 5 deletions.
diff --git a/...n/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilder.java b/...n/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilder.java
@@ -745,8 +745,8 @@ public Object intercept(@Nullable Object obj, Method method, Object[] args, @Nul
 
 		@Override
 		@Nullable
-		public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-			return intercept(proxy, method, args, null);
+		public Object invoke(Object proxy, Method method, @Nullable Object[] args) {
+			return intercept(proxy, method, (args != null ? args : new Object[0]), null);
 		}
 
 		@Override

diff --git a/...a/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilderTests.java b/...a/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilderTests.java
@@ -293,6 +293,14 @@ public void fromMethodNameWithMetaAnnotation() {
 		assertThat(uriComponents.toUriString()).isEqualTo("http://localhost/input");
 	}
 
+	@Test
+	public void fromMethodCallOnSubclass() {
+		UriComponents uriComponents = fromMethodCall(on(ExtendedController.class).myMethod(null)).build();
+
+		assertThat(uriComponents.toUriString()).startsWith("http://localhost");
+		assertThat(uriComponents.toUriString()).endsWith("/extended/else");
+	}
+
 	@Test
 	public void fromMethodCallPlain() {
 		UriComponents uriComponents = fromMethodCall(on(ControllerWithMethods.class).myMethod(null)).build();
@@ -302,11 +310,27 @@ public void fromMethodCallPlain() {
 	}
 
 	@Test
-	public void fromMethodCallOnSubclass() {
-		UriComponents uriComponents = fromMethodCall(on(ExtendedController.class).myMethod(null)).build();
+	public void fromMethodCallPlainWithNoArguments() {
+		UriComponents uriComponents = fromMethodCall(on(ControllerWithMethods.class).myMethod()).build();
 
 		assertThat(uriComponents.toUriString()).startsWith("http://localhost");
-		assertThat(uriComponents.toUriString()).endsWith("/extended/else");
+		assertThat(uriComponents.toUriString()).endsWith("/something/noarg");
+	}
+
+	@Test
+	public void fromMethodCallPlainOnInterface() {
+		UriComponents uriComponents = fromMethodCall(on(ControllerInterface.class).myMethod(null)).build();
+
+		assertThat(uriComponents.toUriString()).startsWith("http://localhost");
+		assertThat(uriComponents.toUriString()).endsWith("/something/else");
+	}
+
+	@Test
+	public void fromMethodCallPlainWithNoArgumentsOnInterface() {
+		UriComponents uriComponents = fromMethodCall(on(ControllerInterface.class).myMethod()).build();
+
+		assertThat(uriComponents.toUriString()).startsWith("http://localhost");
+		assertThat(uriComponents.toUriString()).endsWith("/something/noarg");
 	}
 
 	@Test
@@ -575,6 +599,11 @@ HttpEntity<Void> myMethod(@RequestBody Object payload) {
 			return null;
 		}
 
+		@RequestMapping("/noarg")
+		HttpEntity<Void> myMethod() {
+			return null;
+		}
+
 		@RequestMapping("/{id}/foo")
 		HttpEntity<Void> methodWithPathVariable(@PathVariable String id) {
 			return null;
@@ -616,6 +645,17 @@ static class ExtendedController extends ControllerWithMethods {
 	}
 
 
+	@RequestMapping("/something")
+	public interface ControllerInterface {
+
+		@RequestMapping("/else")
+		HttpEntity<Void> myMethod(@RequestBody Object payload);
+
+		@RequestMapping("/noarg")
+		HttpEntity<Void> myMethod();
+	}
+
+
 	@RequestMapping("/user/{userId}/contacts")
 	static class UserContactController {