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
22a426fe
Commit
22a426fe
authored
Nov 28, 2017
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish
parent
a454c1c1
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
8 deletions
+6
-8
ReactiveTokenValidator.java
...nfigure/cloudfoundry/reactive/ReactiveTokenValidator.java
+5
-6
CassandraReactiveDataAutoConfiguration.java
...ata/cassandra/CassandraReactiveDataAutoConfiguration.java
+1
-2
No files found.
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveTokenValidator.java
View file @
22a426fe
...
@@ -74,13 +74,12 @@ class ReactiveTokenValidator {
...
@@ -74,13 +74,12 @@ class ReactiveTokenValidator {
return
Mono
.
just
(
this
.
cachedTokenKeys
)
return
Mono
.
just
(
this
.
cachedTokenKeys
)
.
filter
((
tokenKeys
)
->
tokenKeys
.
containsKey
(
keyId
))
.
filter
((
tokenKeys
)
->
tokenKeys
.
containsKey
(
keyId
))
.
switchIfEmpty
(
this
.
securityService
.
fetchTokenKeys
()
.
switchIfEmpty
(
this
.
securityService
.
fetchTokenKeys
()
.
doOnSuccess
(
fetchedTokenKeys
->
{
.
doOnSuccess
(
(
fetchedTokenKeys
)
->
{
this
.
cachedTokenKeys
.
clear
();
this
.
cachedTokenKeys
.
clear
();
this
.
cachedTokenKeys
.
putAll
(
fetchedTokenKeys
);
this
.
cachedTokenKeys
.
putAll
(
fetchedTokenKeys
);
})
}).
filter
((
tokenKeys
)
->
tokenKeys
.
containsKey
(
keyId
))
.
filter
((
tokenKeys
)
->
tokenKeys
.
containsKey
(
keyId
))
.
switchIfEmpty
((
Mono
.
error
(
new
CloudFoundryAuthorizationException
(
.
switchIfEmpty
((
Mono
.
error
(
Reason
.
INVALID_KEY_ID
,
new
CloudFoundryAuthorizationException
(
Reason
.
INVALID_KEY_ID
,
"Key Id present in token header does not match"
)))))
"Key Id present in token header does not match"
)))))
.
filter
((
tokenKeys
)
->
hasValidSignature
(
token
,
tokenKeys
.
get
(
keyId
)))
.
filter
((
tokenKeys
)
->
hasValidSignature
(
token
,
tokenKeys
.
get
(
keyId
)))
.
switchIfEmpty
(
Mono
.
error
(
new
CloudFoundryAuthorizationException
(
.
switchIfEmpty
(
Mono
.
error
(
new
CloudFoundryAuthorizationException
(
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraReactiveDataAutoConfiguration.java
View file @
22a426fe
...
@@ -19,7 +19,6 @@ package org.springframework.boot.autoconfigure.data.cassandra;
...
@@ -19,7 +19,6 @@ package org.springframework.boot.autoconfigure.data.cassandra;
import
com.datastax.driver.core.Cluster
;
import
com.datastax.driver.core.Cluster
;
import
com.datastax.driver.core.Session
;
import
com.datastax.driver.core.Session
;
import
reactor.core.publisher.Flux
;
import
reactor.core.publisher.Flux
;
import
reactor.core.scheduler.Schedulers
;
import
org.springframework.boot.autoconfigure.AutoConfigureAfter
;
import
org.springframework.boot.autoconfigure.AutoConfigureAfter
;
import
org.springframework.boot.autoconfigure.EnableAutoConfiguration
;
import
org.springframework.boot.autoconfigure.EnableAutoConfiguration
;
...
@@ -52,7 +51,7 @@ public class CassandraReactiveDataAutoConfiguration {
...
@@ -52,7 +51,7 @@ public class CassandraReactiveDataAutoConfiguration {
@Bean
@Bean
@ConditionalOnMissingBean
(
ReactiveSession
.
class
)
@ConditionalOnMissingBean
(
ReactiveSession
.
class
)
public
ReactiveSession
reactiveCassandraSession
(
Session
session
)
{
public
ReactiveSession
reactiveCassandraSession
(
Session
session
)
{
return
new
DefaultBridgedReactiveSession
(
session
,
Schedulers
.
elastic
()
);
return
new
DefaultBridgedReactiveSession
(
session
);
}
}
@Bean
@Bean
...
...
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