Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support suspending functions returning Unit in WebFlux

Browse Source 
Closes gh-27629
This commit is contained in:
Sébastien Deleuze
2022-11-13 18:53:55 +01:00
parent 3ff308403a
commit b766a49a4d
2 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
spring-webflux/src/main/java/org/springframework/web/reactive/result/method/InvocableHandlerMethod.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2021 the original author or authors.
* Copyright 2002-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -129,15 +129,16 @@ public class InvocableHandlerMethod extends HandlerMethod {
* @param providedArgs optional list of argument values to match by type
* @return a Mono with a {@link HandlerResult}
*/
@SuppressWarnings("KotlinInternalInJava")
@SuppressWarnings({"KotlinInternalInJava", "unchecked"})
public Mono<HandlerResult> invoke(
ServerWebExchange exchange, BindingContext bindingContext, Object... providedArgs) {
return getMethodArgumentValues(exchange, bindingContext, providedArgs).flatMap(args -> {
Object value;
Method method = getBridgedMethod();
boolean isSuspendingFunction = KotlinDetector.isSuspendingFunction(method);
try {
Method method = getBridgedMethod();
if (KotlinDetector.isSuspendingFunction(method)) {
if (isSuspendingFunction) {
value = CoroutinesUtils.invokeSuspendingFunction(method, getBean(), args);
}
else {
@@ -163,10 +164,16 @@ public class InvocableHandlerMethod extends HandlerMethod {
}
MethodParameter returnType = getReturnType();
ReactiveAdapter adapter = this.reactiveAdapterRegistry.getAdapter(returnType.getParameterType());
boolean asyncVoid = isAsyncVoidReturnType(returnType, adapter);
if ((value == null || asyncVoid) && isResponseHandled(args, exchange)) {
return (asyncVoid ? Mono.from(adapter.toPublisher(value)) : Mono.empty());
if (isResponseHandled(args, exchange)) {
Class<?> parameterType = returnType.getParameterType();
ReactiveAdapter adapter = this.reactiveAdapterRegistry.getAdapter(parameterType);
boolean asyncVoid = isAsyncVoidReturnType(returnType, adapter);
if (value == null || asyncVoid) {
return (asyncVoid ? Mono.from(adapter.toPublisher(value)) : Mono.empty());
}
if (isSuspendingFunction && parameterType == void.class) {
return (Mono<HandlerResult>) value;
}
}
HandlerResult result = new HandlerResult(this, value, returnType, bindingContext);