diff options
-rw-r--r-- | vespajlib/src/main/java/ai/vespa/http/HttpURL.java | 2 | ||||
-rw-r--r-- | vespajlib/src/test/java/ai/vespa/http/HttpURLTest.java | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/vespajlib/src/main/java/ai/vespa/http/HttpURL.java b/vespajlib/src/main/java/ai/vespa/http/HttpURL.java index cc4291442ff..916bbab9fe0 100644 --- a/vespajlib/src/main/java/ai/vespa/http/HttpURL.java +++ b/vespajlib/src/main/java/ai/vespa/http/HttpURL.java @@ -503,7 +503,7 @@ public class HttpURL { /** Intentionally not usable for constructing new URIs. Use {@link HttpURL} for that instead. */ @Override public String toString() { - return "query '" + raw() + "'"; + return head == null ? "no query" : "query '" + raw().substring(1) + "'"; } @Override diff --git a/vespajlib/src/test/java/ai/vespa/http/HttpURLTest.java b/vespajlib/src/test/java/ai/vespa/http/HttpURLTest.java index 3dbb022148b..7f3fce27074 100644 --- a/vespajlib/src/test/java/ai/vespa/http/HttpURLTest.java +++ b/vespajlib/src/test/java/ai/vespa/http/HttpURLTest.java @@ -178,23 +178,23 @@ class HttpURLTest { assertEquals(expected, query.remove("foo").lastEntries()); assertEquals(expected, Query.empty(Name::of).set("baz").lastEntries()); - assertEquals("query '?foo=bar&baz=bax&quu=fez&moo'", + assertEquals("query 'foo=bar&baz=bax&quu=fez&moo'", query.set("baz", "bax").set(Map.of("quu", "fez")).set("moo").toString()); Query bloated = query.add("baz", "bax").add(Map.of("quu", List.of("fez", "pop"))).add("moo").add("moo").add("foo", "bar"); - assertEquals("query '?foo=bar&baz&baz=bax&quu=fez&quu=pop&moo&moo&foo=bar'", + assertEquals("query 'foo=bar&baz&baz=bax&quu=fez&quu=pop&moo&moo&foo=bar'", bloated.toString()); - assertEquals("query '?foo=bar&quu=fez&quu=pop&moo&moo&foo=bar'", + assertEquals("query 'foo=bar&quu=fez&quu=pop&moo&moo&foo=bar'", bloated.remove("baz").toString()); - assertEquals("query '?baz&baz=bax&quu=fez&quu=pop&moo&moo'", + assertEquals("query 'baz&baz=bax&quu=fez&quu=pop&moo&moo'", bloated.remove("foo").toString()); - assertEquals("query '?foo=bar&baz&baz=bax&quu=fez&quu=pop&foo=bar&moo'", + assertEquals("query 'foo=bar&baz&baz=bax&quu=fez&quu=pop&foo=bar&moo'", bloated.set("moo").toString()); - assertEquals("query ''", + assertEquals("no query", bloated.remove("foo").remove("baz").remove("quu").remove("moo").toString()); assertThrows(NullPointerException.class, |