root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Polish "Allow for CoroutineContext in invokeSuspendingFunction" 

See gh-27193
This commit is contained in:
Arjen Poutsma 2022-09-27 13:26:49 +02:00
parent ff844ed99f
commit d516667f37
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
spring-web/src/main/java/org/springframework/web/method/support/InvocableHandlerMethod.java
View File

@ -20,10 +20,9 @@ import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.Arrays; import java.util.Arrays;
import org.springframework.context.MessageSource;
import org.jetbrains.annotations.NotNull;
import org.reactivestreams.Publisher; import org.reactivestreams.Publisher;
import org.springframework.context.MessageSource;
import org.springframework.core.CoroutinesUtils; import org.springframework.core.CoroutinesUtils;
import org.springframework.core.DefaultParameterNameDiscoverer; import org.springframework.core.DefaultParameterNameDiscoverer;
import org.springframework.core.KotlinDetector; import org.springframework.core.KotlinDetector;
@ -203,7 +202,7 @@ public class InvocableHandlerMethod extends HandlerMethod {
Method method = getBridgedMethod(); Method method = getBridgedMethod();
try { try {
if (KotlinDetector.isSuspendingFunction(method)) { if (KotlinDetector.isSuspendingFunction(method)) {
return invokeSuspendingFunction(method, args); return invokeSuspendingFunction(method, getBean(), args);
} }
return method.invoke(getBean(), args); return method.invoke(getBean(), args);
} }
@ -232,11 +231,17 @@ public class InvocableHandlerMethod extends HandlerMethod {
} }
/** /**
* Invokes Kotlin coroutine suspended function. * Invoke the given Kotlin coroutine suspended function.
*
* <p>The default implementation invokes
* {@link CoroutinesUtils#invokeSuspendingFunction(Method, Object, Object...)},
* but subclasses can override this method to use
* {@link CoroutinesUtils#invokeSuspendingFunction(kotlin.coroutines.CoroutineContext, Method, Object, Object...)}
* instead.
* @since 6.0
*/ */
@NotNull protected Publisher<?> invokeSuspendingFunction(Method method, Object target, Object[] args) {
protected Publisher<?> invokeSuspendingFunction(Method method, Object[] args) { return CoroutinesUtils.invokeSuspendingFunction(method, target, args);
return CoroutinesUtils.invokeSuspendingFunction(method, getBean(), args);
} }
} }