From 53310ab35f405a8842ae1a6fcd49320b7fe8c3d4 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Tue, 19 Nov 2024 11:37:37 -0500 Subject: [PATCH] Formatting see gh-3551 --- .../cloud/gateway/config/AbstractSslConfigurer.java | 4 ++-- .../cloud/gateway/config/GatewayAutoConfiguration.java | 3 +-- .../cloud/gateway/config/HttpClientSslConfigurer.java | 5 +++-- .../gateway/config/GatewayAutoConfigurationTests.java | 7 ++++--- 4 files changed, 10 insertions(+), 9 deletions(-) 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 66aa3da7..3a32ecb1 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 @@ public abstract class AbstractSslConfigurer { } 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 54ba6130..2b89cc0e 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 class GatewayAutoConfiguration { @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 6d335358..59a91e79 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