diff options
author | Kristian Aune <kraune@verizonmedia.com> | 2022-06-16 15:46:50 +0200 |
---|---|---|
committer | Kristian Aune <kraune@verizonmedia.com> | 2022-06-16 15:46:50 +0200 |
commit | 0ab2071f92d1b181c12dabb8c53c4653c09645c8 (patch) | |
tree | 9be0107f29a21d276165f27dc7ab7ac7b0a259c5 /container-search-gui | |
parent | cb2180e9d2d2411832521f00e1ae1ad9e44026d6 (diff) | |
parent | 69a3890ae5292eaaa527976c43535373d489ab00 (diff) |
Resolve merge conflict
Diffstat (limited to 'container-search-gui')
-rw-r--r-- | container-search-gui/pom.xml | 4 | ||||
-rw-r--r-- | container-search-gui/src/main/java/com/yahoo/search/query/gui/GUIHandler.java | 15 |
2 files changed, 11 insertions, 8 deletions
diff --git a/container-search-gui/pom.xml b/container-search-gui/pom.xml index 3f6f7f48921..d0c6706189d 100644 --- a/container-search-gui/pom.xml +++ b/container-search-gui/pom.xml @@ -8,12 +8,12 @@ <parent> <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> - <version>7-SNAPSHOT</version> + <version>8-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>container-search-gui</artifactId> <packaging>container-plugin</packaging> - <version>7-SNAPSHOT</version> + <version>8-SNAPSHOT</version> <dependencies> <dependency> <groupId>com.google.inject</groupId> diff --git a/container-search-gui/src/main/java/com/yahoo/search/query/gui/GUIHandler.java b/container-search-gui/src/main/java/com/yahoo/search/query/gui/GUIHandler.java index bbce02ed97a..e370b1f19d3 100644 --- a/container-search-gui/src/main/java/com/yahoo/search/query/gui/GUIHandler.java +++ b/container-search-gui/src/main/java/com/yahoo/search/query/gui/GUIHandler.java @@ -4,7 +4,7 @@ package com.yahoo.search.query.gui; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; -import com.google.inject.Inject; +import com.yahoo.component.annotation.Inject; import com.yahoo.container.QrSearchersConfig; import com.yahoo.container.jdisc.HttpRequest; import com.yahoo.container.jdisc.HttpResponse; @@ -17,6 +17,7 @@ import com.yahoo.search.config.IndexInfoConfig; import com.yahoo.search.query.Model; import com.yahoo.search.query.Presentation; import com.yahoo.search.query.Ranking; +import com.yahoo.search.query.Trace; import com.yahoo.search.query.ranking.Diversity; import com.yahoo.search.query.ranking.MatchPhase; import com.yahoo.search.query.restapi.ErrorResponse; @@ -192,11 +193,13 @@ public class GUIHandler extends ThreadedHttpRequestHandler { json.set("childMap", childMap); ArrayNode levelZeroParameters = jsonMapper.createArrayNode().add(MinimalQueryInserter.YQL.toString()).add(Query.HITS.toString()).add(Query.OFFSET.toString()) - .add("queryProfile").add(Query.NO_CACHE.toString()).add(Query.GROUPING_SESSION_CACHE.toString()) - .add(Query.SEARCH_CHAIN.toString()).add(Query.TIMEOUT.toString()).add("trace").add("tracelevel") - .add(Query.TRACE_LEVEL.toString()).add(Query.EXPLAIN_LEVEL.toString()).add("explainlevel").add(Model.MODEL).add(Ranking.RANKING).add("collapse").add("collapsesize").add("collapsefield") - .add(Presentation.PRESENTATION).add("pos").add("streaming").add("rules").add(RecallSearcher.recallName.toString()).add("user") - .add("metrics").add(""); + .add("queryProfile").add(Query.NO_CACHE.toString()).add(Query.GROUPING_SESSION_CACHE.toString()) + .add(Query.SEARCH_CHAIN.toString()).add(Query.TIMEOUT.toString()).add("trace") + .add("tracelevel").add("traceLevel") // TODO: Remove on Vespa 9 + .add("explainLevel").add("explainlevel") // TODO: Remove on Vespa 9 + .add(Model.MODEL).add(Ranking.RANKING).add("collapse").add("collapsesize").add("collapsefield") + .add(Presentation.PRESENTATION).add("pos").add("streaming").add("rules").add(RecallSearcher.recallName.toString()).add("user") + .add("metrics").add(""); json.set("levelZeroParameters", levelZeroParameters); return jsonMapper.writerWithDefaultPrettyPrinter().writeValueAsString(json); |