Rework

Signed-off-by: Yury-Fridlyand <[email protected]>
Bit-Quill · Jan 22, 2024 · 2b05632 · 2b05632
1 parent 6cbc27f
commit 2b05632
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 28 deletions.
diff --git a/java/client/src/main/java/glide/api/BaseClient.java b/java/client/src/main/java/glide/api/BaseClient.java
@@ -5,21 +5,15 @@
 import glide.managers.CommandManager;
 import glide.managers.ConnectionManager;
 import java.util.concurrent.ExecutionException;
-import java.util.function.Function;
 import lombok.AllArgsConstructor;
 import response.ResponseOuterClass.Response;
 
-/**
- * Base Client class for Redis
- *
- * @param <T> The data return type.
- */
+/** Base Client class for Redis */
 @AllArgsConstructor
-public abstract class BaseClient<T> implements AutoCloseable {
+public abstract class BaseClient implements AutoCloseable {
 
     protected final ConnectionManager connectionManager;
     protected final CommandManager commandManager;
-    protected final Function<Object, T> dataConverter;
 
     /**
      * Extracts the response from the Protobuf response and either throws an exception or returns the
@@ -28,10 +22,9 @@ public abstract class BaseClient<T> implements AutoCloseable {
      * @param response Redis protobuf message
      * @return Response Object
      */
-    protected T handleObjectResponse(Response response) {
+    protected Object handleObjectResponse(Response response) {
         // convert protobuf response into Object and then Object into T
-        return dataConverter.apply(
-                new BaseCommandResponseResolver(RedisValueResolver::valueFromPointer).apply(response));
+        return new BaseCommandResponseResolver(RedisValueResolver::valueFromPointer).apply(response);
     }
 
     /**

diff --git a/java/client/src/main/java/glide/api/ClusterClient.java b/java/client/src/main/java/glide/api/ClusterClient.java
@@ -18,11 +18,10 @@
  * Async (non-blocking) client for Redis in Cluster mode. Use {@link #CreateClient} to request a
  * client to Redis.
  */
-public class ClusterClient extends BaseClient<RedisValue>
-        implements ClusterBaseCommands<RedisValue> {
+public class ClusterClient extends BaseClient implements ClusterBaseCommands<RedisValue<Object>> {
 
     protected ClusterClient(ConnectionManager connectionManager, CommandManager commandManager) {
-        super(connectionManager, commandManager, RedisValue::of);
+        super(connectionManager, commandManager);
     }
 
     /**
@@ -43,16 +42,18 @@ public static CompletableFuture<ClusterClient> CreateClient(
     }
 
     @Override
-    public CompletableFuture<RedisValue> customCommand(String[] args) {
+    public CompletableFuture<RedisValue<Object>> customCommand(String[] args) {
         Command command =
                 Command.builder().requestType(Command.RequestType.CUSTOM_COMMAND).arguments(args).build();
-        return commandManager.submitNewCommand(command, this::handleObjectResponse);
+        return commandManager.submitNewCommand(
+                command, obj -> RedisValue.of(handleObjectResponse(obj)));
     }
 
     @Override
-    public CompletableFuture<RedisValue> customCommand(String[] args, Route route) {
+    public CompletableFuture<RedisValue<Object>> customCommand(String[] args, Route route) {
         Command command =
                 Command.builder().requestType(Command.RequestType.CUSTOM_COMMAND).arguments(args).build();
-        return commandManager.submitNewCommand(command, this::handleObjectResponse, route);
+        return commandManager.submitNewCommand(
+                command, obj -> RedisValue.of(handleObjectResponse(obj)), route);
     }
 }
diff --git a/java/client/src/main/java/glide/api/RedisClient.java b/java/client/src/main/java/glide/api/RedisClient.java
@@ -15,10 +15,10 @@
  * Async (non-blocking) client for Redis in Standalone mode. Use {@link #CreateClient} to request a
  * client to Redis.
  */
-public class RedisClient extends BaseClient<Object> implements BaseCommands<Object> {
+public class RedisClient extends BaseClient implements BaseCommands<Object> {
 
     protected RedisClient(ConnectionManager connectionManager, CommandManager commandManager) {
-        super(connectionManager, commandManager, obj -> obj);
+        super(connectionManager, commandManager);
     }
 
     /**

diff --git a/java/client/src/main/java/glide/api/models/RedisValue.java b/java/client/src/main/java/glide/api/models/RedisValue.java
@@ -3,24 +3,28 @@
 import java.util.Map;
 import lombok.Getter;
 
-/** A union-like type which can store single or bulk value retrieved from Redis. */
+/**
+ * A union-like type which can store single or bulk value retrieved from Redis.
+ *
+ * @param <T> The wrapped data type
+ */
 @Getter
-public class RedisValue {
+public class RedisValue<T> {
     /** Get per-node value. */
-    private Map<String, Object> multiValue = null;
+    private Map<String, T> multiValue = null;
 
     /** Get the single value. */
-    private Object singleValue = null;
+    private T singleValue = null;
 
     private RedisValue() {}
 
     @SuppressWarnings("unchecked")
-    public static RedisValue of(Object data) {
-        var res = new RedisValue();
+    public static <T> RedisValue<T> of(Object data) {
+        var res = new RedisValue<T>();
         if (data instanceof Map) {
-            res.multiValue = (Map<String, Object>) data;
+            res.multiValue = (Map<String, T>) data;
         } else {
-            res.singleValue = data;
+            res.singleValue = (T) data;
         }
         return res;
     }