Skip to content

Commit 2f98403

Browse files
committed
Upgrade to GraphQL Java 22 test version
This commit upgrades GraphQL Java to "0.0.0-2024-03-20T00-25-33-974c165", a test version for the upcoming 22.0 release. See gh-932
1 parent 3da533d commit 2f98403

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description = "Spring for GraphQL"
33
ext {
44
moduleProjects = [project(":spring-graphql"), project(":spring-graphql-test")]
55
springFrameworkVersion = "6.1.4"
6-
graphQlJavaVersion = "21.3"
6+
graphQlJavaVersion = "0.0.0-2024-03-20T00-25-33-974c165"
77
springBootVersion = "3.2.2"
88
}
99

spring-graphql/src/main/java/org/springframework/graphql/execution/DefaultExecutionGraphQlService.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import graphql.GraphQL;
2525
import graphql.GraphQLContext;
2626
import graphql.execution.ExecutionIdProvider;
27-
import graphql.execution.instrumentation.dataloader.DataLoaderDispatcherInstrumentationState;
27+
import graphql.execution.instrumentation.dataloader.EmptyDataLoaderRegistryInstance;
2828
import io.micrometer.context.ContextSnapshotFactory;
2929
import org.dataloader.DataLoaderRegistry;
3030
import reactor.core.publisher.Mono;
@@ -90,7 +90,6 @@ public final Mono<ExecutionGraphQlResponse> execute(ExecutionGraphQlRequest requ
9090

9191
ExecutionInput executionInput = request.toExecutionInput();
9292

93-
GraphQLContext graphQLContext = executionInput.getGraphQLContext();
9493
snapshotFactory.captureFrom(contextView).updateContext(executionInput.getGraphQLContext());
9594

9695
ExecutionInput updatedExecutionInput =
@@ -104,7 +103,7 @@ public final Mono<ExecutionGraphQlResponse> execute(ExecutionGraphQlRequest requ
104103
private ExecutionInput registerDataLoaders(ExecutionInput executionInput) {
105104
GraphQLContext graphQLContext = executionInput.getGraphQLContext();
106105
DataLoaderRegistry existingRegistry = executionInput.getDataLoaderRegistry();
107-
if (existingRegistry == DataLoaderDispatcherInstrumentationState.EMPTY_DATALOADER_REGISTRY) {
106+
if (existingRegistry == EmptyDataLoaderRegistryInstance.EMPTY_DATALOADER_REGISTRY) {
108107
DataLoaderRegistry newRegistry = DataLoaderRegistry.newRegistry().build();
109108
applyDataLoaderRegistrars(newRegistry, graphQLContext);
110109
executionInput = executionInput.transform(builder -> builder.dataLoaderRegistry(newRegistry));

spring-graphql/src/main/java/org/springframework/graphql/support/DefaultExecutionGraphQlResponse.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2023 the original author or authors.
2+
* Copyright 2002-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -161,7 +161,7 @@ public static abstract class Builder<B extends Builder<B, R>, R extends Executio
161161

162162
private final R original;
163163

164-
private final ExecutionResultImpl.Builder executionResultBuilder;
164+
private final ExecutionResultImpl.Builder<?> executionResultBuilder;
165165

166166
protected Builder(R original) {
167167
this.original = original;

0 commit comments

Comments
 (0)