diff options
author | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-06-28 13:03:46 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-06-28 13:03:46 +0200 |
commit | 0229966296d14040a3dfdf7003271adc7fdf7fc0 (patch) | |
tree | 0107be1ac535991270742cd03a4a827f9235a6b9 /jdisc_http_service | |
parent | badf90c93ec1a7b0a6c12a41a21b2030d01d9df5 (diff) |
Nonfunctional changes only
Diffstat (limited to 'jdisc_http_service')
-rw-r--r-- | jdisc_http_service/src/main/java/com/yahoo/jdisc/http/HttpHeaders.java | 2 | ||||
-rw-r--r-- | jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestFactory.java | 25 |
2 files changed, 11 insertions, 16 deletions
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/HttpHeaders.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/HttpHeaders.java index d5cdde300f0..039966133e8 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/HttpHeaders.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/HttpHeaders.java @@ -2,7 +2,7 @@ package com.yahoo.jdisc.http; /** - * @author <a href="mailto:anirudha@yahoo-inc.com">Anirudha Khanna</a> + * @author Anirudha Khanna */ @SuppressWarnings("UnusedDeclaration") public class HttpHeaders { diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestFactory.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestFactory.java index d355836e205..8fc1bb26603 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestFactory.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestFactory.java @@ -12,11 +12,11 @@ import java.net.URI; import java.util.Enumeration; /** - * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen Hult</a> + * @author Simon Thoresen Hult */ class HttpRequestFactory { - public static HttpRequest newJDiscRequest(final CurrentContainer container, - final HttpServletRequest servletRequest) { + + public static HttpRequest newJDiscRequest(CurrentContainer container, HttpServletRequest servletRequest) { return HttpRequest.newServerRequest( container, getUri(servletRequest), @@ -34,22 +34,18 @@ class HttpRequestFactory { } } - public static void copyHeaders(final HttpServletRequest from, - final HttpRequest to) { - for (final Enumeration<String> it = from.getHeaderNames(); it.hasMoreElements(); ) { - final String key = it.nextElement(); - for (final Enumeration<String> value = from.getHeaders(key); value.hasMoreElements(); ) { + public static void copyHeaders(HttpServletRequest from, HttpRequest to) { + for (Enumeration<String> it = from.getHeaderNames(); it.hasMoreElements(); ) { + String key = it.nextElement(); + for (Enumeration<String> value = from.getHeaders(key); value.hasMoreElements(); ) { to.headers().add(key, value.nextElement()); } } } private static String extraQuote(String queryString) { - // TODO this is just a stopgap measure, we need some sort of sane URI builder, do we have one? - String washed = null; - if (queryString == null) { - return null; - } + // TODO: Use an URI builder + if (queryString == null) return null; int toAndIncluding = -1; for (int i = 0; i < queryString.length(); ++i) { @@ -59,6 +55,7 @@ class HttpRequestFactory { toAndIncluding = i; } + String washed; if (toAndIncluding != (queryString.length() - 1)) { StringBuilder w = new StringBuilder(queryString.substring(0, toAndIncluding + 1)); for (int i = toAndIncluding + 1; i < queryString.length(); ++i) { @@ -91,8 +88,6 @@ class HttpRequestFactory { default: return null; } - } - } |