Skip to content

Avoid unnecessary async handling in GraphQlHttpHandler #903

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Avoid unnecessary async handling in GraphQlHttpHandler #903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions ...g-graphql/src/main/java/org/springframework/graphql/server/webmvc/GraphQlHttpHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package org.springframework.graphql.server.webmvc;

import java.io.IOException;
import java.time.Duration;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -106,7 +107,12 @@ public ServerResponse handleRequest(ServerRequest serverRequest) throws ServletE
builder.headers(headers -> headers.putAll(response.getResponseHeaders()));
builder.contentType(selectResponseMediaType(serverRequest));
return builder.body(response.toMap());
});
})
.cache();

try {
return responseMono.block(Duration.ZERO);
} catch (IllegalStateException ignored) {}

return ServerResponse.async(responseMono);
}
Expand Down Expand Up @@ -138,5 +144,4 @@ private static MediaType selectResponseMediaType(ServerRequest serverRequest) {
}
return MediaType.APPLICATION_JSON;
}

}
5 changes: 4 additions & 1 deletion ...phql/src/test/java/org/springframework/graphql/server/webmvc/GraphQlHttpHandlerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,10 @@ private MockHttpServletResponse handleRequest(
MockHttpServletRequest servletRequest, GraphQlHttpHandler handler) throws ServletException, IOException {

ServerRequest request = ServerRequest.create(servletRequest, MESSAGE_READERS);
ServerResponse response = ((AsyncServerResponse) handler.handleRequest(request)).block();
ServerResponse response = handler.handleRequest(request);
if (response instanceof AsyncServerResponse asyncServerResponse) {
asyncServerResponse.block();
}

MockHttpServletResponse servletResponse = new MockHttpServletResponse();
response.writeTo(servletRequest, servletResponse, new DefaultContext());
Expand Down