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

Adjust for Spring 5.0.0.RC4

Browse Source
This commit is contained in:
Greg Turnquist
2017-09-13 16:18:15 -05:00
parent 605b981a65
commit eec5342d39
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -77,7 +77,7 @@
<mongo.version>3.4.2</mongo.version>
<mongo-reactivestreams.version>1.5.0</mongo-reactivestreams.version>
<reactor.version>Bismuth-M3</reactor.version>
<spring.version>5.0.0.RC3</spring.version>
<spring.version>5.0.0.RC4</spring.version>
<spring-data.version>Kay-RC2</spring-data.version>
<spring-security.version>5.0.0.M3</spring-security.version>
<spring-session.version>2.0.0.BUILD-SNAPSHOT</spring-session.version>

4
src/main/java/org/springframework/session/data/mongo/ReactiveMongoOperationsSessionRepository.java
View File

@@ -100,7 +100,7 @@ public class ReactiveMongoOperationsSessionRepository implements ReactorSessionR
return findSession(id)
.map(document -> convertToSession(this.mongoSessionConverter, document))
.filter(mongoSession -> !mongoSession.isExpired())
.switchIfEmpty(Mono.defer(() -> this.delete(id).then(Mono.empty())));
.switchIfEmpty(Mono.defer(() -> this.deleteById(id).then(Mono.empty())));
}
/**
@@ -110,7 +110,7 @@ public class ReactiveMongoOperationsSessionRepository implements ReactorSessionR
* @param id the {@link MongoSession#getId()} to delete
*/
@Override
public Mono<Void> delete(String id) {
public Mono<Void> deleteById(String id) {
return this.mongoOperations.remove(findSession(id), this.collectionName).then();
}

2
src/test/java/org/springframework/session/data/mongo/ReactiveMongoOperationsSessionRepositoryTest.java
View File

@@ -182,7 +182,7 @@ public class ReactiveMongoOperationsSessionRepositoryTest {
given(this.mongoOperations.remove((Mono<? extends Object>) any(), eq("sessions"))).willReturn(Mono.just(DeleteResult.acknowledged(1)));
// when
StepVerifier.create(this.repository.delete(sessionId))
StepVerifier.create(this.repository.deleteById(sessionId))
.expectNextMatches(aVoid -> {
// then
verify(this.mongoOperations).remove(any(Document.class),