Skip to content

Commit c951c4c

Browse files
committed
Polish GraphQL auto-configuration changes
This commit fixes build issues, as the recent changes surfaced an existing problem: QueryDsl auto-configurations were not guarded by classpath conditions for QueryDsl Core. See gh-34974
1 parent 04c9c16 commit c951c4c

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ dependencies {
2929
optional("com.nimbusds:oauth2-oidc-sdk")
3030
optional("com.oracle.database.jdbc:ojdbc8")
3131
optional("com.oracle.database.jdbc:ucp")
32+
optional("com.querydsl:querydsl-core")
3233
optional("com.samskivert:jmustache")
3334
optional("io.lettuce:lettuce-core")
3435
optional("io.projectreactor.netty:reactor-netty-http")

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import java.util.Collections;
2020
import java.util.List;
2121

22+
import com.querydsl.core.Query;
2223
import graphql.GraphQL;
2324

2425
import org.springframework.beans.factory.ObjectProvider;
@@ -46,7 +47,7 @@
4647
* @see QuerydslDataFetcher#autoRegistrationConfigurer(List, List)
4748
*/
4849
@AutoConfiguration(after = GraphQlAutoConfiguration.class)
49-
@ConditionalOnClass({ GraphQL.class, QuerydslDataFetcher.class, QuerydslPredicateExecutor.class })
50+
@ConditionalOnClass({ GraphQL.class, Query.class, QuerydslDataFetcher.class, QuerydslPredicateExecutor.class })
5051
@ConditionalOnBean(GraphQlSource.class)
5152
public class GraphQlQuerydslAutoConfiguration {
5253

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import java.util.Collections;
2020
import java.util.List;
2121

22+
import com.querydsl.core.Query;
2223
import graphql.GraphQL;
2324

2425
import org.springframework.beans.factory.ObjectProvider;
@@ -46,7 +47,7 @@
4647
* @see QuerydslDataFetcher#autoRegistrationConfigurer(List, List)
4748
*/
4849
@AutoConfiguration(after = GraphQlAutoConfiguration.class)
49-
@ConditionalOnClass({ GraphQL.class, QuerydslDataFetcher.class, ReactiveQuerydslPredicateExecutor.class })
50+
@ConditionalOnClass({ GraphQL.class, Query.class, QuerydslDataFetcher.class, ReactiveQuerydslPredicateExecutor.class })
5051
@ConditionalOnBean(GraphQlSource.class)
5152
public class GraphQlReactiveQuerydslAutoConfiguration {
5253

0 commit comments

Comments
 (0)