Spring/spring-graphql
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to GraphQL Java 22 test version

Browse Source 
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
This commit is contained in:
Brian Clozel
2024-03-21 15:19:47 +01:00
parent 3da533d245
commit 2f9840376e
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -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"
}

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

@@ -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));

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

@@ -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;