Use GlideString

Signed-off-by: Andrew Carbonetto <[email protected]>
valkey-io · Jun 20, 2024 · c05ceae · c05ceae
1 parent 6db425f
commit c05ceae
Show file tree

Hide file tree

Showing 9 changed files with 71 additions and 54 deletions.
diff --git a/java/client/src/main/java/glide/api/BaseClient.java b/java/client/src/main/java/glide/api/BaseClient.java
@@ -426,7 +426,9 @@ protected <V> Map<String, V> handleMapResponse(Response response) throws RedisEx
         return handleRedisResponse(Map.class, EnumSet.of(ResponseFlags.ENCODING_UTF8), response);
     }
 
-    /** Get a map and convert {@link Map} keys from <code>byte[]</code> to {@link String}.
+    /**
+     * Get a map and convert {@link Map} keys from <code>byte[]</code> to {@link String}.
+     *
      * @param response A Protobuf response
      * @return A map of <code>GlideString</code> to <code>V</code>.
      * @param <V> Value type.
@@ -716,7 +718,7 @@ public CompletableFuture<Map<String, String>> hgetall(@NonNull String key) {
     @Override
     public CompletableFuture<Map<GlideString, GlideString>> hgetall(@NonNull GlideString key) {
         return commandManager.submitNewCommand(
-                HGetAll, new GlideString[] {key}, this::handleMapResponseBinary);
+                HGetAll, new GlideString[] {key}, this::handleBinaryMapResponse);
     }
 
     @Override

diff --git a/java/client/src/main/java/glide/api/RedisClient.java b/java/client/src/main/java/glide/api/RedisClient.java
@@ -1,6 +1,7 @@
 /** Copyright GLIDE-for-Redis Project Contributors - SPDX Identifier: Apache-2.0 */
 package glide.api;
 
+import static glide.api.models.GlideString.gs;
 import static glide.api.models.commands.function.FunctionListOptions.LIBRARY_NAME_REDIS_API;
 import static glide.api.models.commands.function.FunctionListOptions.WITH_CODE_REDIS_API;
 import static glide.api.models.commands.function.FunctionLoadOptions.REPLACE;
@@ -42,6 +43,7 @@
 import glide.api.commands.ScriptingAndFunctionsCommands;
 import glide.api.commands.ServerManagementCommands;
 import glide.api.commands.TransactionsCommands;
+import glide.api.models.GlideString;
 import glide.api.models.Transaction;
 import glide.api.models.commands.FlushMode;
 import glide.api.models.commands.InfoOptions;
@@ -50,7 +52,6 @@
 import glide.managers.CommandManager;
 import glide.managers.ConnectionManager;
 import java.util.Arrays;
-import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import lombok.NonNull;
@@ -278,21 +279,22 @@ public CompletableFuture<String> functionDelete(@NonNull String libName) {
 
     @Override
     public CompletableFuture<byte[]> functionDump() {
-        return commandManager.submitNewCommand(FunctionDump, List.of(), this::handleBytesResponse);
+        return commandManager.submitNewCommand(
+                FunctionDump, new GlideString[0], response -> handleBytesResponse(response).getBytes());
     }
 
     @Override
     public CompletableFuture<String> functionRestore(byte @NonNull [] payload) {
         return commandManager.submitNewCommand(
-                FunctionRestore, List.of(payload), this::handleStringResponse);
+                FunctionRestore, new GlideString[] {gs(payload)}, this::handleStringResponse);
     }
 
     @Override
     public CompletableFuture<String> functionRestore(
             byte @NonNull [] payload, @NonNull FunctionRestorePolicy policy) {
         return commandManager.submitNewCommand(
                 FunctionRestore,
-                List.of(payload, policy.toString().getBytes()),
+                new GlideString[] {gs(payload), gs(policy.toString().getBytes())},
                 this::handleStringResponse);
     }
 

diff --git a/java/client/src/main/java/glide/api/RedisClusterClient.java b/java/client/src/main/java/glide/api/RedisClusterClient.java
@@ -2,6 +2,7 @@
 package glide.api;
 
 import static glide.api.commands.ServerManagementCommands.VERSION_REDIS_API;
+import static glide.api.models.GlideString.gs;
 import static glide.api.models.commands.function.FunctionListOptions.LIBRARY_NAME_REDIS_API;
 import static glide.api.models.commands.function.FunctionListOptions.WITH_CODE_REDIS_API;
 import static glide.api.models.commands.function.FunctionLoadOptions.REPLACE;
@@ -45,6 +46,7 @@
 import glide.api.commands.TransactionsClusterCommands;
 import glide.api.models.ClusterTransaction;
 import glide.api.models.ClusterValue;
