From 21260787d33f6c4e67dadbf86dda3ded085fb981 Mon Sep 17 00:00:00 2001
From: Marcus Hert Da Coregio <marcusdacoregio@gmail.com>
Date: Mon, 13 May 2024 10:46:47 -0300
Subject: [PATCH] Polish

Closes gh-2917
---
 .../ReactiveRedisIndexedSessionRepository.java  | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/spring-session-data-redis/src/main/java/org/springframework/session/data/redis/ReactiveRedisIndexedSessionRepository.java b/spring-session-data-redis/src/main/java/org/springframework/session/data/redis/ReactiveRedisIndexedSessionRepository.java
index 0b3bdbb0..d6ba106d 100644
--- a/spring-session-data-redis/src/main/java/org/springframework/session/data/redis/ReactiveRedisIndexedSessionRepository.java
+++ b/spring-session-data-redis/src/main/java/org/springframework/session/data/redis/ReactiveRedisIndexedSessionRepository.java
@@ -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) {