8000 Propagate GraphQLContext when completing fields - fix missing ConditionalNodesDecision issue by dondonz · Pull Request #3411 · graphql-java/graphql-java · GitHub
[go: up one dir, main page]
Skip to content

Propagate GraphQLContext when completing fields - fix missing ConditionalNodesDecision issue #3411

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

Merged
dondonz merged 3 commits into from
Jan 23, 2024
+29 −1
Merged

Propagate GraphQLContext when completing fields - fix missing ConditionalNodesDecision issue #3411

8000
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
02374cf
Reproduce problem with test
dondonz Jan 9, 2024
ed03992
Propagate GraphQLContext when completing values
dondonz Jan 9, 2024
58ff3a7
Tidy up
dondonz Jan 9, 2024
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
1 change: 1 addition & 0 deletions src/main/java/graphql/execution/ExecutionStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -683,6 +683,7 @@ protected CompletableFuture<ExecutionResult> completeValueForObject(ExecutionCon
.objectType(resolvedObjectType)
.fragments(executionContext.getFragmentsByName())
.variables(executionContext.getCoercedVariables().toMap())
.graphQLContext(executionContext.getGraphQLContext())
.build();

MergedSelectionSet subFields = fieldCollector.collectFields(collectorParameters, parameters.getField());
Expand Down
29 changes: 28 additions & 1 deletion src/test/groovy/graphql/execution/ConditionalNodesTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,18 @@ class ConditionalNodesTest extends Specification {
type Query {
in : String
out : String
pet : Pet
}

type Pet {
name: String
favouriteSnack: String
}
"""
DataFetcher df = { DataFetchingEnvironment env -> env.getFieldDefinition().name }
def graphQL = TestUtil.graphQL(sdl, [Query: ["in": df, "out": df]]).build()
def graphQL = TestUtil.graphQL(sdl, [
Query: ["in": df, "out": df, "pet": (DataFetcher<Map>) { [ : ] } ],
Pet: ["name": df, "favouriteSnack": df]]).build()
ConditionalNodeDecision customDecision = new ConditionalNodeDecision() {
@Override
boolean shouldInclude(ConditionalNodeDecisionEnvironment env) {
Expand Down Expand Up @@ -183,6 +191,25 @@ class ConditionalNodesTest extends Specification {

then:
er["data"] == ["in": "in", "out": "out"]

// A test for fields below the top level
when:
ei = ExecutionInput.newExecutionInput()
.graphQLContext(contextMap)
.query("""
query q {
in
pet {
name
favouriteSnack @featureFlag(flagName : "OFF")
}
}
"""
).build()
er = graphQL.execute(ei)

then:
er["data"] == ["in": "in", "pet": ["name": "name"]]
}

private ArrayList<Directive> directive(String name, Argument argument) {
Expand Down
0