diff --git a/spring-graphql/src/main/java/org/springframework/graphql/server/webflux/GraphQlSseHandler.java b/spring-graphql/src/main/java/org/springframework/graphql/server/webflux/GraphQlSseHandler.java index a71275ef..334b31d9 100644 --- a/spring-graphql/src/main/java/org/springframework/graphql/server/webflux/GraphQlSseHandler.java +++ b/spring-graphql/src/main/java/org/springframework/graphql/server/webflux/GraphQlSseHandler.java @@ -54,7 +54,7 @@ public class GraphQlSseHandler { private static final Log logger = LogFactory.getLog(GraphQlSseHandler.class); - private static final Mono>> COMPLETE_EVENT = Mono.just(ServerSentEvent.>builder().event("complete").build()); + private static final Mono>> COMPLETE_EVENT = Mono.just(ServerSentEvent.>builder(Collections.emptyMap()).event("complete").build()); private final WebGraphQlHandler graphQlHandler; diff --git a/spring-graphql/src/main/java/org/springframework/graphql/server/webmvc/GraphQlSseHandler.java b/spring-graphql/src/main/java/org/springframework/graphql/server/webmvc/GraphQlSseHandler.java index 4f51bab5..0f212707 100644 --- a/spring-graphql/src/main/java/org/springframework/graphql/server/webmvc/GraphQlSseHandler.java +++ b/spring-graphql/src/main/java/org/springframework/graphql/server/webmvc/GraphQlSseHandler.java @@ -147,7 +147,7 @@ public class GraphQlSseHandler extends AbstractGraphQlHttpHandler { @Override protected void hookOnComplete() { try { - this.sseBuilder.event("complete").send(); + this.sseBuilder.event("complete").data(""); } catch (IOException exc) { throw new RuntimeException(exc); } diff --git a/spring-graphql/src/test/java/org/springframework/graphql/server/webflux/GraphQlSseHandlerTests.java b/spring-graphql/src/test/java/org/springframework/graphql/server/webflux/GraphQlSseHandlerTests.java index 2d2f9792..5dd90a3e 100644 --- a/spring-graphql/src/test/java/org/springframework/graphql/server/webflux/GraphQlSseHandlerTests.java +++ b/spring-graphql/src/test/java/org/springframework/graphql/server/webflux/GraphQlSseHandlerTests.java @@ -76,6 +76,7 @@ class GraphQlSseHandlerTests { data:{"errors":[{"message":"SSE transport only supports Subscription operations","locations":[],"extensions":{"classification":"OperationNotSupported"}}]} event:complete + data:{} """); } @@ -96,7 +97,8 @@ class GraphQlSseHandlerTests { data:{"data":{"bookSearch":{"id":"5","name":"Animal Farm"}}} event:complete - + data:{} + """); } @@ -118,6 +120,7 @@ class GraphQlSseHandlerTests { data:{"errors":[{"message":"Subscription error","locations":[],"extensions":{"classification":"INTERNAL_ERROR"}}]} event:complete + data:{} """); } diff --git a/spring-graphql/src/test/java/org/springframework/graphql/server/webmvc/GraphQlSseHandlerTests.java b/spring-graphql/src/test/java/org/springframework/graphql/server/webmvc/GraphQlSseHandlerTests.java index d219aede..e0db8f58 100644 --- a/spring-graphql/src/test/java/org/springframework/graphql/server/webmvc/GraphQlSseHandlerTests.java +++ b/spring-graphql/src/test/java/org/springframework/graphql/server/webmvc/GraphQlSseHandlerTests.java @@ -71,6 +71,7 @@ class GraphQlSseHandlerTests { data:{"errors":[{"message":"SSE transport only supports Subscription operations","locations":[],"extensions":{"classification":"OperationNotSupported"}}]} event:complete + data: """); } @@ -95,7 +96,8 @@ class GraphQlSseHandlerTests { data:{"data":{"bookSearch":{"id":"5","name":"Animal Farm"}}} event:complete - + data: + """); } @@ -121,7 +123,8 @@ class GraphQlSseHandlerTests { data:{"errors":[{"message":"Subscription error","locations":[],"extensions":{"classification":"INTERNAL_ERROR"}}]} event:complete - + data: + """); }