fix: fixing double quote escape

rhajek · rhajek · commit 772c36f6ddf1 · 2022-06-09T18:41:17.000+02:00
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/properties/FunctionsParameters.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/properties/FunctionsParameters.java
@@ -54,6 +54,10 @@ public final class FunctionsParameters {
 
     private Map<String, Property> properties = new LinkedHashMap<>();
 
+    public static String escapeDoubleQuotes(final String val) {
+        return val.replace("\"", "\\\"");
+    }
+
     private FunctionsParameters() {
     }
 
@@ -86,7 +90,7 @@ public static String serializeValue(@Nonnull final Object value) {
             }
 
             serializedValue = collection.stream()
-                    .map(host -> "\"" + host + "\"")
+                    .map(host -> "\"" + escapeDoubleQuotes(host.toString()) + "\"")
                     .collect(Collectors.joining(", ", "[", "]"));
         }
 
@@ -97,7 +101,7 @@ public static String serializeValue(@Nonnull final Object value) {
             Map map = (Map) serializedValue;
             //noinspection unchecked
             map.keySet().forEach(key -> {
-                joiner.add(String.format("%s: \"%s\"", key, map.get(key)));
+                joiner.add(String.format("%s: \"%s\"", key, escapeDoubleQuotes(map.get(key).toString())));
             });
 
             serializedValue = joiner;
@@ -337,7 +341,7 @@ public String value(@Nonnull final Map<String, Object> namedProperties) {
                 return null;
             }
 
-            return "\"" + value + "\"";
+            return "\"" + escapeDoubleQuotes(value) + "\"";
         }
     }
 
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/restriction/ColumnRestriction.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/restriction/ColumnRestriction.java
@@ -28,6 +28,8 @@
 import com.influxdb.query.dsl.functions.properties.FunctionsParameters;
 import com.influxdb.utils.Arguments;
 
+import static com.influxdb.query.dsl.functions.properties.FunctionsParameters.escapeDoubleQuotes;
+
 /**
  * The column restrictions.
  *
@@ -166,8 +168,9 @@ public ContainsRestrictions(@Nonnull final String fieldName, @Nonnull final Stri
 
         @Override
         public String toString() {
-            return "contains(value: r[\"" + fieldName + "\"], set:["
-                    + Arrays.stream(set).collect(Collectors.joining("\", \"", "\"", "\"")) + "])";
+            return "contains(value: r[\"" + escapeDoubleQuotes(fieldName) + "\"], set:["
+                    + Arrays.stream(set).map(FunctionsParameters::escapeDoubleQuotes)
+                    .collect(Collectors.joining("\", \"", "\"", "\"")) + "])";
         }
     }
 
@@ -197,7 +200,4 @@ public String toString() {
             return "r[\"" + escapeDoubleQuotes(fieldName) + "\"] " + operator + " " + value;
         }
     }
-    private static String escapeDoubleQuotes(final String val) {
-        return val.replace("\"", "\\\"");
-    }
 }
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/restriction/RestrictionsTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/restriction/RestrictionsTest.java
@@ -21,11 +21,15 @@
  */
 package com.influxdb.query.dsl.functions.restriction;
 
+import com.influxdb.query.dsl.Flux;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.platform.runner.JUnitPlatform;
 import org.junit.runner.RunWith;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * @author Jakub Bednar (bednar@github) (09/10/2018 10:33)
  */
@@ -97,12 +101,35 @@ void emptyLogical() {
     }
 
     @Test
