Skip to content

feat: implement RedisSessionRepository and RedisIndexedSessionReposit… #3859

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
devsarthak2005 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: implement RedisSessionRepository and RedisIndexedSessionReposit… #3859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...s/src/main/java/org/springframework/session/data/redis/RedisIndexedSessionRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ public class RedisIndexedSessionRepository

private SessionIdGenerator sessionIdGenerator = UuidSessionIdGenerator.getInstance();

private BiFunction<String, Map<String, Object>, MapSession> redisSessionMapper = new RedisSessionMapper();
private BiFunction<String, Map<String, Object>, @Nullable MapSession> redisSessionMapper = new RedisSessionMapper();

/**
* Creates a new instance. For an example, refer to the class level javadoc.
Expand Down Expand Up @@ -761,7 +761,7 @@ public void setSessionIdGenerator(SessionIdGenerator sessionIdGenerator) {
* @param redisSessionMapper the mapper to use, cannot be null
* @since 3.2
*/
public void setRedisSessionMapper(BiFunction<String, Map<String, Object>, MapSession> redisSessionMapper) {
public void setRedisSessionMapper(BiFunction<String, Map<String, Object>, @Nullable MapSession> redisSessionMapper) {
Assert.notNull(redisSessionMapper, "redisSessionMapper cannot be null");
this.redisSessionMapper = redisSessionMapper;
}
Expand Down
4 changes: 2 additions & 2 deletions ...ta-redis/src/main/java/org/springframework/session/data/redis/RedisSessionRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public class RedisSessionRepository implements SessionRepository<RedisSessionRep

private SessionIdGenerator sessionIdGenerator = UuidSessionIdGenerator.getInstance();

private BiFunction<String, Map<String, Object>, MapSession> redisSessionMapper = new RedisSessionMapper();
private BiFunction<String, Map<String, Object>, @Nullable MapSession> redisSessionMapper = new RedisSessionMapper();

/**
* Create a new {@link RedisSessionRepository} instance.
Expand Down Expand Up @@ -187,7 +187,7 @@ public void setSessionIdGenerator(SessionIdGenerator sessionIdGenerator) {
* @param redisSessionMapper the mapper to use, cannot be null
* @since 3.2
*/
public void setRedisSessionMapper(BiFunction<String, Map<String, Object>, MapSession> redisSessionMapper) {
public void setRedisSessionMapper(BiFunction<String, Map<String, Object>, @Nullable MapSession> redisSessionMapper) {
Assert.notNull(redisSessionMapper, "redisSessionMapper cannot be null");
this.redisSessionMapper = redisSessionMapper;
}
Expand Down
14 changes: 14 additions & 0 deletions .../test/java/org/springframework/session/data/redis/RedisIndexedSessionRepositoryTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -960,6 +960,20 @@ void findByIdWhenChangeSessionIdThenUsesSessionIdGenerator() {
assertThat(newSessionId).isEqualTo("test");
}

@Test
void findByIdWhenRedisSessionMapperReturnsNullThenReturnsNull() {
String sessionId = "session-id";
given(this.redisOperations.<String, Object>boundHashOps(getKey(sessionId)))
.willReturn(this.boundHashOperations);
Map<String, Object> map = map(RedisSessionMapper.CREATION_TIME_KEY, Instant.EPOCH.toEpochMilli(),
RedisSessionMapper.MAX_INACTIVE_INTERVAL_KEY, 1, RedisSessionMapper.LAST_ACCESSED_TIME_KEY,
Instant.now().toEpochMilli());
given(this.boundHashOperations.entries()).willReturn(map);
this.redisRepository.setRedisSessionMapper((id, entries) -> null);

assertThat(this.redisRepository.findById(sessionId)).isNull();
}

private String getKey(String id) {
return "spring:session:sessions:" + id;
}
Expand Down
11 changes: 11 additions & 0 deletions ...dis/src/test/java/org/springframework/session/data/redis/RedisSessionRepositoryTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,6 +399,17 @@ void findByIdWhenChangeSessionIdThenUsesSessionIdGenerator() {
assertThat(session.changeSessionId()).isEqualTo("test");
}

@Test
void findByIdWhenRedisSessionMapperReturnsNullThenReturnsNull() {
given(this.sessionHashOperations.entries(eq(TEST_SESSION_KEY)))
.willReturn(mapOf(RedisSessionMapper.CREATION_TIME_KEY, Instant.EPOCH.toEpochMilli(),
RedisSessionMapper.LAST_ACCESSED_TIME_KEY, Instant.now().toEpochMilli(),
RedisSessionMapper.MAX_INACTIVE_INTERVAL_KEY, MapSession.DEFAULT_MAX_INACTIVE_INTERVAL_SECONDS));
this.sessionRepository.setRedisSessionMapper((id, entries) -> null);

assertThat(this.sessionRepository.findById(TEST_SESSION_ID)).isNull();
}

private static String getSessionKey(String sessionId) {
return "spring:session:sessions:" + sessionId;
}
Expand Down