aboutsummaryrefslogtreecommitdiffstats
path: root/container-search/src/main/java/com/yahoo/search/handler
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@gmail.com>2020-10-01 19:58:40 +0200
committerJon Bratseth <bratseth@gmail.com>2020-10-01 19:58:40 +0200
commitc9335e0efde84cafdbc878fc4c4504e3ce12b93c (patch)
tree5331bbc2140855d97ed1453d803af2de6bbd3a77 /container-search/src/main/java/com/yahoo/search/handler
parentf6a19e89f468e6b4603d46763eee2d720de55776 (diff)
Let handlers dedfine a default request type
Diffstat (limited to 'container-search/src/main/java/com/yahoo/search/handler')
-rw-r--r--container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
index bee25fbb47f..80dc7a7b489 100644
--- a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
+++ b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
@@ -251,6 +251,9 @@ public class SearchHandler extends LoggingRequestHandler {
}
}
+ @Override
+ public Request.RequestType getRequestType() { return Request.RequestType.READ; }
+
private int getHttpResponseStatus(com.yahoo.container.jdisc.HttpRequest httpRequest, Result result) {
boolean benchmarkOutput = VespaHeaders.benchmarkOutput(httpRequest);
if (benchmarkOutput) {
@@ -326,9 +329,7 @@ public class SearchHandler extends LoggingRequestHandler {
HttpSearchResponse response = new HttpSearchResponse(getHttpResponseStatus(request, result),
result, query, renderer,
extractTraceNode(query));
- response.setRequestType(Request.RequestType.READ);
- if (hostResponseHeaderKey.isPresent())
- response.headers().add(hostResponseHeaderKey.get(), selfHostname);
+ hostResponseHeaderKey.ifPresent(key -> response.headers().add(key, selfHostname));
if (benchmarking)
VespaHeaders.benchmarkOutput(response.headers(), benchmarkCoverage, response.getTiming(),