Commit 72e36ead authored by Andy Wilkinson's avatar Andy Wilkinson

Polish

parent 626e488d
......@@ -64,11 +64,9 @@ class ReactiveCloudFoundrySecurityService {
}
protected ReactorClientHttpConnector buildTrustAllSslConnector() {
return new ReactorClientHttpConnector(
(options) -> options.sslSupport((sslContextBuilder) -> {
sslContextBuilder.sslProvider(SslProvider.JDK)
.trustManager(InsecureTrustManagerFactory.INSTANCE);
}));
return new ReactorClientHttpConnector((options) -> options.sslSupport(
(sslContextBuilder) -> sslContextBuilder.sslProvider(SslProvider.JDK)
.trustManager(InsecureTrustManagerFactory.INSTANCE)));
}
/**
......
......@@ -83,13 +83,10 @@ public class IntegrationAutoConfigurationTests {
@Test
public void parentContext() {
this.contextRunner.run((context) -> {
this.contextRunner.withParent(context)
.withPropertyValues("spring.jmx.default_domain=org.foo")
.run((child) -> {
assertThat(child).hasSingleBean(HeaderChannelRegistry.class);
});
});
this.contextRunner.run((context) -> this.contextRunner.withParent(context)
.withPropertyValues("spring.jmx.default_domain=org.foo")
.run((child) -> assertThat(child)
.hasSingleBean(HeaderChannelRegistry.class)));
}
@Test
......
......@@ -137,11 +137,9 @@ public abstract class AbstractReactiveWebServerFactoryTests {
}
protected ReactorClientHttpConnector buildTrustAllSslConnector() {
return new ReactorClientHttpConnector(
(options) -> options.sslSupport((sslContextBuilder) -> {
sslContextBuilder.sslProvider(SslProvider.JDK)
.trustManager(InsecureTrustManagerFactory.INSTANCE);
}));
return new ReactorClientHttpConnector((options) -> options.sslSupport(
(sslContextBuilder) -> sslContextBuilder.sslProvider(SslProvider.JDK)
.trustManager(InsecureTrustManagerFactory.INSTANCE)));
}
@Test
......@@ -174,12 +172,10 @@ public abstract class AbstractReactiveWebServerFactoryTests {
KeyManagerFactory clientKeyManagerFactory = KeyManagerFactory
.getInstance(KeyManagerFactory.getDefaultAlgorithm());
clientKeyManagerFactory.init(clientKeyStore, "password".toCharArray());
return new ReactorClientHttpConnector(
(options) -> options.sslSupport((sslContextBuilder) -> {
sslContextBuilder.sslProvider(SslProvider.JDK)
.trustManager(InsecureTrustManagerFactory.INSTANCE)
.keyManager(clientKeyManagerFactory);
}));
return new ReactorClientHttpConnector((options) -> options.sslSupport(
(sslContextBuilder) -> sslContextBuilder.sslProvider(SslProvider.JDK)
.trustManager(InsecureTrustManagerFactory.INSTANCE)
.keyManager(clientKeyManagerFactory)));
}
protected void testClientAuthSuccess(Ssl sslConfiguration,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment