Forward compatibility with GraphQL Java 21

Closes gh-974
spring-projects · May 20, 2024 · 6d9a8a2 · 6d9a8a2
1 parent 33bdea9
commit 6d9a8a2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git 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.0.18"
-	graphQlJavaVersion = "20.9"
+	graphQlJavaVersion = "21.5"
 	springBootVersion = "3.1.5"
 }
 

diff --git a/...src/main/java/org/springframework/graphql/data/pagination/ConnectionFieldTypeVisitor.java b/...src/main/java/org/springframework/graphql/data/pagination/ConnectionFieldTypeVisitor.java
@@ -32,6 +32,7 @@
 import graphql.relay.Edge;
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
+import graphql.schema.FieldCoordinates;
 import graphql.schema.GraphQLCodeRegistry;
 import graphql.schema.GraphQLFieldDefinition;
 import graphql.schema.GraphQLFieldsContainer;
@@ -85,7 +86,8 @@ public TraversalControl visitGraphQLFieldDefinition(
 		GraphQLCodeRegistry.Builder codeRegistry = context.getVarFromParents(GraphQLCodeRegistry.Builder.class);
 
 		GraphQLFieldsContainer parent = (GraphQLFieldsContainer) context.getParentNode();
-		DataFetcher<?> dataFetcher = codeRegistry.getDataFetcher(parent, fieldDefinition);
+		FieldCoordinates fieldCoordinates = FieldCoordinates.coordinates(parent, fieldDefinition);
+		DataFetcher<?> dataFetcher = codeRegistry.getDataFetcher(fieldCoordinates, fieldDefinition);
 
 		if (visitorHelper != null && isUnderSubscriptionOperation(visitorHelper, context)) {
 			return TraversalControl.CONTINUE;
@@ -101,7 +103,7 @@ public TraversalControl visitGraphQLFieldDefinition(
 			}
 			else {
 				dataFetcher = new ConnectionDataFetcher(dataFetcher, this.adapter);
-				codeRegistry.dataFetcher(parent, fieldDefinition, dataFetcher);
+				codeRegistry.dataFetcher(fieldCoordinates, dataFetcher);
 			}
 		}
 

diff --git a/...phql/src/main/java/org/springframework/graphql/execution/ContextDataFetcherDecorator.java b/...phql/src/main/java/org/springframework/graphql/execution/ContextDataFetcherDecorator.java
@@ -22,6 +22,7 @@
 import graphql.GraphQLContext;
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
+import graphql.schema.FieldCoordinates;
 import graphql.schema.GraphQLCodeRegistry;
 import graphql.schema.GraphQLFieldDefinition;
 import graphql.schema.GraphQLFieldsContainer;
@@ -139,12 +140,13 @@ public TraversalControl visitGraphQLFieldDefinition(
 			GraphQLCodeRegistry.Builder codeRegistry = context.getVarFromParents(GraphQLCodeRegistry.Builder.class);
 
 			GraphQLFieldsContainer parent = (GraphQLFieldsContainer) context.getParentNode();
-			DataFetcher<?> dataFetcher = codeRegistry.getDataFetcher(parent, fieldDefinition);
+			FieldCoordinates fieldCoordinates = FieldCoordinates.coordinates(parent, fieldDefinition);
+			DataFetcher<?> dataFetcher = codeRegistry.getDataFetcher(fieldCoordinates, fieldDefinition);
 
 			if (applyDecorator(dataFetcher)) {
 				boolean handlesSubscription = visitorHelper.isSubscriptionType(parent);
 				dataFetcher = new ContextDataFetcherDecorator(dataFetcher, handlesSubscription, this.exceptionResolver);
-				codeRegistry.dataFetcher(parent, fieldDefinition, dataFetcher);
+				codeRegistry.dataFetcher(fieldCoordinates, dataFetcher);
 			}
 
 			return TraversalControl.CONTINUE;