From eec5342d393d010a8076ca54f336762a75152e38 Mon Sep 17 00:00:00 2001
From: Greg Turnquist <gturnquist@pivotal.io>
Date: Wed, 13 Sep 2017 16:18:15 -0500
Subject: [PATCH] Adjust for Spring 5.0.0.RC4

---
 pom.xml                                                       | 2 +-
 .../data/mongo/ReactiveMongoOperationsSessionRepository.java  | 4 ++--
 .../mongo/ReactiveMongoOperationsSessionRepositoryTest.java   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1ed2a86..a9894e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
diff --git a/src/main/java/org/springframework/session/data/mongo/ReactiveMongoOperationsSessionRepository.java b/src/main/java/org/springframework/session/data/mongo/ReactiveMongoOperationsSessionRepository.java
index df7bbe6..e32949a 100644
--- a/src/main/java/org/springframework/session/data/mongo/ReactiveMongoOperationsSessionRepository.java
+++ b/src/main/java/org/springframework/session/data/mongo/ReactiveMongoOperationsSessionRepository.java
@@ -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();
 	}
 
diff --git a/src/test/java/org/springframework/session/data/mongo/ReactiveMongoOperationsSessionRepositoryTest.java b/src/test/java/org/springframework/session/data/mongo/ReactiveMongoOperationsSessionRepositoryTest.java
index 949fe0e..95a53c1 100644
--- a/src/test/java/org/springframework/session/data/mongo/ReactiveMongoOperationsSessionRepositoryTest.java
+++ b/src/test/java/org/springframework/session/data/mongo/ReactiveMongoOperationsSessionRepositoryTest.java
@@ -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),