diff --git a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/config/AbstractSslConfigurer.java b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/config/AbstractSslConfigurer.java index 66aa3da778..3a32ecb1d3 100644 --- a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/config/AbstractSslConfigurer.java +++ b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/config/AbstractSslConfigurer.java @@ -67,10 +67,10 @@ protected HttpClientProperties.Ssl getSslProperties() { } protected SslBundle getBundle() { - if(ssl.getSslBundle() == null || ssl.getSslBundle().length() > 0) { + if (ssl.getSslBundle() == null || ssl.getSslBundle().length() > 0) { return null; } - if(bundles.getBundleNames().contains(ssl.getSslBundle())) { + if (bundles.getBundleNames().contains(ssl.getSslBundle())) { return bundles.getBundle(ssl.getSslBundle()); } return null; 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 54ba6130a1..2b89cc0e49 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 @@ -757,8 +757,7 @@ public void customize(NettyReactiveWebServerFactory factory) { @Bean public HttpClientSslConfigurer httpClientSslConfigurer(ServerProperties serverProperties, - HttpClientProperties httpClientProperties, - SslBundles bundles) { + HttpClientProperties httpClientProperties, SslBundles bundles) { return new HttpClientSslConfigurer(httpClientProperties.getSsl(), serverProperties, bundles) { }; } diff --git a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/config/HttpClientSslConfigurer.java b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/config/HttpClientSslConfigurer.java index 6d335358ce..59a91e79c8 100644 --- a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/config/HttpClientSslConfigurer.java +++ b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/config/HttpClientSslConfigurer.java @@ -32,7 +32,8 @@ public class HttpClientSslConfigurer extends AbstractSslConfigurer sslBundleRegistr }); return registry; } + } protected static class CustomHttpClientFactory extends HttpClientFactory { @@ -408,7 +408,8 @@ protected static class CustomSslConfigurer extends HttpClientSslConfigurer { boolean insecureTrustManagerSet; - protected CustomSslConfigurer(HttpClientProperties.Ssl sslProperties, ServerProperties serverProperties, SslBundles bundles) { + protected CustomSslConfigurer(HttpClientProperties.Ssl sslProperties, ServerProperties serverProperties, + SslBundles bundles) { super(sslProperties, serverProperties, bundles); }