commit ae82b0ab7882647716640e38a2137a83ec8dc95b
author Ke Wu <ke.wu.cs@icloud.com> Fri May 15 11:11:28 2020 -0700
committer GitHub <noreply@github.com> Fri May 15 11:11:28 2020 -0700
tree fb155aa580625f5a7240c55953db2961d4d7ee48
parent ca57730d53324730540039adbad38157b842c88c

SAMZA-2524:Fix Util#envVarEscape not to escape apostrophe (#1360)

samza-core/src/main/java/org/apache/samza/util/Util.java

diff --git a/samza-core/src/main/java/org/apache/samza/util/Util.java b/samza-core/src/main/java/org/apache/samza/util/Util.java
index 4b97014..ad7b85c 100644
--- a/samza-core/src/main/java/org/apache/samza/util/Util.java
+++ b/samza-core/src/main/java/org/apache/samza/util/Util.java
@@ -48,7 +48,6 @@
     return str
         .replace("\\", "\\\\")
         .replace("\"", "\\\"")
-        .replace("'", "\\'")
         .replace("`", "\\`");
   }
 

samza-core/src/test/java/org/apache/samza/util/TestUtil.java

diff --git a/samza-core/src/test/java/org/apache/samza/util/TestUtil.java b/samza-core/src/test/java/org/apache/samza/util/TestUtil.java
index fe38991..4fbd8cb 100644
--- a/samza-core/src/test/java/org/apache/samza/util/TestUtil.java
+++ b/samza-core/src/test/java/org/apache/samza/util/TestUtil.java
@@ -47,11 +47,11 @@
   @Test
   public void testEnvVarEscape() {
     // no special characters in original
-    String noSpecialCharacters = "hello world 123 .?!";
+    String noSpecialCharacters = "hello world 123 .?! '";
     assertEquals(noSpecialCharacters, Util.envVarEscape(noSpecialCharacters));
 
-    String withSpecialCharacters = "quotation \" apostrophe ' backslash \\ grave accent `";
-    String escaped = "quotation \\\" apostrophe \\' backslash \\\\ grave accent \\`";
+    String withSpecialCharacters = "quotation \" backslash \\ grave accent `";
+    String escaped = "quotation \\\" backslash \\\\ grave accent \\`";
     assertEquals(escaped, Util.envVarEscape(withSpecialCharacters));
   }