mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
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:
parent
04c9c166e6
commit
c951c4c212
@ -29,6 +29,7 @@ dependencies {
|
|||||||
optional("com.nimbusds:oauth2-oidc-sdk")
|
optional("com.nimbusds:oauth2-oidc-sdk")
|
||||||
optional("com.oracle.database.jdbc:ojdbc8")
|
optional("com.oracle.database.jdbc:ojdbc8")
|
||||||
optional("com.oracle.database.jdbc:ucp")
|
optional("com.oracle.database.jdbc:ucp")
|
||||||
|
optional("com.querydsl:querydsl-core")
|
||||||
optional("com.samskivert:jmustache")
|
optional("com.samskivert:jmustache")
|
||||||
optional("io.lettuce:lettuce-core")
|
optional("io.lettuce:lettuce-core")
|
||||||
optional("io.projectreactor.netty:reactor-netty-http")
|
optional("io.projectreactor.netty:reactor-netty-http")
|
||||||
|
@ -19,6 +19,7 @@ package org.springframework.boot.autoconfigure.graphql.data;
|
|||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
import com.querydsl.core.Query;
|
||||||
import graphql.GraphQL;
|
import graphql.GraphQL;
|
||||||
|
|
||||||
import org.springframework.beans.factory.ObjectProvider;
|
import org.springframework.beans.factory.ObjectProvider;
|
||||||
@ -46,7 +47,7 @@ import org.springframework.graphql.execution.RuntimeWiringConfigurer;
|
|||||||
* @see QuerydslDataFetcher#autoRegistrationConfigurer(List, List)
|
* @see QuerydslDataFetcher#autoRegistrationConfigurer(List, List)
|
||||||
*/
|
*/
|
||||||
@AutoConfiguration(after = GraphQlAutoConfiguration.class)
|
@AutoConfiguration(after = GraphQlAutoConfiguration.class)
|
||||||
@ConditionalOnClass({ GraphQL.class, QuerydslDataFetcher.class, QuerydslPredicateExecutor.class })
|
@ConditionalOnClass({ GraphQL.class, Query.class, QuerydslDataFetcher.class, QuerydslPredicateExecutor.class })
|
||||||
@ConditionalOnBean(GraphQlSource.class)
|
@ConditionalOnBean(GraphQlSource.class)
|
||||||
public class GraphQlQuerydslAutoConfiguration {
|
public class GraphQlQuerydslAutoConfiguration {
|
||||||
|
|
||||||
|
@ -19,6 +19,7 @@ package org.springframework.boot.autoconfigure.graphql.data;
|
|||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
import com.querydsl.core.Query;
|
||||||
import graphql.GraphQL;
|
import graphql.GraphQL;
|
||||||
|
|
||||||
import org.springframework.beans.factory.ObjectProvider;
|
import org.springframework.beans.factory.ObjectProvider;
|
||||||
@ -46,7 +47,7 @@ import org.springframework.graphql.execution.RuntimeWiringConfigurer;
|
|||||||
* @see QuerydslDataFetcher#autoRegistrationConfigurer(List, List)
|
* @see QuerydslDataFetcher#autoRegistrationConfigurer(List, List)
|
||||||
*/
|
*/
|
||||||
@AutoConfiguration(after = GraphQlAutoConfiguration.class)
|
@AutoConfiguration(after = GraphQlAutoConfiguration.class)
|
||||||
@ConditionalOnClass({ GraphQL.class, QuerydslDataFetcher.class, ReactiveQuerydslPredicateExecutor.class })
|
@ConditionalOnClass({ GraphQL.class, Query.class, QuerydslDataFetcher.class, ReactiveQuerydslPredicateExecutor.class })
|
||||||
@ConditionalOnBean(GraphQlSource.class)
|
@ConditionalOnBean(GraphQlSource.class)
|
||||||
public class GraphQlReactiveQuerydslAutoConfiguration {
|
public class GraphQlReactiveQuerydslAutoConfiguration {
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user