diff --git a/spring-session-data-redis/src/main/java/org/springframework/session/data/redis/SortedSetRedisSessionExpirationStore.java b/spring-session-data-redis/src/main/java/org/springframework/session/data/redis/SortedSetRedisSessionExpirationStore.java index 4b77bd16e..c01f05a24 100644 --- a/spring-session-data-redis/src/main/java/org/springframework/session/data/redis/SortedSetRedisSessionExpirationStore.java +++ b/spring-session-data-redis/src/main/java/org/springframework/session/data/redis/SortedSetRedisSessionExpirationStore.java @@ -75,8 +75,8 @@ public void remove(String sessionId) { /** * Retrieves the sessions that are expected to be expired and invoke - * {@link #touch(String)} on each of the session keys, resolved via - * {@link #getSessionKey(String)}. + * {@link #touch(String)} on each of the expired keys, resolved via + * {@link #getExpiredKey(String)}. */ @Override public void cleanupExpiredSessions() { @@ -86,8 +86,8 @@ public void cleanupExpiredSessions() { return; } for (Object sessionId : sessionIds) { - String sessionKey = getSessionKey((String) sessionId); - touch(sessionKey); + String expiredKey = getExpiredKey((String) sessionId); + touch(expiredKey); } } @@ -105,8 +105,8 @@ private void touch(String sessionKey) { this.redisOps.hasKey(sessionKey); } - private String getSessionKey(String sessionId) { - return this.namespace + ":sessions:" + sessionId; + private String getExpiredKey(String sessionId) { + return this.namespace + ":sessions:expires:" + sessionId; } /** diff --git a/spring-session-data-redis/src/test/java/org/springframework/session/data/redis/SortedSetRedisSessionExpirationStoreTests.java b/spring-session-data-redis/src/test/java/org/springframework/session/data/redis/SortedSetRedisSessionExpirationStoreTests.java index baf254f04..bf7f11afc 100644 --- a/spring-session-data-redis/src/test/java/org/springframework/session/data/redis/SortedSetRedisSessionExpirationStoreTests.java +++ b/spring-session-data-redis/src/test/java/org/springframework/session/data/redis/SortedSetRedisSessionExpirationStoreTests.java @@ -78,9 +78,9 @@ void cleanupExpiredSessionsThenTouchExpiredSessions() { .reverseRangeByScore(anyString(), anyDouble(), anyDouble(), anyLong(), anyLong())) .willReturn(Set.of("1", "2", "3")); this.expirationStore.cleanupExpiredSessions(); - verify(this.redisTemplate).hasKey("spring:session:sessions:1"); - verify(this.redisTemplate).hasKey("spring:session:sessions:2"); - verify(this.redisTemplate).hasKey("spring:session:sessions:3"); + verify(this.redisTemplate).hasKey("spring:session:sessions:expires:1"); + verify(this.redisTemplate).hasKey("spring:session:sessions:expires:2"); + verify(this.redisTemplate).hasKey("spring:session:sessions:expires:3"); } }