Spring/spring-session
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish

Browse Source 
Closes gh-2917
This commit is contained in:
Marcus Hert Da Coregio
2024-05-13 10:46:47 -03:00
parent 44a6da43fa
commit 21260787d3
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
spring-session-data-redis/src/main/java/org/springframework/session/data/redis/ReactiveRedisIndexedSessionRepository.java
View File

@@ -385,10 +385,10 @@ public class ReactiveRedisIndexedSessionRepository
@Override
public Mono<Void> deleteById(String id) {
return internalDeleteById(id).then();
return deleteAndReturn(id).then();
}
public Mono<Session> internalDeleteById(String id) {
private Mono<RedisSession> deleteAndReturn(String id) {
// @formatter:off
return getSession(id, true)
.flatMap((session) -> this.sessionRedisOperations.delete(getExpiredKey(session.getId()))
@@ -438,11 +438,13 @@ public class ReactiveRedisIndexedSessionRepository
}
private Mono<Void> onKeyDestroyedMessage(ReactiveSubscription.Message<String, String> message) {
return Mono.just(message.getMessage()).filter((key) -> key.startsWith(getExpiredKeyPrefix())).map((key) -> {
int sessionIdBeginIndex = key.lastIndexOf(":") + 1;
return key.substring(sessionIdBeginIndex);
})
.flatMap(this::internalDeleteById)
// @formatter:off
return Mono.just(message.getMessage())
.filter((key) -> key.startsWith(getExpiredKeyPrefix())).map((key) -> {
int sessionIdBeginIndex = key.lastIndexOf(":") + 1;
return key.substring(sessionIdBeginIndex);
})
.flatMap(this::deleteAndReturn)
.map((session) -> {
if (message.getChannel().equals(this.sessionDeletedChannel)) {
return new SessionDeletedEvent(this, session);
@@ -451,6 +453,7 @@ public class ReactiveRedisIndexedSessionRepository
})
.doOnNext(this::publishEvent)
.then();
// @formatter:on
}
private void publishEvent(Object event) {