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

2
spring-session-hazelcast/src/integration-test/java/org/springframework/session/hazelcast/AbstractHazelcastRepositoryITests.java
View File

@@ -55,7 +55,7 @@ public abstract class AbstractHazelcastRepositoryITests {
assertThat(hazelcastMap.size()).isEqualTo(1);
assertThat(hazelcastMap.get(sessionId)).isEqualTo(sessionToSave);
this.repository.delete(sessionId);
this.repository.deleteById(sessionId);
assertThat(hazelcastMap.size()).isEqualTo(0);
}

2
spring-session-hazelcast/src/integration-test/java/org/springframework/session/hazelcast/config/annotation/web/http/EnableHazelcastHttpSessionEventsTests.java
View File

@@ -135,7 +135,7 @@ public class EnableHazelcastHttpSessionEventsTests<S extends Session> {
.isInstanceOf(SessionCreatedEvent.class);
this.registry.clear();
this.repository.delete(sessionToSave.getId());
this.repository.deleteById(sessionToSave.getId());
assertThat(this.registry.receivedEvent(sessionToSave.getId())).isTrue();
assertThat(this.registry.<SessionDeletedEvent>getEvent(sessionToSave.getId()))

4
spring-session-hazelcast/src/main/java/org/springframework/session/hazelcast/HazelcastSessionRepository.java
View File

@@ -217,13 +217,13 @@ public class HazelcastSessionRepository implements
return null;
}
if (saved.isExpired()) {
delete(saved.getId());
deleteById(saved.getId());
return null;
}
return new HazelcastSession(saved);
}
public void delete(String id) {
public void deleteById(String id) {
this.sessions.remove(id);
}

2
spring-session-hazelcast/src/test/java/org/springframework/session/hazelcast/HazelcastSessionRepositoryTests.java
View File

@@ -280,7 +280,7 @@ public class HazelcastSessionRepositoryTests {
public void delete() {
String sessionId = "testSessionId";
this.repository.delete(sessionId);
this.repository.deleteById(sessionId);
verify(this.sessions, times(1)).remove(eq(sessionId));
}