From 5d0deb1d40643d344eecba26e6ad97bc8d160971 Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Wed, 18 May 2022 13:09:44 +0200 Subject: [PATCH] Remove unused imports and update reference documentation. Original Pull Request: #2287 --- src/main/asciidoc/upgrading.adoc | 19 +++++++++++++++++++ ...StaticMasterReplicaConnectionProvider.java | 1 - 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/main/asciidoc/upgrading.adoc b/src/main/asciidoc/upgrading.adoc index 347206f93..fbbabef03 100644 --- a/src/main/asciidoc/upgrading.adoc +++ b/src/main/asciidoc/upgrading.adoc @@ -1,6 +1,8 @@ [[upgrading]] = Upgrading +The following section provides information about changes that are likely to have an effect on the application and might even prevent it from compiling. + === Re-/moved Types |=== @@ -184,6 +186,14 @@ |setShardInfo |_can be set via JedisClientConfiguration_ +|o.s.d.redis.connection.jedis.JedisConnectionFactory +|createCluster +|_now requires a `Connection` instead of `Jedis` instance_ + +|o.s.d.redis.connection.jedis.JedisConverters +| +|has package visibility now + |o.s.d.redis.connection.jedis.JedisConverters |tuplesToTuples |- @@ -231,3 +241,12 @@ This effects methods on `LettuceConnectionFactory` and `LettuceConnection`. `AuthenticatingRedisClient` has been removed without replacement. Please refer to the https://lettuce.io/core/release/reference/index.html#basic.redisuri[driver documentation] for `RedisURI` to set authentication data. + +== Jedis + +Please read the Jedis https://github.com/redis/jedis/blob/v4.0.0/docs/3to4.md[upgrading guide] which covers important driver changes. + +=== Transactions / Pipelining + +Pipelining and Transactions are now mutually exclusive. +The usage of server or connection commands in pipeline/transactions mode is no longer possible. diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/StaticMasterReplicaConnectionProvider.java b/src/main/java/org/springframework/data/redis/connection/lettuce/StaticMasterReplicaConnectionProvider.java index 0e2cbcfee..475cb476f 100644 --- a/src/main/java/org/springframework/data/redis/connection/lettuce/StaticMasterReplicaConnectionProvider.java +++ b/src/main/java/org/springframework/data/redis/connection/lettuce/StaticMasterReplicaConnectionProvider.java @@ -29,7 +29,6 @@ import java.util.Optional; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; -import org.springframework.dao.InvalidDataAccessApiUsageException; import org.springframework.lang.Nullable; /**