From 310487ff2755dace1c93ed5954e98d477aa49212 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Fri, 5 Aug 2022 14:54:41 -0400 Subject: [PATCH] Switch @ConditionalOnClass to use name --- .../cloud/gateway/config/GatewayAutoConfiguration.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/config/GatewayAutoConfiguration.java b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/config/GatewayAutoConfiguration.java index 1dea2a08..99a5f54d 100644 --- a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/config/GatewayAutoConfiguration.java +++ b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/config/GatewayAutoConfiguration.java @@ -25,7 +25,6 @@ import java.util.function.Supplier; import javax.net.ssl.TrustManagerFactory; -import io.grpc.Channel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import reactor.core.publisher.Flux; @@ -303,7 +302,7 @@ public class GatewayAutoConfiguration { @Bean @ConditionalOnEnabledFilter @ConditionalOnProperty(name = "server.http2.enabled", matchIfMissing = true) - @ConditionalOnClass(Channel.class) + @ConditionalOnClass(name = "io.grpc.Channel") public JsonToGrpcGatewayFilterFactory jsonToGRPCFilterFactory(GRPCSSLContext gRPCSSLContext, ResourceLoader resourceLoader) { return new JsonToGrpcGatewayFilterFactory(gRPCSSLContext, resourceLoader); @@ -312,7 +311,7 @@ public class GatewayAutoConfiguration { @Bean @ConditionalOnEnabledFilter(JsonToGrpcGatewayFilterFactory.class) @ConditionalOnMissingBean(GRPCSSLContext.class) - @ConditionalOnClass(Channel.class) + @ConditionalOnClass(name = "io.grpc.Channel") public GRPCSSLContext gRPCSSLContext() throws KeyStoreException, NoSuchAlgorithmException { TrustManagerFactory trustManagerFactory = TrustManagerFactory .getInstance(TrustManagerFactory.getDefaultAlgorithm());