More efficient Query.set(Map), and bulk Query.remove(Collection)

3 files changed, 19 insertions, 12 deletions

diff --git a/vespajlib/src/main/java/ai/vespa/http/HttpURL.java b/vespajlib/src/main/java/ai/vespa/http/HttpURL.java
index 05c25df98ab..211ce52f7ab 100644
--- a/vespajlib/src/main/java/ai/vespa/http/HttpURL.java
+++ b/vespajlib/src/main/java/ai/vespa/http/HttpURL.java
@@ -7,6 +7,7 @@ import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Deque;
 import java.util.LinkedHashMap;
@@ -16,6 +17,7 @@ import java.util.Objects;
 import java.util.OptionalInt;
 import java.util.StringJoiner;
 import java.util.function.Consumer;
+import java.util.function.Predicate;
 import java.util.function.UnaryOperator;
 
 import static ai.vespa.validation.Validation.require;
@@ -424,14 +426,14 @@ public class HttpURL {
 
         /** Returns a copy of this without any key-value pair with the <em>decoded</em> key. */
         public Query remove(String key) {
-            return new Query(without(validator.apply(requireNonNull(key)), head), validator);
+            return new Query(without(key::equals, head), validator);
         }
 
-        private static Node without(String key, Node node) {
-            if (node == null) return node;                  // null does not contain the key
-            Node child = without(key, node.next);           // get a child that does not contain the key
-            if (node.key.equals(key)) return child;         // if we have the key, unlink us
-            if (child == node.next) return node;            // if our next didn't have the key, return unchanged
+        private static Node without(Predicate<String> filter, Node node) {
+            if (node == null) return node;                  // null does not contain match filter
+            Node child = without(filter, node.next);        // get a child that does not match filter
+            if (filter.test(node.key)) return child;        // if we match the filter, unlink us
+            if (child == node.next) return node;            // if our next didn't change, return unchanged
             return new Node(child, node.key, node.value);   // if our next has changed, we must change too
         }
 
@@ -448,14 +450,19 @@ public class HttpURL {
 
         /** Returns a copy of this with all given mappings added to this, possibly replacing existing mappings. */
         public Query set(Map<String, String> values) {
-            Query query = this;
+            Query query = remove(values.keySet());
             for (Map.Entry<String, String> entry : values.entrySet())
-                query = entry.getValue() == null ? query.set(entry.getKey())
-                        : query.set(entry.getKey(), entry.getValue());
+                query = entry.getValue() == null ? query.add(entry.getKey())
+                                                 : query.add(entry.getKey(), entry.getValue());
 
             return query;
         }
 
+        /** Returns a copy of this with all given keys removed. */
+        public Query remove(Collection<String> keys) {
+            return new Query(without(keys::contains, head), validator);
+        }
+
         /**
          * The <em>URL decoded</em> key-value pairs that make up this query;
          * keys and values may be {@code ""}, and values are {@code null} when only key was specified.
diff --git a/vespajlib/src/main/java/ai/vespa/validation/StringWrapper.java b/vespajlib/src/main/java/ai/vespa/validation/StringWrapper.java
index c3c44c0ff4c..0937627b57e 100644
--- a/vespajlib/src/main/java/ai/vespa/validation/StringWrapper.java
+++ b/vespajlib/src/main/java/ai/vespa/validation/StringWrapper.java
@@ -10,7 +10,7 @@ import static java.util.Objects.requireNonNull;
  * What's in a name?<br>
  * That which we call a String<br>
  * by any other name would smell as foul.<br>
- * No? 'Tis not soft?<br>
+ * No? 'Tis not sooth?<br>
  * No ... I see it now!<br>
  * Baptiz'd a-new, the String—<br>
  * no more a String,<br>
diff --git a/vespajlib/src/test/java/ai/vespa/http/HttpURLTest.java b/vespajlib/src/test/java/ai/vespa/http/HttpURLTest.java
index 3ca00c230e7..409daaabc13 100644
--- a/vespajlib/src/test/java/ai/vespa/http/HttpURLTest.java
+++ b/vespajlib/src/test/java/ai/vespa/http/HttpURLTest.java
@@ -210,10 +210,10 @@ class HttpURLTest {
                      bloated.set("moo").toString());
 
         assertEquals("no query",
-                     bloated.remove("foo").remove("baz").remove("quu").remove("moo").toString());
+                     bloated.remove(last.keySet()).toString());
 
         assertThrows(NullPointerException.class,
-                     () -> query.remove(null));
+                     () -> query.remove((String) null));
 
         assertThrows(NullPointerException.class,
                      () -> query.add((String) null));