diff --git a/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/ResolvableMethod.java b/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/ResolvableMethod.java index e32352679b3..31df4ee8cc6 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/ResolvableMethod.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/ResolvableMethod.java @@ -613,11 +613,12 @@ public class ResolvableMethod { private static class MethodInvocationInterceptor implements MethodInterceptor, InvocationHandler { + @Nullable private Method invokedMethod; @Override @Nullable - public Object intercept(Object object, Method method, Object[] args, MethodProxy proxy) { + public Object intercept(Object object, Method method, @Nullable Object[] args, @Nullable MethodProxy proxy) { if (ReflectionUtils.isObjectMethod(method)) { return ReflectionUtils.invokeMethod(method, object, args); } @@ -629,10 +630,11 @@ public class ResolvableMethod { @Override @Nullable - public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { + public Object invoke(Object proxy, Method method, @Nullable Object[] args) { return intercept(proxy, method, args, null); } + @Nullable Method getInvokedMethod() { return this.invokedMethod; } diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/method/ResolvableMethod.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/method/ResolvableMethod.java index cb6d34f3e77..abd6b2c0510 100644 --- a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/method/ResolvableMethod.java +++ b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/method/ResolvableMethod.java @@ -617,11 +617,12 @@ public class ResolvableMethod { private static class MethodInvocationInterceptor implements MethodInterceptor, InvocationHandler { + @Nullable private Method invokedMethod; @Override @Nullable - public Object intercept(Object object, Method method, Object[] args, MethodProxy proxy) { + public Object intercept(Object object, Method method, @Nullable Object[] args, @Nullable MethodProxy proxy) { if (ReflectionUtils.isObjectMethod(method)) { return ReflectionUtils.invokeMethod(method, object, args); } @@ -633,10 +634,11 @@ public class ResolvableMethod { @Override @Nullable - public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { + public Object invoke(Object proxy, Method method, @Nullable Object[] args) { return intercept(proxy, method, args, null); } + @Nullable Method getInvokedMethod() { return this.invokedMethod; }