diff options
author | jonmv <venstad@gmail.com> | 2022-10-21 13:25:55 +0200 |
---|---|---|
committer | jonmv <venstad@gmail.com> | 2022-10-21 13:25:55 +0200 |
commit | 60149c673b244d27f0c7af00f1015479ed611cb0 (patch) | |
tree | 0d7240853c045ca46f8ed851273e8c7f7e82a4a4 | |
parent | 56e1715bb9d40ed751c4e377a3d1ee47aab84380 (diff) |
Surely, escapeJava cannot be right--use JSON escaping instead
-rw-r--r-- | client/pom.xml | 5 | ||||
-rw-r--r-- | client/src/main/java/ai/vespa/client/dsl/Field.java | 8 | ||||
-rw-r--r-- | client/src/main/java/ai/vespa/client/dsl/GeoLocation.java | 4 |
3 files changed, 4 insertions, 13 deletions
diff --git a/client/pom.xml b/client/pom.xml index 9d643d63cf8..a310e7d6feb 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -22,11 +22,6 @@ <artifactId>jackson-databind</artifactId> </dependency> <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-text</artifactId> - <version>1.10.0</version> - </dependency> - <dependency> <groupId>org.junit.jupiter</groupId> <artifactId>junit-jupiter</artifactId> <scope>test</scope> diff --git a/client/src/main/java/ai/vespa/client/dsl/Field.java b/client/src/main/java/ai/vespa/client/dsl/Field.java index f166101a854..6d199ead2b8 100644 --- a/client/src/main/java/ai/vespa/client/dsl/Field.java +++ b/client/src/main/java/ai/vespa/client/dsl/Field.java @@ -1,8 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package ai.vespa.client.dsl; -import org.apache.commons.text.StringEscapeUtils; - import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; @@ -578,7 +576,7 @@ public class Field extends QueryChain { } private Query common(String relation, Annotation annotation, String value) { - Object v = "\"" + StringEscapeUtils.escapeJava(value) + "\""; + Object v = Q.toJson(value); return common(relation, annotation, v, values.toArray()); } @@ -587,8 +585,8 @@ public class Field extends QueryChain { } private Query common(String relation, Annotation annotation, String value, String[] others) { - Object v = "\"" + StringEscapeUtils.escapeJava(value) + "\""; - Object[] o = Stream.of(others).map(s -> "\"" + StringEscapeUtils.escapeJava(s) + "\"").toArray(); + Object v = Q.toJson(value); + Object[] o = Stream.of(others).map(Q::toJson).toArray(); return common(relation, annotation, v, o); } diff --git a/client/src/main/java/ai/vespa/client/dsl/GeoLocation.java b/client/src/main/java/ai/vespa/client/dsl/GeoLocation.java index 8ccb2e69749..bdf2ccc15c5 100644 --- a/client/src/main/java/ai/vespa/client/dsl/GeoLocation.java +++ b/client/src/main/java/ai/vespa/client/dsl/GeoLocation.java @@ -1,8 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package ai.vespa.client.dsl; -import org.apache.commons.text.StringEscapeUtils; - public class GeoLocation extends QueryChain { private final String fieldName; @@ -40,6 +38,6 @@ public class GeoLocation extends QueryChain { @Override public String toString() { - return Text.format("geoLocation(%s, %f, %f, \"%s\")", fieldName, longitude, latitude, StringEscapeUtils.escapeJava(radius)); + return Text.format("geoLocation(%s, %f, %f, %s)", fieldName, longitude, latitude, Q.toJson(radius)); } } |