diff --git a/build.gradle b/build.gradle index 56eaffd3..1aa0ac42 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ description = "Spring for GraphQL" ext { moduleProjects = [project(":spring-graphql"), project(":spring-graphql-test")] springFrameworkVersion = "6.1.4" - graphQlJavaVersion = "21.3" + graphQlJavaVersion = "0.0.0-2024-03-20T00-25-33-974c165" springBootVersion = "3.2.2" } diff --git a/spring-graphql/src/main/java/org/springframework/graphql/execution/DefaultExecutionGraphQlService.java b/spring-graphql/src/main/java/org/springframework/graphql/execution/DefaultExecutionGraphQlService.java index 82d1d39f..49dd8568 100644 --- a/spring-graphql/src/main/java/org/springframework/graphql/execution/DefaultExecutionGraphQlService.java +++ b/spring-graphql/src/main/java/org/springframework/graphql/execution/DefaultExecutionGraphQlService.java @@ -24,7 +24,7 @@ import graphql.ExecutionInput; import graphql.GraphQL; import graphql.GraphQLContext; import graphql.execution.ExecutionIdProvider; -import graphql.execution.instrumentation.dataloader.DataLoaderDispatcherInstrumentationState; +import graphql.execution.instrumentation.dataloader.EmptyDataLoaderRegistryInstance; import io.micrometer.context.ContextSnapshotFactory; import org.dataloader.DataLoaderRegistry; import reactor.core.publisher.Mono; @@ -90,7 +90,6 @@ public class DefaultExecutionGraphQlService implements ExecutionGraphQlService { ExecutionInput executionInput = request.toExecutionInput(); - GraphQLContext graphQLContext = executionInput.getGraphQLContext(); snapshotFactory.captureFrom(contextView).updateContext(executionInput.getGraphQLContext()); ExecutionInput updatedExecutionInput = @@ -104,7 +103,7 @@ public class DefaultExecutionGraphQlService implements ExecutionGraphQlService { private ExecutionInput registerDataLoaders(ExecutionInput executionInput) { GraphQLContext graphQLContext = executionInput.getGraphQLContext(); DataLoaderRegistry existingRegistry = executionInput.getDataLoaderRegistry(); - if (existingRegistry == DataLoaderDispatcherInstrumentationState.EMPTY_DATALOADER_REGISTRY) { + if (existingRegistry == EmptyDataLoaderRegistryInstance.EMPTY_DATALOADER_REGISTRY) { DataLoaderRegistry newRegistry = DataLoaderRegistry.newRegistry().build(); applyDataLoaderRegistrars(newRegistry, graphQLContext); executionInput = executionInput.transform(builder -> builder.dataLoaderRegistry(newRegistry)); diff --git a/spring-graphql/src/main/java/org/springframework/graphql/support/DefaultExecutionGraphQlResponse.java b/spring-graphql/src/main/java/org/springframework/graphql/support/DefaultExecutionGraphQlResponse.java index addb7909..afe8f3e8 100644 --- a/spring-graphql/src/main/java/org/springframework/graphql/support/DefaultExecutionGraphQlResponse.java +++ b/spring-graphql/src/main/java/org/springframework/graphql/support/DefaultExecutionGraphQlResponse.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2023 the original author or authors. + * Copyright 2002-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -161,7 +161,7 @@ public class DefaultExecutionGraphQlResponse extends AbstractGraphQlResponse imp private final R original; - private final ExecutionResultImpl.Builder executionResultBuilder; + private final ExecutionResultImpl.Builder executionResultBuilder; protected Builder(R original) { this.original = original;