From 0928343bd1ea4e88011519017b5202fcadb3b884 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 1 Nov 2023 09:11:18 +0100
Subject: [PATCH] Upgrade to Reactor 3.6.0-RC1 #2517

---
 pom.xml                                       | 12 ++++++++++-
 ...actionReactiveCommandIntegrationTests.java | 20 +++++++++----------
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index 47389603e6..cd933bd8d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,7 +66,7 @@
         <mockito.version>4.9.0</mockito.version>
         <netty.version>4.1.96.Final</netty.version>
         <openwebbeans.version>2.0.27</openwebbeans.version>
-        <reactor.version>3.4.29</reactor.version>
+        <reactor.version>3.6.0-RC1</reactor.version>
         <rxjava.version>1.3.8</rxjava.version>
         <rxjava-reactive-streams.version>1.2.1</rxjava-reactive-streams.version>
         <rxjava2.version>2.2.21</rxjava2.version>
@@ -101,6 +101,16 @@
         </repository>
     </distributionManagement>
 
+    <repositories>
+        <repository>
+            <id>spring-milestone</id>
+            <url>https://repo.spring.io/milestone</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+
     <dependencyManagement>
         <dependencies>
 
diff --git a/src/test/java/io/lettuce/core/commands/reactive/TransactionReactiveCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/reactive/TransactionReactiveCommandIntegrationTests.java
index 9bb254f8fd..1c13a7b5d1 100644
--- a/src/test/java/io/lettuce/core/commands/reactive/TransactionReactiveCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/reactive/TransactionReactiveCommandIntegrationTests.java
@@ -21,7 +21,6 @@
 
 import org.junit.jupiter.api.Test;
 
-import reactor.test.StepVerifier;
 import io.lettuce.core.KeyValue;
 import io.lettuce.core.RedisClient;
 import io.lettuce.core.RedisException;
@@ -29,6 +28,7 @@
 import io.lettuce.core.api.reactive.RedisReactiveCommands;
 import io.lettuce.core.commands.TransactionCommandIntegrationTests;
 import io.lettuce.test.ReactiveSyncInvocationHandler;
+import reactor.test.StepVerifier;
 
 /**
  * @author Mark Paluch
@@ -54,7 +54,7 @@ void discard() {
 
         StepVerifier.create(commands.multi()).expectNext("OK").verifyComplete();
 
-        commands.set(key, value).toProcessor();
+        commands.set(key, value).toFuture();
 
         StepVerifier.create(commands.discard()).expectNext("OK").verifyComplete();
         StepVerifier.create(commands.get(key)).verifyComplete();
@@ -70,7 +70,7 @@ void watchRollback() {
         StepVerifier.create(commands.watch(key)).expectNext("OK").verifyComplete();
         StepVerifier.create(commands.multi()).expectNext("OK").verifyComplete();
 
-        commands.set(key, value).toProcessor();
+        commands.set(key, value).toFuture();
 
         otherConnection.sync().del(key);
 
@@ -97,9 +97,9 @@ void execSingular() {
     void errorInMulti() {
 
         StepVerifier.create(commands.multi()).expectNext("OK").verifyComplete();
-        commands.set(key, value).toProcessor();
-        commands.lpop(key).toProcessor();
-        commands.get(key).toProcessor();
+        commands.set(key, value).toFuture();
+        commands.lpop(key).toFuture();
+        commands.get(key).toFuture();
 
         StepVerifier.create(commands.exec()).consumeNextWith(actual -> {
 
@@ -135,10 +135,10 @@ void resultOfMultiIsContainedInExecObservable() {
 
         StepVerifier.create(commands.multi()).expectNext("OK").verifyComplete();
 
-        commands.set("key1", "value1").toProcessor();
-        commands.set("key2", "value2").toProcessor();
-        commands.mget("key1", "key2").collectList().toProcessor();
-        commands.llen("something").toProcessor();
+        commands.set("key1", "value1").toFuture();
+        commands.set("key2", "value2").toFuture();
+        commands.mget("key1", "key2").collectList().toFuture();
+        commands.llen("something").toFuture();
 
         StepVerifier.create(commands.exec()).consumeNextWith(actual -> {