Clean up for rebase

Signed-off-by: Andrew Carbonetto <[email protected]>

java/client/src/main/java/glide/api/BaseClient.java

@@ -1,9 +1,11 @@
 package glide.api;
 
+import glide.api.models.exceptions.RedisException;
 import glide.ffi.resolvers.RedisValueResolver;
 import glide.managers.BaseCommandResponseResolver;
 import glide.managers.CommandManager;
 import glide.managers.ConnectionManager;
+import java.util.HashMap;
 import java.util.concurrent.ExecutionException;
 import lombok.AllArgsConstructor;
 import response.ResponseOuterClass.Response;
@@ -28,6 +30,59 @@ protected static Object handleObjectResponse(Response response) {
         return (new BaseCommandResponseResolver(RedisValueResolver::valueFromPointer)).apply(response);
     }
 
+    /**
+     * Check for errors in the Response and return null Throws an error if an unexpected value is
+     * returned
+     *
+     * @return null if the response is empty
+     */
+    protected static Void handleVoidResponse(Response response) {
+        Object value = handleObjectResponse(response);
+        if (value == null) {
+            return null;
+        }
+        throw new RedisException(
+                "Unexpected return type from Redis: got "
+                        + value.getClass().getSimpleName()
+                        + " expected null");
+    }
+
+    /**
+     * Extracts the response value from the Redis response and either throws an exception or returns
+     * the value as a String.
+     *
+     * @param response Redis protobuf message
+     * @return Response as a String
+     */
+    protected static String handleStringResponse(Response response) {
+        Object value = handleObjectResponse(response);
+        if (value instanceof String) {
+            return (String) value;
+        }
+        throw new RedisException(
+                "Unexpected return type from Redis: got "
+                        + value.getClass().getSimpleName()
+                        + " expected String");
+    }
+
+    /**
+     * Extracts the response value from the Redis response and either throws an exception or returns
+     * the * value as a HashMap
+     *
+     * @param response Redis protobuf message
+     * @return Response as a String
+     */
+    protected static HashMap<String, Object> handleMapResponse(Response response) {
+        Object value = handleObjectResponse(response);
+        if (value instanceof HashMap) {
+            return (HashMap<String, Object>) value;
+        }
+        throw new RedisException(
+                "Unexpected return type from Redis: got "
+                        + value.getClass().getSimpleName()
+                        + " expected HashMap");
+    }
+
     /**
      * Closes this resource, relinquishing any underlying resources. This method is invoked
      * automatically on objects managed by the try-with-resources statement.

java/client/src/main/java/glide/api/RedisClient.java

@@ -3,19 +3,28 @@
 import static glide.ffi.resolvers.SocketListenerResolver.getSocket;
 
 import glide.api.commands.BaseCommands;
+import glide.api.commands.ConnectionCommands;
+import glide.api.commands.GenericCommands;
+import glide.api.commands.ServerCommands;
+import glide.api.commands.StringCommands;
+import glide.api.models.commands.InfoOptions;
+import glide.api.models.commands.SetOptions;
 import glide.api.models.configuration.RedisClientConfiguration;
 import glide.connectors.handlers.CallbackDispatcher;
 import glide.connectors.handlers.ChannelHandler;
 import glide.managers.CommandManager;
 import glide.managers.ConnectionManager;
 import glide.managers.models.Command;
+import java.util.List;
+import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 
 /**
  * Async (non-blocking) client for Redis in Standalone mode. Use {@link
  * #CreateClient(RedisClientConfiguration)} to request a client to Redis.
  */
