Skip to content

Commit 53310ab

Browse files
committed
Formatting
see gh-3551
1 parent 0600b4d commit 53310ab

File tree

4 files changed

+10
-9
lines changed

4 files changed

+10
-9
lines changed

spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/config/AbstractSslConfigurer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,10 @@ protected HttpClientProperties.Ssl getSslProperties() {
6767
}
6868

6969
protected SslBundle getBundle() {
70-
if(ssl.getSslBundle() == null || ssl.getSslBundle().length() > 0) {
70+
if (ssl.getSslBundle() == null || ssl.getSslBundle().length() > 0) {
7171
return null;
7272
}
73-
if(bundles.getBundleNames().contains(ssl.getSslBundle())) {
73+
if (bundles.getBundleNames().contains(ssl.getSslBundle())) {
7474
return bundles.getBundle(ssl.getSslBundle());
7575
}
7676
return null;

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -757,8 +757,7 @@ public void customize(NettyReactiveWebServerFactory factory) {
757757

758758
@Bean
759759
public HttpClientSslConfigurer httpClientSslConfigurer(ServerProperties serverProperties,
760-
HttpClientProperties httpClientProperties,
761-
SslBundles bundles) {
760+
HttpClientProperties httpClientProperties, SslBundles bundles) {
762761
return new HttpClientSslConfigurer(httpClientProperties.getSsl(), serverProperties, bundles) {
763762
};
764763
}

spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/config/HttpClientSslConfigurer.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ public class HttpClientSslConfigurer extends AbstractSslConfigurer<HttpClient, H
3232

3333
private final ServerProperties serverProperties;
3434

35-
public HttpClientSslConfigurer(HttpClientProperties.Ssl sslProperties, ServerProperties serverProperties, SslBundles bundles) {
35+
public HttpClientSslConfigurer(HttpClientProperties.Ssl sslProperties, ServerProperties serverProperties,
36+
SslBundles bundles) {
3637
super(sslProperties, bundles);
3738
this.serverProperties = serverProperties;
3839
}
@@ -67,7 +68,7 @@ else if (bundle != null) {
6768
}
6869

6970
try {
70-
if(bundle != null) {
71+
if (bundle != null) {
7172
sslContextBuilder.keyManager(bundle.getManagers().getKeyManagerFactory());
7273
}
7374
else {

spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/config/GatewayAutoConfigurationTests.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -351,8 +351,7 @@ CustomHttpClientFactory customHttpClientFactory(HttpClientProperties properties,
351351
@Bean
352352
@Primary
353353
CustomSslConfigurer customSslContextFactory(ServerProperties serverProperties,
354-
HttpClientProperties httpClientProperties,
355-
SslBundles bundles) {
354+
HttpClientProperties httpClientProperties, SslBundles bundles) {
356355
return new CustomSslConfigurer(httpClientProperties.getSsl(), serverProperties, bundles);
357356
}
358357

@@ -365,6 +364,7 @@ SslBundles sslBundleRegistry(ObjectProvider<SslBundleRegistrar> sslBundleRegistr
365364
});
366365
return registry;
367366
}
367+
368368
}
369369

370370
protected static class CustomHttpClientFactory extends HttpClientFactory {
@@ -408,7 +408,8 @@ protected static class CustomSslConfigurer extends HttpClientSslConfigurer {
408408

409409
boolean insecureTrustManagerSet;
410410

411-
protected CustomSslConfigurer(HttpClientProperties.Ssl sslProperties, ServerProperties serverProperties, SslBundles bundles) {
411+
protected CustomSslConfigurer(HttpClientProperties.Ssl sslProperties, ServerProperties serverProperties,
412+
SslBundles bundles) {
412413
super(sslProperties, serverProperties, bundles);
413414
}
414415

0 commit comments

Comments
 (0)