Fix unit tests

Signed-off-by: Andrew Carbonetto <[email protected]>
Bit-Quill · Jan 27, 2024 · 9a16d86 · 9a16d86
1 parent b062b9b
commit 9a16d86
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 34 deletions.
diff --git a/java/client/src/main/java/glide/api/models/commands/InfoOptions.java b/java/client/src/main/java/glide/api/models/commands/InfoOptions.java
@@ -9,7 +9,7 @@
 
 /** Object builder to add optional arguments to {@link ServerCommands#info(InfoOptions)} */
 @Builder
-public class InfoOptions extends Options {
+public class InfoOptions {
 
     @Singular private final List<Section> sections;
 
@@ -56,7 +56,7 @@ public enum Section {
      * @return String[]
      */
     public String[] toInfoOptions() {
-        optionArgs = sections.stream().map(Objects::toString).collect(Collectors.toList());
-        return toArgs();
+        List<String> optionArgs = sections.stream().map(Objects::toString).collect(Collectors.toList());
+        return optionArgs.toArray(new String[0]);
     }
 }
diff --git a/java/client/src/main/java/glide/api/models/commands/Options.java b/java/client/src/main/java/glide/api/models/commands/Options.java
diff --git a/java/client/src/main/java/glide/api/models/commands/SetOptions.java b/java/client/src/main/java/glide/api/models/commands/SetOptions.java
@@ -11,7 +11,7 @@
  * String, SetOptions)}
  */
 @Builder
-public class SetOptions extends Options {
+public class SetOptions {
 
     /**
      * if `conditional` is not set the value will be set regardless of prior value existence. <br>
@@ -90,13 +90,12 @@ public enum TimeToLiveType {
     public static String TIME_TO_LIVE_UNIX_MILLISECONDS = "PXAT";
 
     /**
-     * Converts SetOptions into a String[] to add to a {@link glide.api.models.Command}
+     * Converts SetOptions into a String[]
      *
-     * @param arguments
-     * @return
+     * @return String[]
      */
-    public String[] toSetOptions(List<String> arguments) {
-        optionArgs = new LinkedList();
+    public String[] toArgs() {
+        List<String> optionArgs = new LinkedList();
         if (conditionalSet != null) {
             if (conditionalSet == ConditionalSet.ONLY_IF_EXISTS) {
                 optionArgs.add(CONDITIONAL_SET_ONLY_IF_EXISTS);
@@ -134,6 +133,6 @@ public String[] toSetOptions(List<String> arguments) {
             }
         }
 
-        return toArgs(arguments);
+        return optionArgs.toArray(new String[0]);
     }
 }
diff --git a/java/client/src/main/java/glide/managers/CommandManager.java b/java/client/src/main/java/glide/managers/CommandManager.java
@@ -36,6 +36,7 @@ public class CommandManager {
      */
     public <T> CompletableFuture<T> submitNewCommand(
             Command command, RedisExceptionCheckedFunction<Response, T> responseHandler) {
+        var pb = prepareRedisRequest(command).build();
         // write command request to channel
         // when complete, convert the response to our expected type T using the given responseHandler
         return channel

diff --git a/java/client/src/main/java/glide/managers/models/Command.java b/java/client/src/main/java/glide/managers/models/Command.java
@@ -68,7 +68,8 @@ public static Command set(String key, String value) {
     /** Command to set the given key with the given value. */
     public static Command set(String key, String value, String[] options) {
         String[] args = ArrayUtils.addAll(new String[] {key, value}, options);
-        return Command.builder().requestType(Command.RequestType.SET_STRING).arguments(args).build();
+        Command cmd = Command.builder().requestType(Command.RequestType.SET_STRING).arguments(args).build();
+        return cmd;
     }
 
     public enum RequestType {

diff --git a/java/client/src/test/java/glide/managers/CommandManagerTest.java b/java/client/src/test/java/glide/managers/CommandManagerTest.java
@@ -358,7 +358,6 @@ private RedisRequest.Builder prepareProtoBufRequest(
                         RedisRequestOuterClass.Command.newBuilder()
                                 .setRequestType(requestType)
                                 .setArgsArray(argsArray)
-                                .build())
-                .setRoute(Routes.newBuilder().setSimpleRoutes(SimpleRoutes.AllNodes).build());
+                                .build());
     }
 }