root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

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
This commit is contained in:
Brian Clozel 2023-09-11 12:55:27 +02:00
parent 04c9c166e6
commit c951c4c212
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spring-boot-project/spring-boot-autoconfigure/build.gradle
View File

@ -29,6 +29,7 @@ dependencies {
optional("com.nimbusds:oauth2-oidc-sdk")
optional("com.oracle.database.jdbc:ojdbc8")
optional("com.oracle.database.jdbc:ucp")
optional("com.querydsl:querydsl-core")
optional("com.samskivert:jmustache")
optional("io.lettuce:lettuce-core")
optional("io.projectreactor.netty:reactor-netty-http")

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

@ -19,6 +19,7 @@ package org.springframework.boot.autoconfigure.graphql.data;
import java.util.Collections;
import java.util.List;
import com.querydsl.core.Query;
import graphql.GraphQL;
import org.springframework.beans.factory.ObjectProvider;
@ -46,7 +47,7 @@ import org.springframework.graphql.execution.RuntimeWiringConfigurer;
* @see QuerydslDataFetcher#autoRegistrationConfigurer(List, List)
*/
@AutoConfiguration(after = GraphQlAutoConfiguration.class)
@ConditionalOnClass({ GraphQL.class, QuerydslDataFetcher.class, QuerydslPredicateExecutor.class })
@ConditionalOnClass({ GraphQL.class, Query.class, QuerydslDataFetcher.class, QuerydslPredicateExecutor.class })
@ConditionalOnBean(GraphQlSource.class)
public class GraphQlQuerydslAutoConfiguration {

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

@ -19,6 +19,7 @@ package org.springframework.boot.autoconfigure.graphql.data;
import java.util.Collections;
import java.util.List;
import com.querydsl.core.Query;
import graphql.GraphQL;
import org.springframework.beans.factory.ObjectProvider;
@ -46,7 +47,7 @@ import org.springframework.graphql.execution.RuntimeWiringConfigurer;
* @see QuerydslDataFetcher#autoRegistrationConfigurer(List, List)
*/
@AutoConfiguration(after = GraphQlAutoConfiguration.class)
@ConditionalOnClass({ GraphQL.class, QuerydslDataFetcher.class, ReactiveQuerydslPredicateExecutor.class })
@ConditionalOnClass({ GraphQL.class, Query.class, QuerydslDataFetcher.class, ReactiveQuerydslPredicateExecutor.class })
@ConditionalOnBean(GraphQlSource.class)
public class GraphQlReactiveQuerydslAutoConfiguration {