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

Polishing contribution

Browse Source 
Closes gh-653
This commit is contained in:
rstoyanchev
2023-09-14 15:01:35 +01:00
parent e7d72534e7
commit ab392461ab
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
spring-graphql/src/main/java/org/springframework/graphql/data/method/InvocableHandlerMethodSupport.java
View File

@@ -26,11 +26,11 @@ import java.util.concurrent.Executor;
import graphql.GraphQLContext;
import io.micrometer.context.ContextSnapshot;
import org.springframework.data.util.KotlinReflectionUtils;
import reactor.core.publisher.Mono;
import org.springframework.core.CoroutinesUtils;
import org.springframework.core.KotlinDetector;
import org.springframework.data.util.KotlinReflectionUtils;
import org.springframework.lang.Nullable;
import org.springframework.util.Assert;
@@ -82,18 +82,7 @@ public abstract class InvocableHandlerMethodSupport extends HandlerMethod {
Method method = getBridgedMethod();
try {
if (KotlinDetector.isSuspendingFunction(method)) {
Object result = CoroutinesUtils.invokeSuspendingFunction(method, getBean(), argValues);
Class<?> returnType = KotlinReflectionUtils.getReturnType(method);
if (CompletableFuture.class.isAssignableFrom(returnType)) {
@SuppressWarnings("unchecked")
Mono<CompletableFuture<?>> mono = (Mono<CompletableFuture<?>>)result;
// Unwrap nested CompletableFuture
return mono.flatMap(Mono::fromFuture);
}
return result;
return invokeSuspendingFunction(getBean(), method, argValues);
}
Object result = method.invoke(getBean(), argValues);
return handleReturnValue(graphQLContext, result);
@@ -119,6 +108,19 @@ public abstract class InvocableHandlerMethodSupport extends HandlerMethod {
}
}
@SuppressWarnings({"ReactiveStreamsUnusedPublisher", "unchecked"})
private static Object invokeSuspendingFunction(Object bean, Method method, Object[] argValues) {
Object result = CoroutinesUtils.invokeSuspendingFunction(method, bean, argValues);
// Support DataLoader use
Class<?> returnType = KotlinReflectionUtils.getReturnType(method);
if (CompletableFuture.class.isAssignableFrom(returnType)) {
return ((Mono<CompletableFuture<?>>) result).flatMap(Mono::fromFuture);
}
return result;
}
@Nullable
@SuppressWarnings("deprecation")
private Object handleReturnValue(GraphQLContext graphQLContext, @Nullable Object result) {