SpringCloud/spring-cloud-gateway
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Switch @ConditionalOnClass to use name

Browse Source
This commit is contained in:
spencergibb
2022-08-05 14:54:41 -04:00
parent 1843547e20
commit 310487ff27
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/config/GatewayAutoConfiguration.java
View File

@@ -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());