Skip to content

make dataloader work inside defer blocks #3980

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
andimarek merged 15 commits into from
May 26, 2025
Merged

make dataloader work inside defer blocks #3980

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
15f6952
make dataloader work inside defer blocks
andimarek May 22, 2025
da6886a
green tests
andimarek May 22, 2025
018248a
update gradle wrapper validation
andimarek May 22, 2025
9aaa118
update gradle wrapper validation
andimarek May 22, 2025
e7e4c36
Merge branch 'master' into defer-dataloader
andimarek May 22, 2025
386ce8f
cleanup
andimarek May 22, 2025
fcf7261
more complex test
andimarek May 23, 2025
17911d3
cleanup
andimarek May 23, 2025
5c64ad4
cleanup and docs
andimarek May 23, 2025
c8f4362
cleanup
andimarek May 23, 2025
e0181e3
testing
andimarek May 23, 2025
f345f14
cleanup
andimarek May 23, 2025
c12be77
cleanup
andimarek May 23, 2025
aa206d7
cleanup
andimarek May 23, 2025
a7cc794
PR feedback
andimarek May 26, 2025
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
Prev Previous commit
Next Next commit
cleanup
  • Loading branch information
@andimarek
andimarek committed May 23, 2025
commit c12be775723a6f73d04cc0effb295127e9ae0f31
3 changes: 2 additions & 1 deletion src/main/java/graphql/execution/incremental/DeferredCallContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ public class DeferredCallContext {
private final int startLevel;
private final int fields;

private final List<GraphQLError> errors = new CopyOnWriteArrayList<>();

public DeferredCallContext(int startLevel, int fields) {
this.startLevel = startLevel;
this.fields = fields;
Expand All @@ -41,7 +43,6 @@ public int getFields() {
return fields;
}

private final List<GraphQLError> errors = new CopyOnWriteArrayList<>();

public void addErrors(List<GraphQLError> errors) {
this.errors.addAll(errors);
Expand Down
5 changes: 1 addition & 4 deletions src/main/java/graphql/schema/DataFetchingEnvironmentImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,10 +106,7 @@ public static Builder newDataFetchingEnvironment(ExecutionContext executionConte
.operationDefinition(executionContext.getOperationDefinition())
.variables(executionContext.getCoercedVariables().toMap())
.executionId(executionContext.getExecutionId())
.dataLoaderDispatchStrategy(executionContext.getDataLoaderDispatcherStrategy())
;


.dataLoaderDispatchStrategy(executionContext.getDataLoaderDispatcherStrategy());
}

@Override
Expand Down