Skip to content

Commit 14a59a3

Browse files
committed
Test that GraphQL QueryDSL auto-config backs off without Query DSL
See gh-34974
1 parent 671b04e commit 14a59a3

File tree

3 files changed

+18
-1
lines changed

3 files changed

+18
-1
lines changed

spring-boot-project/spring-boot-autoconfigure/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,6 @@ dependencies {
217217
testImplementation("com.ibm.db2:jcc")
218218
testImplementation("com.jayway.jsonpath:json-path")
219219
testImplementation("com.mysql:mysql-connector-j")
220-
testImplementation("com.querydsl:querydsl-core")
221220
testImplementation("com.squareup.okhttp3:mockwebserver")
222221
testImplementation("com.sun.xml.messaging.saaj:saaj-impl")
223222
testImplementation("io.projectreactor:reactor-test")

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import org.springframework.boot.autoconfigure.AutoConfigurations;
2424
import org.springframework.boot.autoconfigure.graphql.Book;
2525
import org.springframework.boot.autoconfigure.graphql.GraphQlAutoConfiguration;
26+
import org.springframework.boot.test.context.FilteredClassLoader;
2627
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
2728
import org.springframework.context.annotation.Bean;
2829
import org.springframework.context.annotation.Configuration;
@@ -33,6 +34,7 @@
3334
import org.springframework.graphql.test.tester.ExecutionGraphQlServiceTester;
3435
import org.springframework.graphql.test.tester.GraphQlTester;
3536

37+
import static org.assertj.core.api.Assertions.assertThat;
3638
import static org.mockito.ArgumentMatchers.any;
3739
import static org.mockito.BDDMockito.given;
3840
import static org.mockito.Mockito.mock;
@@ -65,6 +67,13 @@ void shouldRegisterDataFetcherForQueryDslRepositories() {
6567
});
6668
}
6769

70+
@Test
71+
void shouldBackOffWithoutQueryDsl() {
72+
this.contextRunner.withClassLoader(new FilteredClassLoader("com.querydsl.core"))
73+
.run((context) -> assertThat(context).doesNotHaveBean("querydslRegistrar")
74+
.doesNotHaveBean(GraphQlQuerydslAutoConfiguration.class));
75+
}
76+
6877
@Configuration(proxyBeanMethods = false)
6978
static class MockRepositoryConfig {
7079

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import org.springframework.boot.autoconfigure.AutoConfigurations;
2323
import org.springframework.boot.autoconfigure.graphql.Book;
2424
import org.springframework.boot.autoconfigure.graphql.GraphQlAutoConfiguration;
25+
import org.springframework.boot.test.context.FilteredClassLoader;
2526
import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
2627
import org.springframework.context.annotation.Bean;
2728
import org.springframework.context.annotation.Configuration;
@@ -32,6 +33,7 @@
3233
import org.springframework.graphql.test.tester.ExecutionGraphQlServiceTester;
3334
import org.springframework.graphql.test.tester.GraphQlTester;
3435

36+
import static org.assertj.core.api.Assertions.assertThat;
3537
import static org.mockito.ArgumentMatchers.any;
3638
import static org.mockito.BDDMockito.given;
3739
import static org.mockito.Mockito.mock;
@@ -64,6 +66,13 @@ void shouldRegisterDataFetcherForQueryDslRepositories() {
6466
});
6567
}
6668

69+
@Test
70+
void shouldBackOffWithoutQueryDsl() {
71+
this.contextRunner.withClassLoader(new FilteredClassLoader("com.querydsl.core"))
72+
.run((context) -> assertThat(context).doesNotHaveBean("querydslRegistrar")
73+
.doesNotHaveBean(GraphQlReactiveQuerydslAutoConfiguration.class));
74+
}
75+
6776
@Configuration(proxyBeanMethods = false)
6877
static class MockRepositoryConfig {
6978

0 commit comments

Comments
 (0)