commit 047f9a02d927a0baee45354647f64dd85eba5a8c
author Sarah <41928668+sabbey37@users.noreply.github.com> Wed Oct 21 15:33:35 2020 -0400
committer GitHub <noreply@github.com> Wed Oct 21 15:33:35 2020 -0400
tree 36f7f63c0acee5e40c4e673ce62f128931c11a95
parent d436e8dfdb4abce461720383ad95c01427f7b372

GEODE-8632: Redis Unknown command error message has should have trailing space (#5646)

geode-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/AbstractUnknownIntegrationTest.java

diff --git a/geode-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/AbstractUnknownIntegrationTest.java b/geode-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/AbstractUnknownIntegrationTest.java
index fc00d80..e6fd485 100644
--- a/geode-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/AbstractUnknownIntegrationTest.java
+++ b/geode-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/AbstractUnknownIntegrationTest.java
@@ -45,13 +45,20 @@
   @Test
   public void givenUnknownCommand_returnsUnknownCommandError() {
     assertThatThrownBy(() -> jedis.sendCommand("fhqwhgads"::getBytes))
-        .hasMessageContaining("ERR unknown command `fhqwhgads`, with args beginning with:");
+        .hasMessage("ERR unknown command `fhqwhgads`, with args beginning with: ");
   }
 
   @Test
   public void givenUnknownCommand_withArguments_returnsUnknownCommandErrorWithArgumentsListed() {
     assertThatThrownBy(() -> jedis.sendCommand("fhqwhgads"::getBytes, "EVERYBODY", "TO THE LIMIT"))
-        .hasMessageContaining(
-            "ERR unknown command `fhqwhgads`, with args beginning with: `EVERYBODY`, `TO THE LIMIT`,");
+        .hasMessage(
+            "ERR unknown command `fhqwhgads`, with args beginning with: `EVERYBODY`, `TO THE LIMIT`, ");
+  }
+
+  @Test
+  public void givenUnknownCommand_withEmptyStringArgument_returnsUnknownCommandErrorWithArgumentsListed() {
+    assertThatThrownBy(() -> jedis.sendCommand("fhqwhgads"::getBytes, "EVERYBODY", ""))
+        .hasMessage(
+            "ERR unknown command `fhqwhgads`, with args beginning with: `EVERYBODY`, ``, ");
   }
 }

geode-redis/src/main/java/org/apache/geode/redis/internal/RedisConstants.java

diff --git a/geode-redis/src/main/java/org/apache/geode/redis/internal/RedisConstants.java b/geode-redis/src/main/java/org/apache/geode/redis/internal/RedisConstants.java
index bf66bc2..b152fd9 100644
--- a/geode-redis/src/main/java/org/apache/geode/redis/internal/RedisConstants.java
+++ b/geode-redis/src/main/java/org/apache/geode/redis/internal/RedisConstants.java
@@ -32,7 +32,7 @@
   public static final String SERVER_ERROR_SHUTDOWN = "The server is shutting down";
   public static final String ERROR_CURSOR = "invalid cursor";
   public static final String ERROR_UNKNOWN_COMMAND =
-      "unknown command `%s`, with args beginning with:%s";
+      "unknown command `%s`, with args beginning with: %s";
   public static final String ERROR_UNSUPPORTED_COMMAND =
       " is not supported. To enable all unsupported commands use GFSH to execute: 'redis --enable-unsupported-commands'. Unsupported commands have not been fully tested.";
   public static final String ERROR_OUT_OF_RANGE = "The number provided is out of range";

geode-redis/src/main/java/org/apache/geode/redis/internal/executor/UnknownExecutor.java

diff --git a/geode-redis/src/main/java/org/apache/geode/redis/internal/executor/UnknownExecutor.java b/geode-redis/src/main/java/org/apache/geode/redis/internal/executor/UnknownExecutor.java
index 54a94a9..02e1eda 100644
--- a/geode-redis/src/main/java/org/apache/geode/redis/internal/executor/UnknownExecutor.java
+++ b/geode-redis/src/main/java/org/apache/geode/redis/internal/executor/UnknownExecutor.java
@@ -38,11 +38,11 @@
 
       if (commandElems.size() > 1) {
         for (int i = 1; i < commandElems.size(); i++) {
-          if (commandElems.get(i) == null || commandElems.get(i).length == 0) {
-            continue; // skip blanks
+          if (commandElems.get(i) == null) {
+            continue;
           }
-          commandArguments.append(" `").append(Coder.bytesToString(commandElems.get(i)))
-              .append("`,");
+          commandArguments.append("`").append(Coder.bytesToString(commandElems.get(i)))
+              .append("`, ");
         }
       }
     }