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

Align future handling with AsyncServerResponse

Browse Source 
See gh-959
This commit is contained in:
rstoyanchev
2024-04-25 12:33:56 +01:00
parent 21a7c81062
commit f61dfc56fe
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-graphql/src/main/java/org/springframework/graphql/server/webmvc/GraphQlHttpHandler.java
View File

@@ -21,7 +21,6 @@ import java.util.Map;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
import jakarta.servlet.ServletException;
import reactor.core.publisher.Mono;
import org.springframework.graphql.server.WebGraphQlHandler;
@@ -70,8 +69,7 @@ public class GraphQlHttpHandler extends AbstractGraphQlHttpHandler {
@Override
protected ServerResponse prepareResponse(ServerRequest request, Mono<WebGraphQlResponse> responseMono)
throws ServletException {
protected ServerResponse prepareResponse(ServerRequest request, Mono<WebGraphQlResponse> responseMono) {
CompletableFuture<ServerResponse> future = responseMono.map((response) -> {
MediaType contentType = selectResponseMediaType(request);
@@ -87,15 +85,15 @@ public class GraphQlHttpHandler extends AbstractGraphQlHttpHandler {
}
}).toFuture();
if (future.isDone()) {
// This won't be needed with a Spring Framework 6.2 baseline:
// https://github.com/spring-projects/spring-framework/issues/32223
if (future.isDone() && !future.isCancelled() && !future.isCompletedExceptionally()) {
try {
return future.get();
}
catch (ExecutionException ex) {
throw new ServletException(ex.getCause());
}
catch (InterruptedException ex) {
throw new ServletException(ex);
catch (InterruptedException | ExecutionException ignored) {
// fall through to use DefaultAsyncServerResponse
}
}