implement commands in jedis

Author: Avital-Fine

src/main/java/redis/clients/jedis/CommandObjects.java

@@ -632,29 +632,6 @@ public final CommandObject<Long> bitop(BitOP op, byte[] destKey, byte[]... srcKe
     return new CommandObject<>(commandArguments(BITOP).add(op).key(destKey).keys((Object[]) srcKeys), BuilderFactory.LONG);
   }
 
-  public final CommandObject<Long> commandCount() {
-    return new CommandObject<>(commandArguments(COMMAND).add(COUNT), BuilderFactory.LONG);
-  }
-  public final CommandObject<Map<String, CommandDocument>> commandDocs(String... commands) {
-    return new CommandObject<>(commandArguments(COMMAND).add(DOCS).addObjects((Object[]) commands), BuilderFactory.COMMAND_DOCS_RESPONSE);
-  }
-  public final CommandObject<List<String>> commandGetKeys(String... command) {
-    return new CommandObject<>(commandArguments(COMMAND).add(GETKEYS).addObjects((Object[]) command), BuilderFactory.STRING_LIST);
-  }
-  public final CommandObject<List<KeyValue<String, List<String>>>> commandGetKeysAndFlags(String... command) {
-    return new CommandObject<>(commandArguments(COMMAND).add(GETKEYSANDFLAGS).addObjects((Object[]) command), BuilderFactory.KEYED_STRING_LIST_LIST);
-  }
-  public final CommandObject<Map<String, CommandInfo>> commandInfo(String... commands) {
-    return new CommandObject<>(commandArguments(COMMAND).add(Keyword.INFO).addObjects((Object[]) commands), BuilderFactory.COMMAND_INFO_RESPONSE);
-  }
-  public final CommandObject<List<String>> commandList() {
-    return new CommandObject<>(commandArguments(COMMAND).add(LIST), BuilderFactory.STRING_LIST);
-  }
-  public final CommandObject<List<String>> commandListFilterBy(CommandListFilterByParams filterByParams) {
-    return new CommandObject<>(commandArguments(COMMAND).add(LIST).addParams(filterByParams),
-            BuilderFactory.STRING_LIST);
-  }
-
   /**
    * @deprecated STRALGO LCS command will be removed from Redis 7.
    * LCS can be used instead of this method.

src/main/java/redis/clients/jedis/Jedis.java

@@ -8044,37 +8044,45 @@ public long bitop(final BitOP op, final String destKey, final String... srcKeys)
 
   public long commandCount() {
     checkIsInMultiOrPipeline();
-    return connection.executeCommand(commandObjects.commandCount());
+    connection.sendCommand(COMMAND, COUNT);
+    return connection.getIntegerReply();
   }
 
   public Map<String, CommandDocument> commandDocs(String... commands) {
     checkIsInMultiOrPipeline();
-    return connection.executeCommand(commandObjects.commandDocs(commands));
+    connection.sendCommand(COMMAND, joinParameters(DOCS.name(), commands));
+    return BuilderFactory.COMMAND_DOCS_RESPONSE.build(connection.getOne());
   }
 
   public List<String> commandGetKeys(String... command) {
     checkIsInMultiOrPipeline();
-    return connection.executeCommand(commandObjects.commandGetKeys(command));
+    connection.sendCommand(COMMAND, joinParameters(GETKEYS.name(), command));
+    return BuilderFactory.STRING_LIST.build(connection.getOne());
   }
 
   public List<KeyValue<String, List<String>>> commandGetKeysAndFlags(String... command) {
     checkIsInMultiOrPipeline();
-    return connection.executeCommand(commandObjects.commandGetKeysAndFlags(command));
+    connection.sendCommand(COMMAND, joinParameters(GETKEYSANDFLAGS.name(), command));
+    return BuilderFactory.KEYED_STRING_LIST_LIST.build(connection.getOne());
   }
 
   public Map<String, CommandInfo> commandInfo(String... commands) {
     checkIsInMultiOrPipeline();
-    return connection.executeCommand(commandObjects.commandInfo(commands));
+    connection.sendCommand(COMMAND, joinParameters(Keyword.INFO.name(), commands));
+    return BuilderFactory.COMMAND_INFO_RESPONSE.build(connection.getOne());
   }
 
   public List<String> commandList() {
     checkIsInMultiOrPipeline();
-    return connection.executeCommand(commandObjects.commandList());
+    connection.sendCommand(COMMAND, LIST);
+    return BuilderFactory.STRING_LIST.build(connection.getOne());
   }
 
   public List<String> commandListFilterBy(CommandListFilterByParams filterByParams) {
     checkIsInMultiOrPipeline();
-    return connection.executeCommand(commandObjects.commandListFilterBy(filterByParams));
+    CommandArguments args = new CommandArguments(COMMAND).add(LIST).addParams(filterByParams);
+    connection.sendCommand(args);
+    return BuilderFactory.STRING_LIST.build(connection.getOne());
   }
 
   @Override

src/main/java/redis/clients/jedis/params/CommandListFilterByParams.java

@@ -1,6 +1,7 @@
 package redis.clients.jedis.params;
 
 import redis.clients.jedis.CommandArguments;
+import redis.clients.jedis.exceptions.JedisDataException;
 
 import static redis.clients.jedis.Protocol.Keyword.FILTERBY;
 import static redis.clients.jedis.Protocol.Keyword.MODULE;
@@ -44,6 +45,8 @@ public void addParams(CommandArguments args) {
     } else if (moduleName == null && category == null && pattern != null) {
       args.add(PATTERN);
       args.add(pattern);
+    } else {
+      throw new JedisDataException("Must choose exactly one filter");
     }
   }
 }