Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
72e36ead
Commit
72e36ead
authored
Mar 17, 2018
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish
parent
626e488d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
23 deletions
+14
-23
ReactiveCloudFoundrySecurityService.java
...foundry/reactive/ReactiveCloudFoundrySecurityService.java
+3
-5
IntegrationAutoConfigurationTests.java
...figure/integration/IntegrationAutoConfigurationTests.java
+4
-7
AbstractReactiveWebServerFactoryTests.java
...eactive/server/AbstractReactiveWebServerFactoryTests.java
+7
-11
No files found.
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundrySecurityService.java
View file @
72e36ead
...
...
@@ -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
)));
}
/**
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationTests.java
View file @
72e36ead
...
...
@@ -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
...
...
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/server/AbstractReactiveWebServerFactoryTests.java
View file @
72e36ead
...
...
@@ -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
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment