Merge branch '7.10' of github.com:gchq/stroom

Author: stroomdev66

CHANGELOG.md

@@ -13,6 +13,8 @@ DO NOT ADD CHANGES HERE - ADD THEM USING log_change.sh
 ~~~
 
 
+* Issue **#5100** : Fix selection filters auto quoting parameter replacements.
+
 * Issue **#5318** : Fix Plan B session condensation.
 
 * Issue **#5288** : Fix config defaults for `ForwardHttpPostConfig` and `HttpClientConfiguration`.

stroom-core-client/src/test/java/stroom/util/client/TestParamUtil.java

@@ -83,10 +83,14 @@ void testReplacement() {
         assertThat(result).isEqualTo("this is $$$value1 value2");
 
         result = ParamUtil.replaceParameters("this is \"${key1}\" ${key2}", paramValues);
-        assertThat(result).isEqualTo("this is \"${key1}\" value2");
+        assertThat(result).isEqualTo("this is ${key1} value2");
 
         paramValues = new ParamValuesImpl(getMap("user=\"user1 user2\""));
         result = ParamUtil.replaceParameters("${user}", paramValues);
+        assertThat(result).isEqualTo("user1 user2");
+
+        paramValues = new ParamValuesImpl(getMap("user=\"user1 user2\""));
+        result = ParamUtil.replaceParameters("'\\''${user}'\\''", paramValues);
         assertThat(result).isEqualTo("'user1 user2'");
     }
 

stroom-query/stroom-query-api/src/main/java/stroom/query/api/ParamUtil.java

@@ -143,20 +143,22 @@ public static String replaceParameters(final String value,
 
                 final String paramValue = paramValues.getParamValue(key);
                 if (paramValue != null) {
-                    if (containsWhitespace(paramValue)) {
-                        sb.append("'");
-                        sb.append(paramValue);
-                        sb.append("'");
-                    } else {
-                        sb.append(paramValue);
-                    }
+                    // gh-5100 WE DO NOT WANT TO AUTOMATICALLY QUOTE REPLACED PARAMS, QUOTES SHOULD BE ADDED TO QUERIES
+                    // IF NEEDED
+//                    if (containsWhitespace(paramValue)) {
+//                        sb.append("'");
+//                        sb.append(paramValue);
+//                        sb.append("'");
+//                    } else {
+                    sb.append(paramValue);
+//                    }
                 } else if (defaultValue != null) {
                     sb.append(defaultValue);
                 } else if (keepUnmatched) {
-                    sb.append(token.getText());
+                    sb.append(token.getUnescapedText());
                 }
             } else {
-                sb.append(token.getText());
+                sb.append(token.getUnescapedText());
             }
         }