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

Support coroutine @GraphQlExceptionHandler methods

Browse Source 
Closes gh-750
This commit is contained in:
rstoyanchev
2023-07-18 12:17:58 +01:00
parent fdb7051ae3
commit 74e8c60b4e
1 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
spring-graphql/src/main/java/org/springframework/graphql/data/method/annotation/support/AnnotatedControllerExceptionResolver.java
View File

@@ -33,6 +33,7 @@ import reactor.core.publisher.Mono;
import org.springframework.context.ApplicationContext;
import org.springframework.core.ExceptionDepthComparator;
import org.springframework.core.KotlinDetector;
import org.springframework.core.MethodIntrospector;
import org.springframework.core.MethodParameter;
import org.springframework.core.annotation.AnnotatedElementUtils;
@@ -370,7 +371,11 @@ final class AnnotatedControllerExceptionResolver {
*/
static ReturnValueAdapter createFor(MethodParameter returnType) {
Class<?> parameterType = returnType.getParameterType();
if (parameterType == void.class) {
Method method = returnType.getMethod();
if (method != null && KotlinDetector.isSuspendingFunction(method)) {
return createForMono(returnType);
}
else if (parameterType == void.class) {
return forVoid;
}
else if (parameterType.equals(GraphQLError.class)) {
@@ -382,18 +387,7 @@ final class AnnotatedControllerExceptionResolver {
}
}
else if (Mono.class.isAssignableFrom(parameterType)) {
returnType = returnType.nested();
Class<?> nestedType = returnType.getNestedParameterType();
if (nestedType == Void.class) {
return forMonoVoid;
}
if (Collection.class.isAssignableFrom(nestedType)) {
returnType = returnType.nested();
nestedType = returnType.getNestedParameterType();
}
if (nestedType.equals(GraphQLError.class) || nestedType.equals(Object.class)) {
return forMono;
}
return createForMono(returnType.nested());
}
else if (parameterType.equals(Object.class)) {
return forObject;
@@ -402,6 +396,23 @@ final class AnnotatedControllerExceptionResolver {
"Invalid return type for @GraphQlExceptionHandler method: " + returnType);
}
private static ReturnValueAdapter createForMono(MethodParameter returnType) {
Class<?> nestedType = returnType.getNestedParameterType();
if (nestedType == Void.class) {
return forMonoVoid;
}
if (Collection.class.isAssignableFrom(nestedType)) {
returnType = returnType.nested();
nestedType = returnType.getNestedParameterType();
}
if (nestedType.equals(GraphQLError.class) || nestedType.equals(Object.class)) {
return forMono;
}
throw new IllegalStateException(
"Invalid return type for @GraphQlExceptionHandler method: " + returnType);
}
/** Adapter for void */
ReturnValueAdapter forVoid = (result, returnType, ex) -> Mono.just(Collections.emptyList());