diff options
Diffstat (limited to 'gerrit-util-http/src/test/java/com/google/gerrit/util/http/testutil/FakeHttpServletRequest.java')
-rw-r--r-- | gerrit-util-http/src/test/java/com/google/gerrit/util/http/testutil/FakeHttpServletRequest.java | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/gerrit-util-http/src/test/java/com/google/gerrit/util/http/testutil/FakeHttpServletRequest.java b/gerrit-util-http/src/test/java/com/google/gerrit/util/http/testutil/FakeHttpServletRequest.java index cb8ed39150..56734ff76b 100644 --- a/gerrit-util-http/src/test/java/com/google/gerrit/util/http/testutil/FakeHttpServletRequest.java +++ b/gerrit-util-http/src/test/java/com/google/gerrit/util/http/testutil/FakeHttpServletRequest.java @@ -19,11 +19,11 @@ import static com.google.common.base.Preconditions.checkNotNull; import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.base.Splitter; +import com.google.common.base.Strings; import com.google.common.collect.Iterables; import com.google.common.collect.LinkedListMultimap; import com.google.common.collect.ListMultimap; import com.google.common.collect.Maps; -import com.google.gerrit.extensions.restapi.Url; import java.io.BufferedReader; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; @@ -60,6 +60,7 @@ public class FakeHttpServletRequest implements HttpServletRequest { private final ListMultimap<String, String> headers; private ListMultimap<String, String> parameters; + private String queryString; private String hostName; private int port; private String contextPath; @@ -158,6 +159,7 @@ public class FakeHttpServletRequest implements HttpServletRequest { } public void setQueryString(String qs) { + this.queryString = qs; ListMultimap<String, String> params = LinkedListMultimap.create(); for (String entry : Splitter.on('&').split(qs)) { List<String> kv = Splitter.on('=').limit(2).splitToList(entry); @@ -306,7 +308,7 @@ public class FakeHttpServletRequest implements HttpServletRequest { @Override public String getQueryString() { - return paramsToString(parameters); + return queryString; } @Override @@ -317,8 +319,8 @@ public class FakeHttpServletRequest implements HttpServletRequest { @Override public String getRequestURI() { String uri = contextPath + servletPath + path; - if (!parameters.isEmpty()) { - uri += "?" + paramsToString(parameters); + if (!Strings.isNullOrEmpty(queryString)) { + uri += '?' + queryString; } return uri; } @@ -379,23 +381,6 @@ public class FakeHttpServletRequest implements HttpServletRequest { throw new UnsupportedOperationException(); } - private static String paramsToString(ListMultimap<String, String> params) { - StringBuilder sb = new StringBuilder(); - boolean first = true; - for (Map.Entry<String, String> e : params.entries()) { - if (!first) { - sb.append('&'); - } else { - first = false; - } - sb.append(Url.encode(e.getKey())); - if (!"".equals(e.getValue())) { - sb.append('=').append(Url.encode(e.getValue())); - } - } - return sb.toString(); - } - @Override public AsyncContext getAsyncContext() { throw new UnsupportedOperationException(); |