-    void escapeStringValues() {
+    void escaping() {
+
         Restrictions restrictions = Restrictions.tag("my-tag").equal("escaped\"tag");
         Assertions.assertThat(restrictions.toString()).isEqualTo("r[\"my-tag\"] == \"escaped\\\"tag\"");
 
         restrictions = Restrictions.column("my\"column").exists();
         Assertions.assertThat(restrictions.toString()).isEqualTo("exists r[\"my\\\"column\"]");
+
+        restrictions = Restrictions.tag("_value").contains(new String[]{"val\"ue1", "value2"});
+
+        Assertions.assertThat(restrictions.toString()).isEqualTo("contains(value: r[\"_value\"], set:[\"val\\\"ue1\", \"value2\"])");
+
+        Flux flux = Flux
+                .from("telegraf")
+                .drop(new String[]{"host", "ta\"g"});
+
+        Assertions.assertThat(flux.toString())
+                .isEqualToIgnoringWhitespace("from(bucket:\"telegraf\") |> drop(columns:[\"host\", \"ta\\\"g\"])");
+
+        Map<String, String> map = new HashMap<>();
+        map.put("host", "ser\"ver");
+        map.put("_value", "va\"l");
+
+        flux = Flux
+                .from("tel\"egraf")
+                .rename(map);
+
+        Assertions.assertThat(flux.toString()).isEqualToIgnoringWhitespace("from(bucket:\"tel\\\"egraf\") |> rename(columns: {host: \"ser\\\"ver\", _value: \"va\\\"l\"})");
+
     }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,10 @@ public final class FunctionsParameters {`
`54`	`54`
`55`	`55`	`private Map<String, Property> properties = new LinkedHashMap<>();`
`56`	`56`
	`57`	`+ public static String escapeDoubleQuotes(final String val) {`
	`58`	`+ return val.replace("\"", "\\\"");`
	`59`	`+ }`
	`60`	`+`
`57`	`61`	`private FunctionsParameters() {`
`58`	`62`	`}`
`59`	`63`
`@@ -86,7 +90,7 @@ public static String serializeValue(@Nonnull final Object value) {`
`86`	`90`	`}`
`87`	`91`
`88`	`92`	`serializedValue = collection.stream()`
`89`		`- .map(host -> "\"" + host + "\"")`
	`93`	`+ .map(host -> "\"" + escapeDoubleQuotes(host.toString()) + "\"")`
`90`	`94`	`.collect(Collectors.joining(", ", "[", "]"));`
`91`	`95`	`}`
`92`	`96`
`@@ -97,7 +101,7 @@ public static String serializeValue(@Nonnull final Object value) {`
`97`	`101`	`Map map = (Map) serializedValue;`
`98`	`102`	`//noinspection unchecked`
`99`	`103`	`map.keySet().forEach(key -> {`
`100`		`- joiner.add(String.format("%s: \"%s\"", key, map.get(key)));`
	`104`	`+ joiner.add(String.format("%s: \"%s\"", key, escapeDoubleQuotes(map.get(key).toString())));`
`101`	`105`	`});`
`102`	`106`
`103`	`107`	`serializedValue = joiner;`
`@@ -337,7 +341,7 @@ public String value(@Nonnull final Map<String, Object> namedProperties) {`
`337`	`341`	`return null;`
`338`	`342`	`}`
`339`	`343`
`340`		`- return "\"" + value + "\"";`
	`344`	`+ return "\"" + escapeDoubleQuotes(value) + "\"";`
`341`	`345`	`}`
`342`	`346`	`}`
`343`	`347`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,8 @@`
`28`	`28`	`import com.influxdb.query.dsl.functions.properties.FunctionsParameters;`
`29`	`29`	`import com.influxdb.utils.Arguments;`
`30`	`30`
	`31`	`+import static com.influxdb.query.dsl.functions.properties.FunctionsParameters.escapeDoubleQuotes;`
	`32`	`+`
`31`	`33`	`/**`
`32`	`34`	`* The column restrictions.`
`33`	`35`	`*`
`@@ -166,8 +168,9 @@ public ContainsRestrictions(@Nonnull final String fieldName, @Nonnull final Stri`
`166`	`168`
`167`	`169`	`@Override`
`168`	`170`	`public String toString() {`
`169`		`- return "contains(value: r[\"" + fieldName + "\"], set:["`
`170`		`- + Arrays.stream(set).collect(Collectors.joining("\", \"", "\"", "\"")) + "])";`
	`171`	`+ return "contains(value: r[\"" + escapeDoubleQuotes(fieldName) + "\"], set:["`
	`172`	`+ + Arrays.stream(set).map(FunctionsParameters::escapeDoubleQuotes)`
	`173`	`+ .collect(Collectors.joining("\", \"", "\"", "\"")) + "])";`
`171`	`174`	`}`
`172`	`175`	`}`
`173`	`176`
`@@ -197,7 +200,4 @@ public String toString() {`
`197`	`200`	`return "r[\"" + escapeDoubleQuotes(fieldName) + "\"] " + operator + " " + value;`
`198`	`201`	`}`
`199`	`202`	`}`
`200`		`- private static String escapeDoubleQuotes(final String val) {`
`201`		`- return val.replace("\"", "\\\"");`
`202`		`- }`
`203`	`203`	`}`