Skip to content

Commit adcd3f7

Browse files
guidorotabbakerman
authored andcommitted
Add root field to subscription results
See #844 This commit adds the root field to subscription results to conform to the current version of the GraphQL specification.
1 parent 53bdc11 commit adcd3f7

2 files changed

Lines changed: 19 additions & 9 deletions

File tree

‎src/main/java/graphql/execution/SubscriptionExecutionStrategy.java‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import java.util.concurrent.CompletableFuture;
1313

1414
import static graphql.Assert.assertTrue;
15+
import static java.util.Collections.singletonMap;
1516

1617
/**
1718
* An execution strategy that implements graphql subscriptions by using reactive-streams
@@ -97,7 +98,16 @@ private CompletableFuture<ExecutionResult> executeSubscriptionEvent(ExecutionCon
9798

9899
ExecutionStrategyParameters newParameters = firstFieldOfSubscriptionSelection(parameters);
99100

100-
return completeField(newExecutionContext, newParameters, eventPayload);
101+
return completeField(newExecutionContext, newParameters, eventPayload)
102+
.thenApply(executionResult -> wrapWithRootFieldName(newParameters, executionResult));
103+
}
104+
105+
private ExecutionResult wrapWithRootFieldName(ExecutionStrategyParameters parameters, ExecutionResult executionResult) {
106+
String rootFieldName = parameters.field().get(0).getName();
107+
return new ExecutionResultImpl(
108+
singletonMap(rootFieldName, executionResult.getData()),
109+
executionResult.getErrors()
110+
);
101111
}
102112

103113
private ExecutionStrategyParameters firstFieldOfSubscriptionSelection(ExecutionStrategyParameters parameters) {

‎src/test/groovy/graphql/execution/SubscriptionExecutionStrategyTest.groovy‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ class SubscriptionExecutionStrategyTest extends Specification {
8888
messages.size() == 10
8989
for (int i = 0; i < messages.size(); i++) {
9090
def message = messages[i].data
91-
message == [sender: "sender" + i, text: "text" + i]
91+
assert message == ["newMessage": [sender: "sender" + i, text: "text" + i]]
9292
}
9393

9494
where:
@@ -227,7 +227,7 @@ class SubscriptionExecutionStrategyTest extends Specification {
227227
messages.size() == 5
228228
for (int i = 0; i < messages.size(); i++) {
229229
def message = messages[i].data
230-
message == [sender: "sender" + i, text: "text" + i]
230+
assert message == ["newMessage": [sender: "sender" + i, text: "text" + i]]
231231
}
232232

233233
capturingSubscriber.getThrowable().getMessage() == "Bang!"
@@ -282,14 +282,14 @@ class SubscriptionExecutionStrategyTest extends Specification {
282282
def message = messages[i]
283283
if (i == 5) {
284284
message.data == null
285-
message.errors.size() == 2
286-
message.errors[0].errorType == ErrorType.DataFetchingException
287-
message.errors[0].message == "Cannot return null for non-nullable type: 'String' within parent 'Message' (/newMessage/sender)"
285+
assert message.errors.size() == 2
286+
assert message.errors[0].errorType == ErrorType.DataFetchingException
287+
assert message.errors[0].message == "Cannot return null for non-nullable type: 'String' within parent 'Message' (/newMessage/sender)"
288288

289-
message.errors[1].errorType == ErrorType.DataFetchingException
290-
message.errors[1].message == "Cannot return null for non-nullable type: 'String' within parent 'Message' (/newMessage/text)"
289+
assert message.errors[1].errorType == ErrorType.DataFetchingException
290+
assert message.errors[1].message == "Cannot return null for non-nullable type: 'String' within parent 'Message' (/newMessage/text)"
291291
} else {
292-
message.data == [sender: "sender" + i, text: "text" + i]
292+
assert message.data == ["newMessage": [sender: "sender" + i, text: "text" + i]]
293293
}
294294
}
295295
}

0 commit comments

Comments
 (0)