summaryrefslogtreecommitdiffstats
path: root/container-search
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@gmail.com>2020-10-07 11:03:29 +0200
committerJon Bratseth <bratseth@gmail.com>2020-10-07 11:03:29 +0200
commit35a58a4c72c325eb7d2a2f9e217c9ffb042ca6d4 (patch)
tree0d3977ae27bb608c738145cbd90c76b62fd004dc /container-search
parentc9335e0efde84cafdbc878fc4c4504e3ce12b93c (diff)
Use Optional
Diffstat (limited to 'container-search')
-rw-r--r--container-search/abi-spec.json1
-rw-r--r--container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java2
2 files changed, 2 insertions, 1 deletions
diff --git a/container-search/abi-spec.json b/container-search/abi-spec.json
index f8d5fb4e9a6..86e7ddc7e52 100644
--- a/container-search/abi-spec.json
+++ b/container-search/abi-spec.json
@@ -4225,6 +4225,7 @@
"public void <init>(com.yahoo.statistics.Statistics, com.yahoo.jdisc.Metric, java.util.concurrent.Executor, com.yahoo.container.logging.AccessLog, com.yahoo.search.query.profile.compiled.CompiledQueryProfileRegistry, com.yahoo.search.searchchain.ExecutionFactory, java.util.Optional)",
"public void <init>(com.yahoo.container.core.ChainsConfig, com.yahoo.search.config.IndexInfoConfig, com.yahoo.container.QrSearchersConfig, com.yahoo.vespa.configdefinition.SpecialtokensConfig, com.yahoo.statistics.Statistics, com.yahoo.language.Linguistics, com.yahoo.jdisc.Metric, com.yahoo.component.provider.ComponentRegistry, java.util.concurrent.Executor, com.yahoo.container.logging.AccessLog, com.yahoo.search.query.profile.config.QueryProfilesConfig, com.yahoo.component.provider.ComponentRegistry, com.yahoo.container.core.ContainerHttpConfig)",
"public final com.yahoo.container.jdisc.HttpResponse handle(com.yahoo.container.jdisc.HttpRequest)",
+ "public java.util.Optional getRequestType()",
"public com.yahoo.search.Result searchAndFill(com.yahoo.search.Query, com.yahoo.component.chain.Chain)",
"public com.yahoo.processing.rendering.Renderer getRendererCopy(com.yahoo.component.ComponentSpecification)",
"public com.yahoo.search.searchchain.SearchChainRegistry getSearchChainRegistry()",
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 80dc7a7b489..d4ebec6677a 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
@@ -252,7 +252,7 @@ public class SearchHandler extends LoggingRequestHandler {
}
@Override
- public Request.RequestType getRequestType() { return Request.RequestType.READ; }
+ public Optional<Request.RequestType> getRequestType() { return Optional.of(Request.RequestType.READ); }
private int getHttpResponseStatus(com.yahoo.container.jdisc.HttpRequest httpRequest, Result result) {
boolean benchmarkOutput = VespaHeaders.benchmarkOutput(httpRequest);