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

Polishing in GraphQlSseHandler

Browse Source 
See gh-1067
This commit is contained in:
rstoyanchev
2024-10-18 11:49:54 +01:00
parent 3ea216c2d4
commit c784612090
1 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
spring-graphql/src/main/java/org/springframework/graphql/server/webmvc/GraphQlSseHandler.java
View File

@@ -31,8 +31,6 @@ import reactor.core.publisher.Mono;
import org.springframework.graphql.execution.SubscriptionPublisherException;
import org.springframework.graphql.server.WebGraphQlHandler;
import org.springframework.graphql.server.WebGraphQlResponse;
import org.springframework.util.AlternativeJdkIdGenerator;
import org.springframework.util.IdGenerator;
import org.springframework.web.context.request.async.AsyncRequestTimeoutException;
import org.springframework.web.servlet.function.ServerRequest;
import org.springframework.web.servlet.function.ServerResponse;
@@ -49,9 +47,6 @@ import org.springframework.web.servlet.function.ServerResponse;
*/
public class GraphQlSseHandler extends AbstractGraphQlHttpHandler {
private final IdGenerator idGenerator = new AlternativeJdkIdGenerator();
public GraphQlSseHandler(WebGraphQlHandler graphQlHandler) {
super(graphQlHandler, null);
}
@@ -94,12 +89,7 @@ public class GraphQlSseHandler extends AbstractGraphQlHttpHandler {
private SseSubscriber(ServerResponse.SseBuilder sseBuilder) {
this.sseBuilder = sseBuilder;
this.sseBuilder.onTimeout(this::onTimeout);
}
private void onTimeout() {
this.cancel();
this.sseBuilder.error(new AsyncRequestTimeoutException());
this.sseBuilder.onTimeout(() -> cancelWithError(new AsyncRequestTimeoutException()));
}
@Override
@@ -113,11 +103,15 @@ public class GraphQlSseHandler extends AbstractGraphQlHttpHandler {
this.sseBuilder.data(value);
}
catch (IOException exception) {
cancel();
hookOnError(exception);
cancelWithError(exception);
}
}
private void cancelWithError(Throwable ex) {
this.cancel();
this.sseBuilder.error(ex);
}
@Override
protected void hookOnError(Throwable ex) {
if (ex instanceof SubscriptionPublisherException spe) {