Deprecate Remove JedisClusterHostAndPortMap #2518 (#2535)

redis · May 13, 2021 · 6dedfba · 6dedfba
1 parent e07baae
commit 6dedfba
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 19 deletions.
diff --git a/src/main/java/redis/clients/jedis/BinaryJedisCluster.java b/src/main/java/redis/clients/jedis/BinaryJedisCluster.java
@@ -108,7 +108,7 @@ public BinaryJedisCluster(Set<HostAndPort> jedisClusterNode, int connectionTimeo
   }
 
   /**
-   * @deprecated This constructor will be removed in future.
+   * @deprecated This constructor will be removed in next major release.
    */
   @Deprecated
   public BinaryJedisCluster(Set<HostAndPort> jedisClusterNode, int connectionTimeout,
@@ -121,7 +121,7 @@ public BinaryJedisCluster(Set<HostAndPort> jedisClusterNode, int connectionTimeo
   }
 
   /**
-   * @deprecated This constructor will be removed in future.
+   * @deprecated This constructor will be removed in next major release.
    */
   @Deprecated
   public BinaryJedisCluster(Set<HostAndPort> jedisClusterNode, int connectionTimeout,
@@ -135,7 +135,7 @@ public BinaryJedisCluster(Set<HostAndPort> jedisClusterNode, int connectionTimeo
   }
 
   /**
-   * @deprecated This constructor will be removed in future.
+   * @deprecated This constructor will be removed in next major release.
    */
   @Deprecated
   public BinaryJedisCluster(Set<HostAndPort> jedisClusterNode, int connectionTimeout,
@@ -151,7 +151,7 @@ public BinaryJedisCluster(Set<HostAndPort> jedisClusterNode, int connectionTimeo
   /**
    * @param maxTotalRetriesDuration After this amount of time we will do no more retries and report
    * the operation as failed.
-   * @deprecated This constructor will be removed in future.
+   * @deprecated This constructor will be removed in next major release.
    */
   @Deprecated
   public BinaryJedisCluster(Set<HostAndPort> jedisClusterNode, int connectionTimeout, int soTimeout,

diff --git a/src/main/java/redis/clients/jedis/JedisCluster.java b/src/main/java/redis/clients/jedis/JedisCluster.java
@@ -89,7 +89,7 @@ public JedisCluster(HostAndPort node, int connectionTimeout, int soTimeout, int
   }
 
   /**
-   * @deprecated This constructor will be removed in future.
+   * @deprecated This constructor will be removed in next major release.
    */
   @Deprecated
   public JedisCluster(HostAndPort node, int connectionTimeout, int soTimeout, int maxAttempts,
@@ -102,7 +102,7 @@ public JedisCluster(HostAndPort node, int connectionTimeout, int soTimeout, int
   }
 
   /**
-   * @deprecated This constructor will be removed in future.
+   * @deprecated This constructor will be removed in next major release.
    */
   @Deprecated
   public JedisCluster(HostAndPort node, int connectionTimeout, int soTimeout, int maxAttempts,
@@ -192,7 +192,7 @@ public JedisCluster(Set<HostAndPort> jedisClusterNode, int connectionTimeout, in
   }
 
   /**
-   * @deprecated This constructor will be removed in future.
+   * @deprecated This constructor will be removed in next major release.
    */
   @Deprecated
   public JedisCluster(Set<HostAndPort> jedisClusterNode, int connectionTimeout, int soTimeout,
@@ -205,7 +205,7 @@ public JedisCluster(Set<HostAndPort> jedisClusterNode, int connectionTimeout, in
   }
 
   /**
-   * @deprecated This constructor will be removed in future.
+   * @deprecated This constructor will be removed in next major release.
    */
   @Deprecated
   public JedisCluster(Set<HostAndPort> jedisClusterNode, int connectionTimeout, int soTimeout,
@@ -219,7 +219,7 @@ public JedisCluster(Set<HostAndPort> jedisClusterNode, int connectionTimeout, in
   }
 
   /**
-   * @deprecated This constructor will be removed in future.
+   * @deprecated This constructor will be removed in next major release.
    */
   @Deprecated
   public JedisCluster(Set<HostAndPort> jedisClusterNode, int connectionTimeout, int soTimeout,
@@ -232,7 +232,7 @@ public JedisCluster(Set<HostAndPort> jedisClusterNode, int connectionTimeout, in
   }
 
   /**
-   * @deprecated This constructor will be removed in future.
+   * @deprecated This constructor will be removed in next major release.
    */
   @Deprecated
   public JedisCluster(Set<HostAndPort> jedisClusterNode, int connectionTimeout, int soTimeout,
@@ -248,7 +248,7 @@ public JedisCluster(Set<HostAndPort> jedisClusterNode, int connectionTimeout, in
   /**
    * @param maxTotalRetriesDuration After this amount of time we will do no more retries and report
    * the operation as failed.
-   * @deprecated This constructor will be removed in future.
+   * @deprecated This constructor will be removed in next major release.
    */
   @Deprecated
   public JedisCluster(Set<HostAndPort> jedisClusterNode, int connectionTimeout, int soTimeout,

diff --git a/src/main/java/redis/clients/jedis/JedisClusterConnectionHandler.java b/src/main/java/redis/clients/jedis/JedisClusterConnectionHandler.java
@@ -42,7 +42,7 @@ public JedisClusterConnectionHandler(Set<HostAndPort> nodes,
   }
 
   /**
-   * @deprecated This constructor will be removed in future.
+   * @deprecated This constructor will be removed in next major release.
    */
   @Deprecated
   public JedisClusterConnectionHandler(Set<HostAndPort> nodes,
@@ -55,7 +55,7 @@ public JedisClusterConnectionHandler(Set<HostAndPort> nodes,
   }
 
   /**
-   * @deprecated This constructor will be removed in future.
+   * @deprecated This constructor will be removed in next major release.
    */
   @Deprecated
   public JedisClusterConnectionHandler(Set<HostAndPort> nodes,
@@ -68,7 +68,7 @@ public JedisClusterConnectionHandler(Set<HostAndPort> nodes,
   }
 
   /**
-   * @deprecated This constructor will be removed in future.
+   * @deprecated This constructor will be removed in next major release.
    */
   @Deprecated
   public JedisClusterConnectionHandler(Set<HostAndPort> nodes,
@@ -89,7 +89,7 @@ public JedisClusterConnectionHandler(Set<HostAndPort> nodes,
   }
 
   /**
-   * @deprecated This constructor will be removed in future.
+   * @deprecated This constructor will be removed in next major release.
    */
   @Deprecated
   public JedisClusterConnectionHandler(Set<HostAndPort> nodes,

diff --git a/src/main/java/redis/clients/jedis/JedisClusterHostAndPortMap.java b/src/main/java/redis/clients/jedis/JedisClusterHostAndPortMap.java
@@ -1,7 +1,7 @@
 package redis.clients.jedis;
 
 /**
- * @deprecated This will be removed in future. Prefer to use {@link HostAndPortMapper} instead.
+ * @deprecated This interface will be removed in next major release. Use {@link HostAndPortMapper}.
  */
 @Deprecated
 public interface JedisClusterHostAndPortMap extends HostAndPortMapper {

diff --git a/src/main/java/redis/clients/jedis/JedisClusterInfoCache.java b/src/main/java/redis/clients/jedis/JedisClusterInfoCache.java
@@ -64,7 +64,7 @@ public JedisClusterInfoCache(final GenericObjectPoolConfig<Jedis> poolConfig,
   }
 
   /**
-   * @deprecated This constructor will be removed in future.
+   * @deprecated This constructor will be removed in next major release.
    */
   @Deprecated
   public JedisClusterInfoCache(final GenericObjectPoolConfig<Jedis> poolConfig,
@@ -86,7 +86,7 @@ public JedisClusterInfoCache(final GenericObjectPoolConfig<Jedis> poolConfig,
   }
 
   /**
-   * @deprecated This constructor will be removed in future.
+   * @deprecated This constructor will be removed in next major release.
    */
   @Deprecated
   public JedisClusterInfoCache(final GenericObjectPoolConfig<Jedis> poolConfig,
@@ -108,7 +108,7 @@ public JedisClusterInfoCache(final GenericObjectPoolConfig<Jedis> poolConfig,
   }
 
   /**
-   * @deprecated This constructor will be removed in future.
+   * @deprecated This constructor will be removed in next major release.
    */
   @Deprecated
   public JedisClusterInfoCache(final GenericObjectPoolConfig<Jedis> poolConfig,

diff --git a/src/main/java/redis/clients/jedis/JedisSlotBasedConnectionHandler.java b/src/main/java/redis/clients/jedis/JedisSlotBasedConnectionHandler.java
@@ -48,6 +48,10 @@ public JedisSlotBasedConnectionHandler(Set<HostAndPort> nodes,
         clientName);
   }
 
+  /**
+   * @deprecated This constructor will be removed in next major release.
+   */
+  @Deprecated
   public JedisSlotBasedConnectionHandler(Set<HostAndPort> nodes,
       GenericObjectPoolConfig<Jedis> poolConfig, int connectionTimeout, int soTimeout,
       String password, String clientName, boolean ssl, SSLSocketFactory sslSocketFactory,
@@ -57,6 +61,10 @@ public JedisSlotBasedConnectionHandler(Set<HostAndPort> nodes,
         sslSocketFactory, sslParameters, hostnameVerifier, portMap);
   }
 
+  /**
+   * @deprecated This constructor will be removed in next major release.
+   */
+  @Deprecated
   public JedisSlotBasedConnectionHandler(Set<HostAndPort> nodes,
       GenericObjectPoolConfig<Jedis> poolConfig, int connectionTimeout, int soTimeout, String user,
       String password, String clientName, boolean ssl, SSLSocketFactory sslSocketFactory,
@@ -66,6 +74,10 @@ public JedisSlotBasedConnectionHandler(Set<HostAndPort> nodes,
         sslSocketFactory, sslParameters, hostnameVerifier, portMap);
   }
 
+  /**
+   * @deprecated This constructor will be removed in next major release.
+   */
+  @Deprecated
   public JedisSlotBasedConnectionHandler(Set<HostAndPort> nodes,
       GenericObjectPoolConfig<Jedis> poolConfig, int connectionTimeout, int soTimeout,
       int infiniteSoTimeout, String user, String password, String clientName, boolean ssl,