+import glide.api.models.GlideString;
 import glide.api.models.commands.FlushMode;
 import glide.api.models.commands.InfoOptions;
 import glide.api.models.commands.function.FunctionRestorePolicy;
@@ -55,7 +57,6 @@
 import glide.managers.ConnectionManager;
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
@@ -583,49 +584,49 @@ public CompletableFuture<String> functionDelete(@NonNull String libName, @NonNul
     public CompletableFuture<ClusterValue<byte[]>> functionDump() {
         return commandManager.submitNewCommand(
                 FunctionDump,
-                List.of(),
-                response -> ClusterValue.ofMultiValue(handleBinaryMapResponse(response)));
+                new GlideString[] {},
+                response -> ClusterValue.ofMultiValueBinary(handleBinaryMapResponse(response)));
     }
 
     @Override
     public CompletableFuture<ClusterValue<byte[]>> functionDump(@NonNull Route route) {
         return commandManager.submitNewCommand(
                 FunctionDump,
-                List.of(),
+                new GlideString[] {},
                 route,
                 response ->
                         route instanceof SingleNodeRoute
-                                ? ClusterValue.ofSingleValue(handleBytesResponse(response))
-                                : ClusterValue.ofMultiValue(handleBinaryMapResponse(response)));
+                                ? ClusterValue.ofSingleValue(handleBytesResponse(response).getBytes())
+                                : ClusterValue.ofMultiValueBinary(handleBinaryMapResponse(response)));
     }
 
     @Override
     public CompletableFuture<String> functionRestore(byte @NonNull [] payload) {
         return commandManager.submitNewCommand(
-                FunctionRestore, List.of(payload), this::handleStringResponse);
+                FunctionRestore, new GlideString[] {gs(payload)}, this::handleStringResponse);
     }
 
     @Override
     public CompletableFuture<String> functionRestore(
             byte @NonNull [] payload, @NonNull FunctionRestorePolicy policy) {
         return commandManager.submitNewCommand(
                 FunctionRestore,
-                List.of(payload, policy.toString().getBytes()),
+                new GlideString[] {gs(payload), gs(policy.toString().getBytes())},
                 this::handleStringResponse);
     }
 
     @Override
     public CompletableFuture<String> functionRestore(byte @NonNull [] payload, @NonNull Route route) {
         return commandManager.submitNewCommand(
-                FunctionRestore, List.of(payload), route, this::handleStringResponse);
+                FunctionRestore, new GlideString[] {gs(payload)}, route, this::handleStringResponse);
     }
 
     @Override
     public CompletableFuture<String> functionRestore(
             byte @NonNull [] payload, @NonNull FunctionRestorePolicy policy, @NonNull Route route) {
         return commandManager.submitNewCommand(
                 FunctionRestore,
-                List.of(payload, policy.toString().getBytes()),
+                new GlideString[] {gs(payload), gs(policy.toString().getBytes())},
                 route,
                 this::handleStringResponse);
     }

diff --git a/java/client/src/main/java/glide/api/commands/ScriptingAndFunctionsClusterCommands.java b/java/client/src/main/java/glide/api/commands/ScriptingAndFunctionsClusterCommands.java
@@ -3,8 +3,8 @@
 
 import glide.api.models.ClusterValue;
 import glide.api.models.commands.FlushMode;
-import glide.api.models.configuration.ReadFrom;
 import glide.api.models.commands.function.FunctionRestorePolicy;
+import glide.api.models.configuration.ReadFrom;
 import glide.api.models.configuration.RequestRoutingConfiguration.Route;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;

diff --git a/java/client/src/main/java/glide/api/commands/ScriptingAndFunctionsCommands.java b/java/client/src/main/java/glide/api/commands/ScriptingAndFunctionsCommands.java
@@ -2,8 +2,8 @@
 package glide.api.commands;
 
 import glide.api.models.commands.FlushMode;
-import glide.api.models.configuration.ReadFrom;
 import glide.api.models.commands.function.FunctionRestorePolicy;
+import glide.api.models.configuration.ReadFrom;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 

diff --git a/java/client/src/main/java/glide/api/models/ClusterValue.java b/java/client/src/main/java/glide/api/models/ClusterValue.java
@@ -3,6 +3,7 @@
 
 import glide.api.models.configuration.RequestRoutingConfiguration.Route;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * Represents a returned value object from a Redis server with cluster-mode enabled. The response
@@ -68,6 +69,17 @@ public static <T> ClusterValue<T> ofMultiValue(Map<String, T> data) {
         return res;
     }
 
