From 81f1edbaf2e169c4b50c2923db1b6b2a4f435e9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Deleuze?= Date: Fri, 23 Jun 2023 14:07:14 +0200 Subject: [PATCH] Change InvocableHandlerMethod#invokeSuspendingFunction return type This commits changes the return type from Publisher to Object in order to avoid potential compatibility issues when the Reactive Streams dependency is not in the classpath. Closes gh-30716 --- .../web/method/support/InvocableHandlerMethod.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/spring-web/src/main/java/org/springframework/web/method/support/InvocableHandlerMethod.java b/spring-web/src/main/java/org/springframework/web/method/support/InvocableHandlerMethod.java index 99e7ea079ce..b2e2755a182 100644 --- a/spring-web/src/main/java/org/springframework/web/method/support/InvocableHandlerMethod.java +++ b/spring-web/src/main/java/org/springframework/web/method/support/InvocableHandlerMethod.java @@ -20,8 +20,6 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.Arrays; -import org.reactivestreams.Publisher; - import org.springframework.context.MessageSource; import org.springframework.core.CoroutinesUtils; import org.springframework.core.DefaultParameterNameDiscoverer; @@ -240,7 +238,7 @@ public class InvocableHandlerMethod extends HandlerMethod { * instead. * @since 6.0 */ - protected Publisher invokeSuspendingFunction(Method method, Object target, Object[] args) { + protected Object invokeSuspendingFunction(Method method, Object target, Object[] args) { return CoroutinesUtils.invokeSuspendingFunction(method, target, args); }