-public class RedisClient extends BaseClient implements BaseCommands {
+public class RedisClient extends BaseClient
+        implements BaseCommands, GenericCommands, ConnectionCommands, ServerCommands, StringCommands {
 
     /**
      * Request an async (non-blocking) Redis client in Standalone mode.
@@ -88,7 +97,7 @@ public CompletableFuture<Object> customCommand(String[] args) {
     @Override
     public CompletableFuture<String> ping() {
         Command command = Command.builder().requestType(Command.RequestType.PING).build();
-        return commandManager.submitNewCommand(command, ResponseHandlers::handleStringResponse);
+        return commandManager.submitNewCommand(command, BaseClient::handleStringResponse);
     }
 
     /**
@@ -105,7 +114,7 @@ public CompletableFuture<String> ping(String msg) {
                         .requestType(Command.RequestType.PING)
                         .arguments(new String[] {msg})
                         .build();
-        return commandManager.submitNewCommand(command, ResponseHandlers::handleStringResponse);
+        return commandManager.submitNewCommand(command, BaseClient::handleStringResponse);
     }
 
     /**
@@ -117,7 +126,7 @@ public CompletableFuture<String> ping(String msg) {
     @Override
     public CompletableFuture<Map> info() {
         Command command = Command.builder().requestType(Command.RequestType.INFO).build();
-        return commandManager.submitNewCommand(command, ResponseHandlers::handleMapResponse);
+        return commandManager.submitNewCommand(command, BaseClient::handleMapResponse);
     }
 
     /**
@@ -135,7 +144,7 @@ public CompletableFuture<Map> info(InfoOptions options) {
                         .requestType(Command.RequestType.INFO)
                         .arguments(options.toInfoOptions())
                         .build();
-        return commandManager.submitNewCommand(command, ResponseHandlers::handleMapResponse);
+        return commandManager.submitNewCommand(command, BaseClient::handleMapResponse);
     }
 
     /**
@@ -152,7 +161,7 @@ public CompletableFuture<String> get(String key) {
                         .requestType(Command.RequestType.GET_STRING)
                         .arguments(new String[] {key})
                         .build();
-        return commandManager.submitNewCommand(command, ResponseHandlers::handleStringResponse);
+        return commandManager.submitNewCommand(command, BaseClient::handleStringResponse);
     }
 
     /**
@@ -170,7 +179,7 @@ public CompletableFuture<Void> set(String key, String value) {
                         .requestType(Command.RequestType.SET_STRING)
                         .arguments(new String[] {key, value})
                         .build();
-        return commandManager.submitNewCommand(command, ResponseHandlers::handleVoidResponse);
+        return commandManager.submitNewCommand(command, BaseClient::handleVoidResponse);
     }
 
     /**
@@ -190,6 +199,6 @@ public CompletableFuture<String> set(String key, String value, SetOptions option
                         .requestType(Command.RequestType.SET_STRING)
                         .arguments(options.toSetOptions(List.of(key, value)))
                         .build();
-        return commandManager.submitNewCommand(command, ResponseHandlers::handleStringResponse);
+        return commandManager.submitNewCommand(command, BaseClient::handleStringResponse);
     }
 }

java/client/src/main/java/glide/managers/CommandManager.java

@@ -68,6 +68,14 @@ private RequestType mapRequestTypes(Command.RequestType inType) {
         switch (inType) {
             case CUSTOM_COMMAND:
                 return RequestType.CustomCommand;
+            case PING:
+                return RequestType.Ping;
+            case INFO:
+                return RequestType.Info;
+            case GET_STRING:
+                return RequestType.GetString;
+            case SET_STRING:
+                return RequestType.SetString;
         }
         throw new RuntimeException("Unsupported request type");
     }

java/client/src/main/java/glide/managers/models/Command.java

@@ -20,5 +20,29 @@ public class Command {
     public enum RequestType {
         /** Call a custom command with list of string arguments */
         CUSTOM_COMMAND,
+        /**
+         * Ping the Redis server.
+         *
+         * @see <hred=https://redis.io/commands/ping/>command reference</a>
+         */
+        PING,
+        /**
+         * Get information and statistics about the Redis server.
+         *
+         * @see <hred=https://redis.io/commands/info/>command reference</a>
+         */
+        INFO,
+        /**
+         * Get the value of key.
+         *
+         * @see: <href=https://redis.io/commands/get/>command reference</a>
+         */
+        GET_STRING,
+        /**
+         * Set key to hold the string value.
+         *
+         * @see: <href=https://redis.io/commands/set/>command reference</a>
+         */
+        SET_STRING,
     }
 }

java/client/src/test/java/glide/api/RedisClientTest.java

@@ -14,11 +14,11 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import glide.api.models.Command;
 import glide.api.models.commands.InfoOptions;
 import glide.api.models.commands.SetOptions;
 import glide.managers.CommandManager;
 import glide.managers.ConnectionManager;
+import glide.managers.models.Command;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;