Skip to content

Commit 7aaf4b9

Browse files
committed
Add "Connection" support method to GraphQlSetup
1 parent 8fe4b29 commit 7aaf4b9

File tree

8 files changed

+23
-19
lines changed

8 files changed

+23
-19
lines changed

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,10 @@
3232
import org.springframework.graphql.ResponseHelper;
3333
import org.springframework.graphql.TestExecutionRequest;
3434
import org.springframework.graphql.data.method.annotation.QueryMapping;
35-
import org.springframework.graphql.data.pagination.ConnectionFieldTypeVisitor;
3635
import org.springframework.graphql.data.pagination.CursorStrategy;
3736
import org.springframework.graphql.data.query.ScrollPositionCursorStrategy;
3837
import org.springframework.graphql.data.query.ScrollSubrange;
3938
import org.springframework.graphql.data.query.WindowConnectionAdapter;
40-
import org.springframework.graphql.execution.ConnectionTypeDefinitionConfigurer;
4139
import org.springframework.stereotype.Controller;
4240

4341
/**
@@ -83,9 +81,9 @@ private ExecutionGraphQlService graphQlService() {
8381
configurer.setApplicationContext(context);
8482
configurer.afterPropertiesSet();
8583

86-
GraphQlSetup setup = GraphQlSetup.schemaResource(BookSource.paginationSchema).runtimeWiring(configurer);
87-
setup.typeDefinitionConfigurer(new ConnectionTypeDefinitionConfigurer());
88-
setup.typeVisitor(ConnectionFieldTypeVisitor.create(List.of(new WindowConnectionAdapter(cursorStrategy))));
84+
GraphQlSetup setup = GraphQlSetup.schemaResource(BookSource.paginationSchema)
85+
.runtimeWiring(configurer)
86+
.connectionSupport(new WindowConnectionAdapter(cursorStrategy));
8987

9088
return setup.toGraphQlService();
9189
}

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@ void paginationDataFetcher() {
4747

4848
Mono<ExecutionGraphQlResponse> response = GraphQlSetup.schemaResource(BookSource.paginationSchema)
4949
.dataFetcher("Query", "books", env -> BookSource.books())
50-
.typeDefinitionConfigurer(new ConnectionTypeDefinitionConfigurer())
51-
.typeVisitor(ConnectionFieldTypeVisitor.create(List.of(adapter)))
50+
.connectionSupport(adapter)
5251
.toGraphQlService()
5352
.execute(TestExecutionRequest.forDocument(BookSource.booksConnectionQuery(null)));
5453

@@ -77,8 +76,7 @@ void trivialDataFetcherIsSkipped() {
7776

7877
Mono<ExecutionGraphQlResponse> response = GraphQlSetup.schemaResource(BookSource.paginationSchema)
7978
.dataFetcher("Query", "books", new PropertyDataFetcher<>("books"))
80-
.typeDefinitionConfigurer(new ConnectionTypeDefinitionConfigurer())
81-
.typeVisitor(ConnectionFieldTypeVisitor.create(List.of(new ListConnectionAdapter())))
79+
.connectionSupport(new ListConnectionAdapter())
8280
.toGraphQlService()
8381
.execute(TestExecutionRequest.forDocument(BookSource.booksConnectionQuery(null)));
8482

@@ -90,8 +88,7 @@ void nullValueTreatedAsEmptyConnection() {
9088

9189
Mono<ExecutionGraphQlResponse> response = GraphQlSetup.schemaResource(BookSource.paginationSchema)
9290
.dataFetcher("Query", "books", environment -> null)
93-
.typeDefinitionConfigurer(new ConnectionTypeDefinitionConfigurer())
94-
.typeVisitor(ConnectionFieldTypeVisitor.create(List.of(new ListConnectionAdapter())))
91+
.connectionSupport(new ListConnectionAdapter())
9592
.toGraphQlService()
9693
.execute(TestExecutionRequest.forDocument(BookSource.booksConnectionQuery(null)));
9794

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -363,8 +363,7 @@ private static GraphQlSetup graphQlSetup(@Nullable ReactiveQuerydslPredicateExec
363363

364364
private static GraphQlSetup paginationSetup(ScrollPositionCursorStrategy cursorStrategy) {
365365
return GraphQlSetup.schemaResource(BookSource.paginationSchema)
366-
.typeDefinitionConfigurer(new ConnectionTypeDefinitionConfigurer())
367-
.typeVisitor(ConnectionFieldTypeVisitor.create(List.of(new WindowConnectionAdapter(cursorStrategy))));
366+
.connectionSupport(new WindowConnectionAdapter(cursorStrategy));
368367
}
369368

370369
private static RuntimeWiringConfigurer createRuntimeWiringConfigurer(

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,8 +250,7 @@ private static GraphQlSetup graphQlSetup(QueryByExampleExecutor<?> executor) {
250250

251251
private static GraphQlSetup paginationSetup(ScrollPositionCursorStrategy cursorStrategy) {
252252
return GraphQlSetup.schemaResource(BookSource.paginationSchema)
253-
.typeDefinitionConfigurer(new ConnectionTypeDefinitionConfigurer())
254-
.typeVisitor(ConnectionFieldTypeVisitor.create(List.of(new WindowConnectionAdapter(cursorStrategy))));
253+
.connectionSupport(new WindowConnectionAdapter(cursorStrategy));
255254
}
256255

257256
private static RuntimeWiringConfigurer createRuntimeWiringConfigurer(QueryByExampleExecutor<?> executor) {

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,8 +228,7 @@ private static GraphQlSetup graphQlSetup(@Nullable QueryByExampleExecutor<?> exe
228228

229229
private static GraphQlSetup paginationSetup(ScrollPositionCursorStrategy cursorStrategy) {
230230
return GraphQlSetup.schemaResource(BookSource.paginationSchema)
231-
.typeDefinitionConfigurer(new ConnectionTypeDefinitionConfigurer())
232-
.typeVisitor(ConnectionFieldTypeVisitor.create(List.of(new WindowConnectionAdapter(cursorStrategy))));
231+
.connectionSupport(new WindowConnectionAdapter(cursorStrategy));
233232
}
234233

235234
private static RuntimeWiringConfigurer createRuntimeWiringConfigurer(QueryByExampleExecutor<?> executor) {

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,8 +201,7 @@ private static GraphQlSetup graphQlSetup(@Nullable ReactiveQueryByExampleExecuto
201201

202202
private static GraphQlSetup paginationSetup(ScrollPositionCursorStrategy cursorStrategy) {
203203
return GraphQlSetup.schemaResource(BookSource.paginationSchema)
204-
.typeDefinitionConfigurer(new ConnectionTypeDefinitionConfigurer())
205-
.typeVisitor(ConnectionFieldTypeVisitor.create(List.of(new WindowConnectionAdapter(cursorStrategy))));
204+
.connectionSupport(new WindowConnectionAdapter(cursorStrategy));
206205
}
207206

208207
private static RuntimeWiringConfigurer createRuntimeWiringConfigurer(ReactiveQueryByExampleExecutor<?> executor) {

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@
3030
import org.springframework.core.io.ByteArrayResource;
3131
import org.springframework.core.io.Resource;
3232
import org.springframework.graphql.data.method.annotation.support.AnnotatedControllerConfigurer;
33+
import org.springframework.graphql.data.pagination.ConnectionAdapter;
34+
import org.springframework.graphql.data.pagination.ConnectionFieldTypeVisitor;
35+
import org.springframework.graphql.execution.ConnectionTypeDefinitionConfigurer;
3336
import org.springframework.graphql.execution.DataFetcherExceptionResolver;
3437
import org.springframework.graphql.execution.DataLoaderRegistrar;
3538
import org.springframework.graphql.execution.DefaultExecutionGraphQlService;
@@ -98,6 +101,12 @@ public GraphQlSetup runtimeWiringForAnnotatedControllers(ApplicationContext cont
98101
return runtimeWiring(configurer);
99102
}
100103

104+
public GraphQlSetup connectionSupport(ConnectionAdapter connectionAdapter) {
105+
typeDefinitionConfigurer(new ConnectionTypeDefinitionConfigurer());
106+
typeVisitor(ConnectionFieldTypeVisitor.create(List.of(connectionAdapter)));
107+
return this;
108+
}
109+
101110
public GraphQlSetup exceptionResolver(DataFetcherExceptionResolver... resolvers) {
102111
this.graphQlSourceBuilder.exceptionResolvers(Arrays.asList(resolvers));
103112
return this;
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
package org.springframework.graphql;
2+
3+
public interface TestExecutionGraphQlService {
4+
}

0 commit comments

Comments
 (0)