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

Session.delete -> deleteById

Browse Source 
Fixes gh-809
This commit is contained in:
Rob Winch
2017-06-22 21:24:20 -05:00
parent 0127ef9f9b
commit c6c6beb40c
14 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-session-data-redis/src/integration-test/java/org/springframework/session/data/redis/RedisOperationsSessionRepositoryITests.java
View File

@@ -92,7 +92,7 @@ public class RedisOperationsSessionRepositoryITests extends AbstractITests {
this.registry.clear();
this.repository.delete(toSave.getId());
this.repository.deleteById(toSave.getId());
assertThat(this.repository.findById(toSave.getId())).isNull();
assertThat(this.registry.<SessionDestroyedEvent>getEvent(toSave.getId()))
@@ -123,7 +123,7 @@ public class RedisOperationsSessionRepositoryITests extends AbstractITests {
assertThat(session.<String>getAttribute("a")).isEqualTo(Optional.of("b"));
assertThat(session.<String>getAttribute("1")).isEqualTo(Optional.of("2"));
this.repository.delete(toSave.getId());
this.repository.deleteById(toSave.getId());
}
@Test
@@ -140,7 +140,7 @@ public class RedisOperationsSessionRepositoryITests extends AbstractITests {
assertThat(findByPrincipalName).hasSize(1);
assertThat(findByPrincipalName.keySet()).containsOnly(toSave.getId());
this.repository.delete(toSave.getId());
this.repository.deleteById(toSave.getId());
assertThat(this.registry.receivedEvent(toSave.getId())).isTrue();
findByPrincipalName = this.repository.findByIndexNameAndIndexValue(INDEX_NAME,
@@ -310,7 +310,7 @@ public class RedisOperationsSessionRepositoryITests extends AbstractITests {
assertThat(findByPrincipalName).hasSize(1);
assertThat(findByPrincipalName.keySet()).containsOnly(toSave.getId());
this.repository.delete(toSave.getId());
this.repository.deleteById(toSave.getId());
assertThat(this.registry.receivedEvent(toSave.getId())).isTrue();
findByPrincipalName = this.repository.findByIndexNameAndIndexValue(INDEX_NAME,

2
spring-session-data-redis/src/main/java/org/springframework/session/data/redis/RedisOperationsSessionRepository.java
View File

@@ -466,7 +466,7 @@ public class RedisOperationsSessionRepository implements
return loaded;
}
public void delete(String sessionId) {
public void deleteById(String sessionId) {
RedisSession session = getSession(sessionId, true);
if (session == null) {
return;

4
spring-session-data-redis/src/test/java/org/springframework/session/data/redis/RedisOperationsSessionRepositoryTests.java
View File

@@ -344,7 +344,7 @@ public class RedisOperationsSessionRepositoryTests {
.willReturn(this.boundSetOperations);
String id = expected.getId();
this.redisRepository.delete(id);
this.redisRepository.deleteById(id);
assertThat(getDelta().get(RedisOperationsSessionRepository.MAX_INACTIVE_ATTR))
.isEqualTo(0);
@@ -358,7 +358,7 @@ public class RedisOperationsSessionRepositoryTests {
.willReturn(this.boundHashOperations);
String id = "abc";
this.redisRepository.delete(id);
this.redisRepository.deleteById(id);
verify(this.redisOperations, times(0)).delete(anyString());
verify(this.redisOperations, times(0)).delete(anyString());
}