+    /** A constructor for the value. */
+    public static <T> ClusterValue<T> ofMultiValueBinary(Map<GlideString, T> data) {
+        var res = new ClusterValue<T>();
+        // the map node address can be converted to a string
+        Map<String, T> multiValue =
+                data.entrySet().stream()
+                        .collect(Collectors.toMap(e -> e.getKey().getString(), Map.Entry::getValue));
+        res.multiValue = multiValue;
+        return res;
+    }
+
     /**
      * Check that multi-value is stored in this object. Should be called prior to {@link
      * #getMultiValue()}.

diff --git a/java/client/src/test/java/glide/api/RedisClientTest.java b/java/client/src/test/java/glide/api/RedisClientTest.java
@@ -12,6 +12,7 @@
 import static glide.api.commands.SortedSetBaseCommands.WITH_SCORES_REDIS_API;
 import static glide.api.commands.SortedSetBaseCommands.WITH_SCORE_REDIS_API;
 import static glide.api.commands.StringBaseCommands.LEN_REDIS_API;
+import static glide.api.models.GlideString.gs;
 import static glide.api.models.commands.FlushMode.ASYNC;
 import static glide.api.models.commands.FlushMode.SYNC;
 import static glide.api.models.commands.LInsertOptions.InsertPosition.BEFORE;
@@ -229,6 +230,7 @@
 import static redis_request.RedisRequestOuterClass.RequestType.ZUnion;
 import static redis_request.RedisRequestOuterClass.RequestType.ZUnionStore;
 
+import glide.api.models.GlideString;
 import glide.api.models.Script;
 import glide.api.models.Transaction;
 import glide.api.models.commands.ConditionalChange;
@@ -5731,7 +5733,7 @@ public void functionDump_returns_success() {
         testResponse.complete(value);
 
         // match on protobuf request
-        when(commandManager.<byte[]>submitNewCommand(eq(FunctionDump), eq(List.of()), any()))
+        when(commandManager.<byte[]>submitNewCommand(eq(FunctionDump), eq(new GlideString[0]), any()))
                 .thenReturn(testResponse);
 
         // exercise
@@ -5748,13 +5750,12 @@ public void functionDump_returns_success() {
     public void functionRestore_returns_success() {
         // setup
         byte[] data = new byte[] {42};
-        List<byte[]> args = List.of(data);
         CompletableFuture<String> testResponse = new CompletableFuture<>();
         testResponse.complete(OK);
 
         // match on protobuf request
-        // TODO maybe use ByteArrayArgumentMatcher
-        when(commandManager.<String>submitNewCommand(eq(FunctionRestore), any(List.class), any()))
+        when(commandManager.<String>submitNewCommand(
+                        eq(FunctionRestore), eq(new GlideString[] {gs(data)}), any()))
                 .thenReturn(testResponse);
 
         // exercise
@@ -5771,12 +5772,12 @@ public void functionRestore_returns_success() {
     public void functionRestore_with_policy_returns_success() {
         // setup
         byte[] data = new byte[] {42};
-        List<byte[]> args = List.of(data, FunctionRestorePolicy.FLUSH.toString().getBytes());
+        GlideString[] args = {gs(data), gs(FunctionRestorePolicy.FLUSH.toString().getBytes())};
         CompletableFuture<String> testResponse = new CompletableFuture<>();
         testResponse.complete(OK);
 
         // match on protobuf request
-        when(commandManager.<String>submitNewCommand(eq(FunctionRestore), any(List.class), any()))
+        when(commandManager.<String>submitNewCommand(eq(FunctionRestore), eq(args), any()))
                 .thenReturn(testResponse);
 
         // exercise

diff --git a/java/client/src/test/java/glide/api/RedisClusterClientTest.java b/java/client/src/test/java/glide/api/RedisClusterClientTest.java
@@ -3,6 +3,7 @@
 
 import static glide.api.BaseClient.OK;
 import static glide.api.commands.ServerManagementCommands.VERSION_REDIS_API;
+import static glide.api.models.GlideString.gs;
 import static glide.api.models.commands.FlushMode.ASYNC;
 import static glide.api.models.commands.FlushMode.SYNC;
 import static glide.api.models.commands.function.FunctionListOptions.LIBRARY_NAME_REDIS_API;
@@ -48,6 +49,7 @@
 
 import glide.api.models.ClusterTransaction;
 import glide.api.models.ClusterValue;
+import glide.api.models.GlideString;
 import glide.api.models.commands.FlushMode;
 import glide.api.models.commands.InfoOptions;
 import glide.api.models.commands.function.FunctionLoadOptions;
@@ -58,7 +60,6 @@
 import glide.managers.ConnectionManager;
 import glide.managers.RedisExceptionCheckedFunction;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
@@ -1877,8 +1878,8 @@ public void functionDump_returns_success() {
 
         // match on protobuf request
         when(commandManager.<ClusterValue<byte[]>>submitNewCommand(
-            eq(FunctionDump), eq(List.of()), any()))
-            .thenReturn(testResponse);
+                        eq(FunctionDump), eq(new GlideString[0]), any()))
+                .thenReturn(testResponse);
 
         // exercise
         CompletableFuture<ClusterValue<byte[]>> response = service.functionDump();
@@ -1899,8 +1900,8 @@ public void functionDump_with_route_returns_success() {
 
         // match on protobuf request
         when(commandManager.<ClusterValue<byte[]>>submitNewCommand(
-            eq(FunctionDump), eq(List.of()), eq(RANDOM), any()))
-            .thenReturn(testResponse);
+                        eq(FunctionDump), eq(new GlideString[0]), eq(RANDOM), any()))
+                .thenReturn(testResponse);
 
         // exercise
         CompletableFuture<ClusterValue<byte[]>> response = service.functionDump(RANDOM);
@@ -1916,14 +1917,14 @@ public void functionDump_with_route_returns_success() {
     public void functionRestore_returns_success() {
         // setup
         byte[] data = new byte[] {42};
-        List<byte[]> args = List.of(data);
+        GlideString[] args = {gs(data)};
         CompletableFuture<String> testResponse = new CompletableFuture<>();
         testResponse.complete(OK);
 
         // match on protobuf request
         // TODO maybe use ByteArrayArgumentMatcher
-        when(commandManager.<String>submitNewCommand(eq(FunctionRestore), any(List.class), any()))
-            .thenReturn(testResponse);
+        when(commandManager.<String>submitNewCommand(eq(FunctionRestore), eq(args), any()))
+                .thenReturn(testResponse);
 
         // exercise
         CompletableFuture<String> response = service.functionRestore(data);
@@ -1939,13 +1940,13 @@ public void functionRestore_returns_success() {
     public void functionRestore_with_policy_returns_success() {
         // setup
         byte[] data = new byte[] {42};
-        List<byte[]> args = List.of(data, FunctionRestorePolicy.FLUSH.toString().getBytes());
+        GlideString[] args = {gs(data), gs(FunctionRestorePolicy.FLUSH.toString().getBytes())};
         CompletableFuture<String> testResponse = new CompletableFuture<>();
         testResponse.complete(OK);
 
         // match on protobuf request
-        when(commandManager.<String>submitNewCommand(eq(FunctionRestore), any(List.class), any()))
-            .thenReturn(testResponse);
+        when(commandManager.<String>submitNewCommand(eq(FunctionRestore), eq(args), any()))
+                .thenReturn(testResponse);
 
         // exercise
         CompletableFuture<String> response = service.functionRestore(data, FunctionRestorePolicy.FLUSH);
@@ -1961,15 +1962,14 @@ public void functionRestore_with_policy_returns_success() {
     public void functionRestore_with_route_returns_success() {
         // setup
         byte[] data = new byte[] {42};
-        List<byte[]> args = List.of(data);
+        GlideString[] args = {gs(data)};
         CompletableFuture<String> testResponse = new CompletableFuture<>();
         testResponse.complete(OK);
 
         // match on protobuf request
         // TODO maybe use ByteArrayArgumentMatcher
-        when(commandManager.<String>submitNewCommand(
-            eq(FunctionRestore), any(List.class), eq(RANDOM), any()))
-            .thenReturn(testResponse);
+        when(commandManager.<String>submitNewCommand(eq(FunctionRestore), eq(args), eq(RANDOM), any()))
+                .thenReturn(testResponse);
 
         // exercise
         CompletableFuture<String> response = service.functionRestore(data, RANDOM);
@@ -1985,18 +1985,17 @@ public void functionRestore_with_route_returns_success() {
     public void functionRestore_with_policy_and_route_returns_success() {
         // setup
         byte[] data = new byte[] {42};
-        List<byte[]> args = List.of(data, FunctionRestorePolicy.FLUSH.toString().getBytes());
+        GlideString[] args = {gs(data), gs(FunctionRestorePolicy.FLUSH.toString().getBytes())};
         CompletableFuture<String> testResponse = new CompletableFuture<>();
         testResponse.complete(OK);
 
         // match on protobuf request
-        when(commandManager.<String>submitNewCommand(
-            eq(FunctionRestore), any(List.class), eq(RANDOM), any()))
-            .thenReturn(testResponse);
+        when(commandManager.<String>submitNewCommand(eq(FunctionRestore), eq(args), eq(RANDOM), any()))
+                .thenReturn(testResponse);
 
         // exercise
         CompletableFuture<String> response =
-            service.functionRestore(data, FunctionRestorePolicy.FLUSH, RANDOM);
+                service.functionRestore(data, FunctionRestorePolicy.FLUSH, RANDOM);
         String payload = response.get();
 
         // verify