Java: Fix routing for FLUSHALL and FLUSHDB. (valkey-io#1608)

Fix routing for `FLUSHALL` and `FLUSHDB`. (#379) Signed-off-by: Yury-Fridlyand <[email protected]>
Bit-Quill · Jun 20, 2024 · 48ed143 · 48ed143
1 parent 50e5ff3
commit 48ed143
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 15 deletions.
diff --git a/java/client/src/main/java/glide/api/RedisClusterClient.java b/java/client/src/main/java/glide/api/RedisClusterClient.java
@@ -336,14 +336,13 @@ public CompletableFuture<String> flushall(@NonNull FlushMode mode) {
     }
 
     @Override
-    public CompletableFuture<String> flushall(@NonNull SingleNodeRoute route) {
+    public CompletableFuture<String> flushall(@NonNull Route route) {
         return commandManager.submitNewCommand(
                 FlushAll, new String[0], route, this::handleStringResponse);
     }
 
     @Override
-    public CompletableFuture<String> flushall(
-            @NonNull FlushMode mode, @NonNull SingleNodeRoute route) {
+    public CompletableFuture<String> flushall(@NonNull FlushMode mode, @NonNull Route route) {
         return commandManager.submitNewCommand(
                 FlushAll, new String[] {mode.toString()}, route, this::handleStringResponse);
     }
@@ -360,14 +359,13 @@ public CompletableFuture<String> flushdb(@NonNull FlushMode mode) {
     }
 
     @Override
-    public CompletableFuture<String> flushdb(@NonNull SingleNodeRoute route) {
+    public CompletableFuture<String> flushdb(@NonNull Route route) {
         return commandManager.submitNewCommand(
                 FlushDB, new String[0], route, this::handleStringResponse);
     }
 
     @Override
-    public CompletableFuture<String> flushdb(
-            @NonNull FlushMode mode, @NonNull SingleNodeRoute route) {
+    public CompletableFuture<String> flushdb(@NonNull FlushMode mode, @NonNull Route route) {
         return commandManager.submitNewCommand(
                 FlushDB, new String[] {mode.toString()}, route, this::handleStringResponse);
     }

diff --git a/java/client/src/main/java/glide/api/commands/ServerManagementClusterCommands.java b/java/client/src/main/java/glide/api/commands/ServerManagementClusterCommands.java
@@ -6,7 +6,6 @@
 import glide.api.models.commands.InfoOptions;
 import glide.api.models.commands.InfoOptions.Section;
 import glide.api.models.configuration.RequestRoutingConfiguration.Route;
-import glide.api.models.configuration.RequestRoutingConfiguration.SingleNodeRoute;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 
@@ -353,7 +352,7 @@ public interface ServerManagementClusterCommands {
      *
      * @see <a href="https://valkey.io/commands/flushall/">valkey.io</a> for details.
      * @param route Specifies the routing configuration for the command. The client will route the
-     *     command to the node defined by <code>route</code>.
+     *     command to the nodes defined by <code>route</code>.
      * @return <code>OK</code>.
      * @example
      *     <pre>{@code
@@ -362,7 +361,7 @@ public interface ServerManagementClusterCommands {
      * assert response.equals("OK");
      * }</pre>
      */
-    CompletableFuture<String> flushall(SingleNodeRoute route);
+    CompletableFuture<String> flushall(Route route);
 
     /**
      * Deletes all the keys of all the existing databases. This command never fails.
@@ -371,7 +370,7 @@ public interface ServerManagementClusterCommands {
      * @param mode The flushing mode, could be either {@link FlushMode#SYNC} or {@link
      *     FlushMode#ASYNC}.
      * @param route Specifies the routing configuration for the command. The client will route the
-     *     command to the node defined by <code>route</code>.
+     *     command to the nodes defined by <code>route</code>.
      * @return <code>OK</code>.
      * @example
      *     <pre>{@code
@@ -380,7 +379,7 @@ public interface ServerManagementClusterCommands {
      * assert response.equals("OK");
      * }</pre>
      */
-    CompletableFuture<String> flushall(FlushMode mode, SingleNodeRoute route);
+    CompletableFuture<String> flushall(FlushMode mode, Route route);
 
     /**
      * Deletes all the keys of the currently selected database. This command never fails.<br>
@@ -417,7 +416,7 @@ public interface ServerManagementClusterCommands {
      *
      * @see <a href="https://valkey.io/commands/flushdb/">valkey.io</a> for details.
      * @param route Specifies the routing configuration for the command. The client will route the
-     *     command to the node defined by <code>route</code>.
+     *     command to the nodes defined by <code>route</code>.
      * @return <code>OK</code>.
      * @example
      *     <pre>{@code
@@ -426,7 +425,7 @@ public interface ServerManagementClusterCommands {
      * assert response.equals("OK");
      * }</pre>
      */
-    CompletableFuture<String> flushdb(SingleNodeRoute route);
+    CompletableFuture<String> flushdb(Route route);
 
     /**
      * Deletes all the keys of the currently selected database. This command never fails.
@@ -435,7 +434,7 @@ public interface ServerManagementClusterCommands {
      * @param mode The flushing mode, could be either {@link FlushMode#SYNC} or {@link
      *     FlushMode#ASYNC}.
      * @param route Specifies the routing configuration for the command. The client will route the
-     *     command to the node defined by <code>route</code>.
+     *     command to the nodes defined by <code>route</code>.
      * @return <code>OK</code>.
      * @example
      *     <pre>{@code
@@ -444,7 +443,7 @@ public interface ServerManagementClusterCommands {
      * assert response.equals("OK");
      * }</pre>
      */
-    CompletableFuture<String> flushdb(FlushMode mode, SingleNodeRoute route);
+    CompletableFuture<String> flushdb(FlushMode mode, Route route);
 
     /**
      * Displays a piece of generative computer art and the Redis version.<br>