From 66be6c3396fb572cb8a6678f97ae2f6d60cdb642 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Tue, 5 Jun 2018 17:44:51 -0700 Subject: [PATCH] Polish --- .../ReactiveCloudFoundrySecurityService.java | 12 ++++++++---- .../jackson/JacksonAutoConfigurationTests.java | 1 + .../boot/web/client/RestTemplateBuilderTests.java | 1 - 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundrySecurityService.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundrySecurityService.java index 269d1a27a18..49d2b38d8fa 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundrySecurityService.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundrySecurityService.java @@ -20,6 +20,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import io.netty.handler.ssl.SslContextBuilder; import io.netty.handler.ssl.SslProvider; import io.netty.handler.ssl.util.InsecureTrustManagerFactory; import reactor.core.publisher.Mono; @@ -65,13 +66,16 @@ class ReactiveCloudFoundrySecurityService { } protected ReactorClientHttpConnector buildTrustAllSslConnector() { - HttpClient client = HttpClient.create() - .secure((sslContextSpec) -> sslContextSpec.forClient() - .sslContext((builder) -> builder.sslProvider(SslProvider.JDK) - .trustManager(InsecureTrustManagerFactory.INSTANCE))); + HttpClient client = HttpClient.create().secure((sslContextSpec) -> sslContextSpec + .forClient().sslContext(this::configureSsl)); return new ReactorClientHttpConnector(client); } + private SslContextBuilder configureSsl(SslContextBuilder builder) { + return builder.sslProvider(SslProvider.JDK) + .trustManager(InsecureTrustManagerFactory.INSTANCE); + } + /** * Return a Mono of the access level that should be granted to the given token. * @param token the token diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfigurationTests.java index 4e9e90e4787..3c4a2803fcd 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfigurationTests.java @@ -626,6 +626,7 @@ public class JacksonAutoConfigurationTests { } + @SuppressWarnings("unused") private static class VisibilityBean { private String property1; diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/RestTemplateBuilderTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/RestTemplateBuilderTests.java index 0bef0e49cf0..7972841fa21 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/RestTemplateBuilderTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/RestTemplateBuilderTests.java @@ -414,7 +414,6 @@ public class RestTemplateBuilderTests { assertThat(ReflectionTestUtils.getField(actualRequestFactory, "requestFactory")).isSameAs(requestFactory); }).build(); - } @Test