Support multiple values for same key, in HttpURL.Query

1 files changed, 14 insertions, 11 deletions

diff --git a/vespajlib/src/test/java/ai/vespa/http/HttpURLTest.java b/vespajlib/src/test/java/ai/vespa/http/HttpURLTest.java
index 181e02999b8..85e78c0b7af 100644
--- a/vespajlib/src/test/java/ai/vespa/http/HttpURLTest.java
+++ b/vespajlib/src/test/java/ai/vespa/http/HttpURLTest.java
@@ -54,7 +54,7 @@ class HttpURLTest {
                  .withDomain(DomainName.of("domain"))
                  .withPort(0)
                  .withPath(url.path().append("foo").withoutTrailingSlash())
-                 .withQuery(url.query().put("boo", "bar").add("baz"));
+                 .withQuery(url.query().add("boo", "bar").add("baz"));
         assertEquals(https, url.scheme());
         assertEquals(DomainName.of("domain"), url.domain());
         assertEquals(OptionalInt.of(0), url.port());
@@ -119,7 +119,7 @@ class HttpURLTest {
         assertEquals(path, path.withoutTrailingSlash().withoutTrailingSlash());
 
         assertEquals(List.of("one", "foo", "bar", "baz", "two"),
-                     Path.from(List.of("one")).append(path).append("two").segments());
+                     Path.empty().append(List.of("one")).append(path).append("two").segments());
 
         assertEquals(List.of(expected.get(2), expected.get(0)),
                      path.append(path).cut(2).skip(2).segments());
@@ -168,35 +168,38 @@ class HttpURLTest {
         Map<String, String> expected = new LinkedHashMap<>();
         expected.put("foo", "bar");
         expected.put("baz", null);
-        assertEquals(expected, query.entries());
+        assertEquals(expected, query.lastEntries());
 
         expected.remove("baz");
-        assertEquals(expected, query.remove("baz").entries());
+        assertEquals(expected, query.remove("baz").lastEntries());
 
         expected.put("baz", null);
         expected.remove("foo");
-        assertEquals(expected, query.remove("foo").entries());
-        assertEquals(expected, Query.empty(Name::of).add("baz").entries());
+        assertEquals(expected, query.remove("foo").lastEntries());
+        assertEquals(expected, Query.empty(Name::of).set("baz").lastEntries());
 
         assertEquals("query '?foo=bar&baz=bax&quu=fez&moo'",
-                     query.put("baz", "bax").merge(Query.from(Map.of("quu", "fez"))).add("moo").toString());
+                     query.set("baz", "bax").set(Map.of("quu", "fez")).set("moo").toString());
+
+        assertEquals("query '?foo=bar&baz&baz=bax&quu=fez&quu=pop&moo&moo&foo=bar'",
+                     query.add("baz", "bax").add(Map.of("quu", List.of("fez", "pop"))).add("moo").add("moo").add("foo", "bar").toString());
 
         assertThrows(NullPointerException.class,
                      () -> query.remove(null));
 
         assertThrows(NullPointerException.class,
-                     () -> query.add(null));
+                     () -> query.add((String) null));
 
         assertThrows(NullPointerException.class,
-                     () -> query.put(null, "hax"));
+                     () -> query.add(null, "hax"));
 
         assertThrows(NullPointerException.class,
-                     () -> query.put("hax", null));
+                     () -> query.add("hax", null));
 
         Map<String, String> names = new LinkedHashMap<>();
         names.put(null, "hax");
         assertThrows(NullPointerException.class,
-                     () -> query.merge(names));
+                     () -> query.set(names));
     }
 
 }