Skip to content

Commit 6d5e76e

Browse files
committed
Polish "Configure support for GraphQL pagination and sorting"
See gh-34677
1 parent 7109542 commit 6d5e76e

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/GraphQlAutoConfiguration.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
import org.springframework.graphql.data.pagination.ConnectionFieldTypeVisitor;
5252
import org.springframework.graphql.data.pagination.CursorEncoder;
5353
import org.springframework.graphql.data.pagination.CursorStrategy;
54+
import org.springframework.graphql.data.pagination.EncodingCursorStrategy;
5455
import org.springframework.graphql.data.query.ScrollPositionCursorStrategy;
5556
import org.springframework.graphql.data.query.SliceConnectionAdapter;
5657
import org.springframework.graphql.data.query.WindowConnectionAdapter;
@@ -170,7 +171,7 @@ static class GraphQlDataAutoConfiguration {
170171

171172
@Bean
172173
@ConditionalOnMissingBean
173-
CursorStrategy<ScrollPosition> cursorStrategy() {
174+
EncodingCursorStrategy<ScrollPosition> cursorStrategy() {
174175
return CursorStrategy.withEncoder(new ScrollPositionCursorStrategy(), CursorEncoder.base64());
175176
}
176177

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/GraphQlAutoConfigurationTests.java

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
import org.springframework.core.io.ClassPathResource;
4545
import org.springframework.graphql.ExecutionGraphQlService;
4646
import org.springframework.graphql.data.method.annotation.support.AnnotatedControllerConfigurer;
47-
import org.springframework.graphql.data.pagination.CursorStrategy;
4847
import org.springframework.graphql.data.pagination.EncodingCursorStrategy;
4948
import org.springframework.graphql.execution.BatchLoaderRegistry;
5049
import org.springframework.graphql.execution.DataFetcherExceptionResolver;
@@ -65,14 +64,11 @@ class GraphQlAutoConfigurationTests {
6564

6665
@Test
6766
void shouldContributeDefaultBeans() {
68-
this.contextRunner.run((context) -> {
69-
assertThat(context).hasSingleBean(GraphQlSource.class)
70-
.hasSingleBean(BatchLoaderRegistry.class)
71-
.hasSingleBean(ExecutionGraphQlService.class)
72-
.hasSingleBean(AnnotatedControllerConfigurer.class)
73-
.hasSingleBean(CursorStrategy.class);
74-
assertThat(context.getBean(CursorStrategy.class)).isInstanceOf(EncodingCursorStrategy.class);
75-
});
67+
this.contextRunner.run((context) -> assertThat(context).hasSingleBean(GraphQlSource.class)
68+
.hasSingleBean(BatchLoaderRegistry.class)
69+
.hasSingleBean(ExecutionGraphQlService.class)
70+
.hasSingleBean(AnnotatedControllerConfigurer.class)
71+
.hasSingleBean(EncodingCursorStrategy.class));
7672
}
7773

7874
@Test

0 commit comments

Comments
 (0)