diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-11-29 16:45:12 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2022-11-29 16:45:12 +0100 |
commit | deaac2672dbf627a319b7ebaba808e7918bd0186 (patch) | |
tree | a019ca1c748cb00c3b77d2569a92915363e27e22 /container-core/src/main/java/com | |
parent | 7fbfecba694f1665d5c00bd504086a49898f8bb2 (diff) |
Reduce exposure of com.yahoo.jdisc.http.HttpRequest.
Diffstat (limited to 'container-core/src/main/java/com')
-rw-r--r-- | container-core/src/main/java/com/yahoo/container/jdisc/HttpRequest.java | 6 | ||||
-rw-r--r-- | container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/HttpRequest.java b/container-core/src/main/java/com/yahoo/container/jdisc/HttpRequest.java index d5ac3a9a124..39f55cedff5 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/HttpRequest.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/HttpRequest.java @@ -23,6 +23,7 @@ import java.util.List; import java.util.Map; import java.util.Objects; import java.util.Optional; +import java.util.concurrent.TimeUnit; import static com.yahoo.jdisc.http.HttpRequest.Method; @@ -454,6 +455,11 @@ public class HttpRequest { return parentRequest; } + /** Returns the time at which this Request was created. */ + public long creationTime(TimeUnit unit) { + return parentRequest.creationTime(unit); + } + /** * Returns the value of a request property/parameter. * Multi-value properties are not supported. diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java b/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java index fb7ba1ab39e..06d372c967c 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java @@ -79,14 +79,13 @@ public abstract class ThreadedHttpRequestHandler extends ThreadedRequestHandler @Override public final void handleRequest(Request request, BufferedContentChannel requestContent, ResponseHandler responseHandler) { log.log(Level.FINE, () -> "In " + this.getClass() + ".handleRequest()"); - com.yahoo.jdisc.http.HttpRequest jdiscRequest = asHttpRequest(request); - HttpRequest httpRequest = new HttpRequest(jdiscRequest, new UnsafeContentInputStream(requestContent.toReadable())); + HttpRequest httpRequest = new HttpRequest(asHttpRequest(request), new UnsafeContentInputStream(requestContent.toReadable())); LazyContentChannel channel = null; try { channel = new LazyContentChannel(httpRequest, responseHandler, metric, log); HttpResponse httpResponse = handle(httpRequest, channel); channel.setHttpResponse(httpResponse); // may or may not have already been done - render(httpRequest, httpResponse, channel, jdiscRequest.creationTime(TimeUnit.MILLISECONDS)); + render(httpRequest, httpResponse, channel, httpRequest.creationTime(TimeUnit.MILLISECONDS)); } catch (Exception e) { metric.add(UNHANDLED_EXCEPTIONS_METRIC, 1L, contextFor(request, Map.of("exception", e.getClass().getSimpleName()))); metric.add(RENDERING_ERRORS, 1, null); |