Add "Connection" support method to GraphQlSetup

Author: rstoyanchev

spring-graphql/src/test/java/org/springframework/graphql/data/method/annotation/support/SchemaMappingPaginationTests.java

@@ -32,12 +32,10 @@
 import org.springframework.graphql.ResponseHelper;
 import org.springframework.graphql.TestExecutionRequest;
 import org.springframework.graphql.data.method.annotation.QueryMapping;
-import org.springframework.graphql.data.pagination.ConnectionFieldTypeVisitor;
 import org.springframework.graphql.data.pagination.CursorStrategy;
 import org.springframework.graphql.data.query.ScrollPositionCursorStrategy;
 import org.springframework.graphql.data.query.ScrollSubrange;
 import org.springframework.graphql.data.query.WindowConnectionAdapter;
-import org.springframework.graphql.execution.ConnectionTypeDefinitionConfigurer;
 import org.springframework.stereotype.Controller;
 
 /**
@@ -83,9 +81,9 @@ private ExecutionGraphQlService graphQlService() {
 		configurer.setApplicationContext(context);
 		configurer.afterPropertiesSet();
 
-		GraphQlSetup setup = GraphQlSetup.schemaResource(BookSource.paginationSchema).runtimeWiring(configurer);
-		setup.typeDefinitionConfigurer(new ConnectionTypeDefinitionConfigurer());
-		setup.typeVisitor(ConnectionFieldTypeVisitor.create(List.of(new WindowConnectionAdapter(cursorStrategy))));
+		GraphQlSetup setup = GraphQlSetup.schemaResource(BookSource.paginationSchema)
+				.runtimeWiring(configurer)
+				.connectionSupport(new WindowConnectionAdapter(cursorStrategy));
 
 		return setup.toGraphQlService();
 	}

spring-graphql/src/test/java/org/springframework/graphql/data/pagination/ConnectionFieldTypeVisitorTests.java

@@ -47,8 +47,7 @@ void paginationDataFetcher() {
 
 		Mono<ExecutionGraphQlResponse> response = GraphQlSetup.schemaResource(BookSource.paginationSchema)
 				.dataFetcher("Query", "books", env -> BookSource.books())
-				.typeDefinitionConfigurer(new ConnectionTypeDefinitionConfigurer())
-				.typeVisitor(ConnectionFieldTypeVisitor.create(List.of(adapter)))
+				.connectionSupport(adapter)
 				.toGraphQlService()
 				.execute(TestExecutionRequest.forDocument(BookSource.booksConnectionQuery(null)));
 
@@ -77,8 +76,7 @@ void trivialDataFetcherIsSkipped() {
 
 		Mono<ExecutionGraphQlResponse> response = GraphQlSetup.schemaResource(BookSource.paginationSchema)
 				.dataFetcher("Query", "books", new PropertyDataFetcher<>("books"))
-				.typeDefinitionConfigurer(new ConnectionTypeDefinitionConfigurer())
-				.typeVisitor(ConnectionFieldTypeVisitor.create(List.of(new ListConnectionAdapter())))
+				.connectionSupport(new ListConnectionAdapter())
 				.toGraphQlService()
 				.execute(TestExecutionRequest.forDocument(BookSource.booksConnectionQuery(null)));
 
@@ -90,8 +88,7 @@ void nullValueTreatedAsEmptyConnection() {
 
 		Mono<ExecutionGraphQlResponse> response = GraphQlSetup.schemaResource(BookSource.paginationSchema)
 				.dataFetcher("Query", "books", environment -> null)
-				.typeDefinitionConfigurer(new ConnectionTypeDefinitionConfigurer())
-				.typeVisitor(ConnectionFieldTypeVisitor.create(List.of(new ListConnectionAdapter())))
+				.connectionSupport(new ListConnectionAdapter())
 				.toGraphQlService()
 				.execute(TestExecutionRequest.forDocument(BookSource.booksConnectionQuery(null)));
 

spring-graphql/src/test/java/org/springframework/graphql/data/query/QuerydslDataFetcherTests.java

@@ -363,8 +363,7 @@ private static GraphQlSetup graphQlSetup(@Nullable ReactiveQuerydslPredicateExec
 
 	private static GraphQlSetup paginationSetup(ScrollPositionCursorStrategy cursorStrategy) {
 		return GraphQlSetup.schemaResource(BookSource.paginationSchema)
-				.typeDefinitionConfigurer(new ConnectionTypeDefinitionConfigurer())
-				.typeVisitor(ConnectionFieldTypeVisitor.create(List.of(new WindowConnectionAdapter(cursorStrategy))));
+				.connectionSupport(new WindowConnectionAdapter(cursorStrategy));
 	}
 
 	private static RuntimeWiringConfigurer createRuntimeWiringConfigurer(

spring-graphql/src/test/java/org/springframework/graphql/data/query/jpa/QueryByExampleDataFetcherJpaTests.java

@@ -250,8 +250,7 @@ private static GraphQlSetup graphQlSetup(QueryByExampleExecutor<?> executor) {
 
 	private static GraphQlSetup paginationSetup(ScrollPositionCursorStrategy cursorStrategy) {
 		return GraphQlSetup.schemaResource(BookSource.paginationSchema)
-				.typeDefinitionConfigurer(new ConnectionTypeDefinitionConfigurer())
-				.typeVisitor(ConnectionFieldTypeVisitor.create(List.of(new WindowConnectionAdapter(cursorStrategy))));
+				.connectionSupport(new WindowConnectionAdapter(cursorStrategy));
 	}
 
 	private static RuntimeWiringConfigurer createRuntimeWiringConfigurer(QueryByExampleExecutor<?> executor) {

spring-graphql/src/test/java/org/springframework/graphql/data/query/mongo/QueryByExampleDataFetcherMongoDbTests.java

@@ -228,8 +228,7 @@ private static GraphQlSetup graphQlSetup(@Nullable QueryByExampleExecutor<?> exe
 
 	private static GraphQlSetup paginationSetup(ScrollPositionCursorStrategy cursorStrategy) {
 		return GraphQlSetup.schemaResource(BookSource.paginationSchema)
-				.typeDefinitionConfigurer(new ConnectionTypeDefinitionConfigurer())
-				.typeVisitor(ConnectionFieldTypeVisitor.create(List.of(new WindowConnectionAdapter(cursorStrategy))));
+				.connectionSupport(new WindowConnectionAdapter(cursorStrategy));
 	}
 
 	private static RuntimeWiringConfigurer createRuntimeWiringConfigurer(QueryByExampleExecutor<?> executor) {

spring-graphql/src/test/java/org/springframework/graphql/data/query/mongo/QueryByExampleDataFetcherReactiveMongoDbTests.java

@@ -201,8 +201,7 @@ private static GraphQlSetup graphQlSetup(@Nullable ReactiveQueryByExampleExecuto
 
 	private static GraphQlSetup paginationSetup(ScrollPositionCursorStrategy cursorStrategy) {
 		return GraphQlSetup.schemaResource(BookSource.paginationSchema)
-				.typeDefinitionConfigurer(new ConnectionTypeDefinitionConfigurer())
-				.typeVisitor(ConnectionFieldTypeVisitor.create(List.of(new WindowConnectionAdapter(cursorStrategy))));
+				.connectionSupport(new WindowConnectionAdapter(cursorStrategy));
 	}
 
 	private static RuntimeWiringConfigurer createRuntimeWiringConfigurer(ReactiveQueryByExampleExecutor<?> executor) {

spring-graphql/src/testFixtures/java/org/springframework/graphql/GraphQlSetup.java

@@ -30,6 +30,9 @@
 import org.springframework.core.io.ByteArrayResource;
 import org.springframework.core.io.Resource;
 import org.springframework.graphql.data.method.annotation.support.AnnotatedControllerConfigurer;
+import org.springframework.graphql.data.pagination.ConnectionAdapter;
+import org.springframework.graphql.data.pagination.ConnectionFieldTypeVisitor;
+import org.springframework.graphql.execution.ConnectionTypeDefinitionConfigurer;
 import org.springframework.graphql.execution.DataFetcherExceptionResolver;
 import org.springframework.graphql.execution.DataLoaderRegistrar;
 import org.springframework.graphql.execution.DefaultExecutionGraphQlService;
@@ -98,6 +101,12 @@ public GraphQlSetup runtimeWiringForAnnotatedControllers(ApplicationContext cont
 		return runtimeWiring(configurer);
 	}
 
+	public GraphQlSetup connectionSupport(ConnectionAdapter connectionAdapter) {
+		typeDefinitionConfigurer(new ConnectionTypeDefinitionConfigurer());
+		typeVisitor(ConnectionFieldTypeVisitor.create(List.of(connectionAdapter)));
+		return this;
+	}
+
 	public GraphQlSetup exceptionResolver(DataFetcherExceptionResolver... resolvers) {
 		this.graphQlSourceBuilder.exceptionResolvers(Arrays.asList(resolvers));
 		return this;

spring-graphql/src/testFixtures/java/org/springframework/graphql/TestExecutionGraphQlService.java

@@ -0,0 +1,4 @@
+package org.springframework.graphql;
+
+public interface TestExecutionGraphQlService {
+}