mindol1004/spring-session
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Harmonize ReactorSessionRepository API

Browse Source 
This commit renames the `ReactorSessionRepository#delete` to `deleteById` in order to make API consistent with `SessionRepository`.
This commit is contained in:
Vedran Pavic
2017-09-11 07:37:48 +02:00
parent 188e5ba4e0
commit eb7bcc5eeb
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-session-core/src/main/java/org/springframework/session/MapReactorSessionRepository.java
View File

@@ -86,11 +86,11 @@ public class MapReactorSessionRepository implements ReactorSessionRepository<Map
return Mono.defer(() -> Mono.justOrEmpty(this.sessions.get(id))
.filter(session -> !session.isExpired())
.map(MapSession::new)
.switchIfEmpty(delete(id).then(Mono.empty())));
.switchIfEmpty(deleteById(id).then(Mono.empty())));
// @formatter:on
}
public Mono<Void> delete(String id) {
public Mono<Void> deleteById(String id) {
return Mono.fromRunnable(() -> this.sessions.remove(id));
}

3
spring-session-core/src/main/java/org/springframework/session/ReactorSessionRepository.java
View File

@@ -73,5 +73,6 @@ public interface ReactorSessionRepository<S extends Session> {
* @param id the {@link Session#getId()} to delete
* @return indicator of operation completion
*/
Mono<Void> delete(String id);
Mono<Void> deleteById(String id);
}

2
spring-session-core/src/main/java/org/springframework/session/web/server/session/SpringSessionWebSessionStore.java
View File

@@ -97,7 +97,7 @@ public class SpringSessionWebSessionStore<S extends Session> implements WebSessi
@Override
public Mono<Void> removeSession(String sessionId) {
return this.sessions.delete(sessionId);
return this.sessions.deleteById(sessionId);
}
private SpringSessionWebSession createSession(S session) {

4
spring-session-core/src/test/java/org/springframework/session/web/server/session/SpringSessionWebSessionStoreTests.java
View File

@@ -273,11 +273,11 @@ public class SpringSessionWebSessionStoreTests<S extends Session> {
@Test
public void removeSessionWhenInvokedThenSessionSaved() {
String sessionId = "session-id";
given(this.sessionRepository.delete(sessionId)).willReturn(Mono.empty());
given(this.sessionRepository.deleteById(sessionId)).willReturn(Mono.empty());
this.webSessionStore.removeSession(sessionId).block();
verify(this.sessionRepository).delete(sessionId);
verify(this.sessionRepository).deleteById(sessionId);
}
@Test(expected = IllegalArgumentException.class)