Formatting

see gh-3551
spring-cloud · Nov 19, 2024 · 53310ab · 53310ab
1 parent 0600b4d
commit 53310ab
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/...-server/src/main/java/org/springframework/cloud/gateway/config/AbstractSslConfigurer.java b/...-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/...rver/src/main/java/org/springframework/cloud/gateway/config/GatewayAutoConfiguration.java b/...rver/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/...erver/src/main/java/org/springframework/cloud/gateway/config/HttpClientSslConfigurer.java b/...erver/src/main/java/org/springframework/cloud/gateway/config/HttpClientSslConfigurer.java
@@ -32,7 +32,8 @@ public class HttpClientSslConfigurer extends AbstractSslConfigurer<HttpClient, H
 
 	private final ServerProperties serverProperties;
 
-	public HttpClientSslConfigurer(HttpClientProperties.Ssl sslProperties, ServerProperties serverProperties, SslBundles bundles) {
+	public HttpClientSslConfigurer(HttpClientProperties.Ssl sslProperties, ServerProperties serverProperties,
+			SslBundles bundles) {
 		super(sslProperties, bundles);
 		this.serverProperties = serverProperties;
 	}
@@ -67,7 +68,7 @@ else if (bundle != null) {
 			}
 
 			try {
-				if(bundle != null) {
+				if (bundle != null) {
 					sslContextBuilder.keyManager(bundle.getManagers().getKeyManagerFactory());
 				}
 				else {

diff --git a/...src/test/java/org/springframework/cloud/gateway/config/GatewayAutoConfigurationTests.java b/...src/test/java/org/springframework/cloud/gateway/config/GatewayAutoConfigurationTests.java
@@ -351,8 +351,7 @@ CustomHttpClientFactory customHttpClientFactory(HttpClientProperties properties,
 		@Bean
 		@Primary
 		CustomSslConfigurer customSslContextFactory(ServerProperties serverProperties,
-				HttpClientProperties httpClientProperties,
-				SslBundles bundles) {
+				HttpClientProperties httpClientProperties, SslBundles bundles) {
 			return new CustomSslConfigurer(httpClientProperties.getSsl(), serverProperties, bundles);
 		}
 
@@ -365,6 +364,7 @@ SslBundles sslBundleRegistry(ObjectProvider<SslBundleRegistrar> 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);
 			}