diff options
author | Arne H Juul <arnej27959@users.noreply.github.com> | 2021-10-10 13:53:56 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-10 13:53:56 +0200 |
commit | 2c5c43c14dbc62d83e6e4fe3de6695423f91cdd9 (patch) | |
tree | 3367ee492f4d4009078f01026af751ef24ba4fd7 | |
parent | 933496ef80008d51c26f2c3010d86a7c2b35d1d1 (diff) | |
parent | 94e30fff64a8d1149bd6436ac1ce7571f9e584cd (diff) |
Merge pull request #19490 from vespa-engine/bratseth/execution-context-cleanup
Bratseth/execution context cleanup
41 files changed, 92 insertions, 126 deletions
diff --git a/container-search/abi-spec.json b/container-search/abi-spec.json index 7e079e6c800..2108a5c7aa2 100644 --- a/container-search/abi-spec.json +++ b/container-search/abi-spec.json @@ -7822,8 +7822,10 @@ "public void <init>(com.yahoo.search.searchchain.SearchChainRegistry, com.yahoo.prelude.IndexFacts, com.yahoo.language.process.SpecialTokenRegistry, com.yahoo.search.rendering.RendererRegistry, com.yahoo.language.Linguistics, java.util.concurrent.Executor)", "public void <init>(com.yahoo.search.searchchain.SearchChainRegistry, com.yahoo.prelude.IndexFacts, com.yahoo.language.process.SpecialTokenRegistry, com.yahoo.search.rendering.RendererRegistry, com.yahoo.language.Linguistics)", "public static com.yahoo.search.searchchain.Execution$Context createContextStub()", + "public static com.yahoo.search.searchchain.Execution$Context createContextStub(com.yahoo.search.searchchain.SearchChainRegistry)", "public static com.yahoo.search.searchchain.Execution$Context createContextStub(com.yahoo.prelude.IndexFacts)", "public static com.yahoo.search.searchchain.Execution$Context createContextStub(com.yahoo.search.searchchain.SearchChainRegistry, com.yahoo.prelude.IndexFacts)", + "public static com.yahoo.search.searchchain.Execution$Context createContextStub(com.yahoo.prelude.IndexFacts, com.yahoo.language.Linguistics)", "public static com.yahoo.search.searchchain.Execution$Context createContextStub(com.yahoo.search.searchchain.SearchChainRegistry, com.yahoo.prelude.IndexFacts, com.yahoo.language.Linguistics)", "public void populateFrom(com.yahoo.search.searchchain.Execution$Context)", "public boolean equals(com.yahoo.search.searchchain.Execution$Context)", diff --git a/container-search/src/main/java/com/yahoo/search/query/Model.java b/container-search/src/main/java/com/yahoo/search/query/Model.java index 2dd4d5c86b1..81efadbba0a 100644 --- a/container-search/src/main/java/com/yahoo/search/query/Model.java +++ b/container-search/src/main/java/com/yahoo/search/query/Model.java @@ -90,7 +90,8 @@ public class Model implements Cloneable { private Set<String> restrict = new LinkedHashSet<>(); private String searchPath; private String documentDbName = null; - private Execution execution = new Execution(new Execution.Context(null, null, null, null, null, null)); + private Execution execution = new Execution(new Execution.Context(null, null, + null, null, null, Runnable::run)); public Model(Query query) { setParent(query); diff --git a/container-search/src/main/java/com/yahoo/search/searchchain/Execution.java b/container-search/src/main/java/com/yahoo/search/searchchain/Execution.java index aaf74cfd355..c507069b948 100644 --- a/container-search/src/main/java/com/yahoo/search/searchchain/Execution.java +++ b/container-search/src/main/java/com/yahoo/search/searchchain/Execution.java @@ -3,6 +3,7 @@ package com.yahoo.search.searchchain; import com.yahoo.component.chain.Chain; import com.yahoo.language.Linguistics; +import com.yahoo.language.simple.SimpleLinguistics; import com.yahoo.prelude.IndexFacts; import com.yahoo.prelude.Ping; import com.yahoo.prelude.Pong; @@ -14,9 +15,11 @@ import com.yahoo.search.Query; import com.yahoo.search.Result; import com.yahoo.search.Searcher; import com.yahoo.search.cluster.PingableSearcher; +import com.yahoo.search.rendering.Renderer; import com.yahoo.search.rendering.RendererRegistry; import com.yahoo.search.statistics.TimeTracker; +import java.util.Objects; import java.util.concurrent.Executor; import java.util.concurrent.Executors; @@ -123,43 +126,51 @@ public class Execution extends com.yahoo.processing.execution.Execution { this.tokenRegistry = tokenRegistry; this.rendererRegistry = rendererRegistry; this.linguistics = linguistics; - this.executor = executor; + this.executor = Objects.requireNonNull(executor, "The executor cannot be null"); } /** @deprecated pass an executor */ @Deprecated // TODO: Remove on Vespa 8 public Context(SearchChainRegistry searchChainRegistry, IndexFacts indexFacts, SpecialTokenRegistry tokenRegistry, RendererRegistry rendererRegistry, Linguistics linguistics) { - this(searchChainRegistry, indexFacts, tokenRegistry, rendererRegistry, linguistics, null); + this(searchChainRegistry, indexFacts, tokenRegistry, rendererRegistry, linguistics, Runnable::run); } - /** Creates a context stub with no information. This is for unit testing. */ + /** Creates a Context instance where everything except the given arguments is empty. This is for unit testing.*/ public static Context createContextStub() { - return createContextStub(null); + return createContextStub(null, null, null); } - /** - * Create a Context instance where only the index related settings are - * initialized. This is for unit testing. - */ + /** Creates a Context instance where everything except the given arguments is empty. This is for unit testing.*/ + public static Context createContextStub(SearchChainRegistry searchChainRegistry) { + return createContextStub(searchChainRegistry, null, null); + } + + /** Creates a Context instance where everything except the given arguments is empty. This is for unit testing.*/ public static Context createContextStub(IndexFacts indexFacts) { - return createContextStub(null, indexFacts); + return createContextStub(null, indexFacts, null); } - /** - * Create a Context instance where only the search chain registry and index facts are - * initialized. This is for unit testing. - */ + /** Creates a Context instance where everything except the given arguments is empty. This is for unit testing.*/ public static Context createContextStub(SearchChainRegistry searchChainRegistry, IndexFacts indexFacts) { return createContextStub(searchChainRegistry, indexFacts, null); } - /** - * Create a Context instance where only the search chain registry, index facts and linguistics are - * initialized. This is for unit testing. - */ - public static Context createContextStub(SearchChainRegistry searchChainRegistry, IndexFacts indexFacts, Linguistics linguistics) { - return new Context(searchChainRegistry, indexFacts, null, null, linguistics, Executors.newSingleThreadExecutor()); + /** Creates a Context instance where everything except the given arguments is empty. This is for unit testing.*/ + public static Context createContextStub(IndexFacts indexFacts, Linguistics linguistics) { + return createContextStub(null, indexFacts, linguistics); + } + + /** Creates a Context instance where everything except the given arguments is empty. This is for unit testing.*/ + public static Context createContextStub(SearchChainRegistry searchChainRegistry, + IndexFacts indexFacts, + Linguistics linguistics) { + return new Context(searchChainRegistry != null ? searchChainRegistry : new SearchChainRegistry(), + indexFacts != null ? indexFacts : new IndexFacts(), + null, + new RendererRegistry(Runnable::run), + linguistics != null ? linguistics : new SimpleLinguistics(), + Executors.newSingleThreadExecutor()); } /** diff --git a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/FastSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/FastSearcherTestCase.java index 518faf3481e..da93e0e845b 100644 --- a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/FastSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/FastSearcherTestCase.java @@ -81,8 +81,7 @@ public class FastSearcherTestCase { } private Execution createExecution(Searcher searcher) { - Execution.Context context = new Execution.Context(null, null, null, new RendererRegistry(Collections.emptyList()), new SimpleLinguistics(), null); - return new Execution(chainedAsSearchChain(searcher), context); + return new Execution(chainedAsSearchChain(searcher), Execution.Context.createContextStub()); } @Test diff --git a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/PartialFillTestCase.java b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/PartialFillTestCase.java index ac818cd2507..45ae8241696 100644 --- a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/PartialFillTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/PartialFillTestCase.java @@ -1,7 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.fastsearch.test; -import com.google.common.util.concurrent.MoreExecutors; import com.yahoo.component.chain.Chain; import com.yahoo.language.simple.SimpleLinguistics; import com.yahoo.prelude.fastsearch.FastHit; @@ -147,8 +146,7 @@ public class PartialFillTestCase { } private Execution createExecution(Searcher searcher) { - Execution.Context context = new Execution.Context(null, null, null, new RendererRegistry(MoreExecutors.directExecutor()), new SimpleLinguistics(), null); - return new Execution(chainedAsSearchChain(searcher), context); + return new Execution(chainedAsSearchChain(searcher), Execution.Context.createContextStub()); } private void doFill(Searcher searcher, Result result, String summaryClass) { diff --git a/container-search/src/test/java/com/yahoo/prelude/query/parser/test/ExactMatchAndDefaultIndexTestCase.java b/container-search/src/test/java/com/yahoo/prelude/query/parser/test/ExactMatchAndDefaultIndexTestCase.java index 5c913934941..02af6618953 100644 --- a/container-search/src/test/java/com/yahoo/prelude/query/parser/test/ExactMatchAndDefaultIndexTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/query/parser/test/ExactMatchAndDefaultIndexTestCase.java @@ -32,7 +32,7 @@ public class ExactMatchAndDefaultIndexTestCase { IndexFacts facts = new IndexFacts(new IndexModel(sd)); Query q = new Query("?query=" + enc("a/b foo.com") + "&default-index=testexact"); - q.getModel().setExecution(new Execution(new Execution.Context(null, facts, null, null, null, null))); + q.getModel().setExecution(new Execution(Execution.Context.createContextStub(facts))); assertEquals("AND testexact:a/b testexact:foo.com", q.getModel().getQueryTree().getRoot().toString()); q = new Query("?query=" + enc("a/b foo.com")); assertEquals("AND a b foo com", q.getModel().getQueryTree().getRoot().toString()); diff --git a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/CJKSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/CJKSearcherTestCase.java index 99df8d9ca76..b3b96299b90 100644 --- a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/CJKSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/CJKSearcherTestCase.java @@ -65,7 +65,7 @@ public class CJKSearcherTestCase { query.getModel().getQueryTree().setRoot(root); new Execution(new Chain<Searcher>(new CJKSearcher()), - new Execution.Context(null, indexFacts, null, null, linguistics, null)).search(query); + Execution.Context.createContextStub(indexFacts, linguistics)).search(query); assertEquals(expected, query.getModel().getQueryTree().getRoot().toString()); } diff --git a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/NormalizingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/NormalizingSearcherTestCase.java index 324d06db060..dbdd3345719 100644 --- a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/NormalizingSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/NormalizingSearcherTestCase.java @@ -124,7 +124,7 @@ public class NormalizingSearcherTestCase { private Execution createExecution() { return new Execution(new NormalizingSearcher(linguistics), - Execution.Context.createContextStub(null, createIndexFacts(), linguistics)); + Execution.Context.createContextStub(createIndexFacts(), linguistics)); } private IndexFacts createIndexFacts() { diff --git a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/QueryRewriteTestCase.java b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/QueryRewriteTestCase.java index 0d21bb54dc5..ae4c8de6c3f 100644 --- a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/QueryRewriteTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/QueryRewriteTestCase.java @@ -52,7 +52,7 @@ public class QueryRewriteTestCase { public void testRankContributingTermsAreNotRemovedOnFullRecall() { Query query = new Query(QueryTestCase.httpEncode("?query=default:term1 OR default:term2 OR default:term3 OR sddocname:per&type=adv&recall=+id:1&restrict=per")); RecallSearcher searcher = new RecallSearcher(); - Result result = new Execution(searcher, Execution.Context.createContextStub(new IndexFacts())).search(query); + Result result = new Execution(searcher, Execution.Context.createContextStub()).search(query); assertNull(result.hits().getError()); assertNull(QueryCanonicalizer.canonicalize(query)); assertRewritten(query, "AND (OR default:term1 default:term2 default:term3 sddocname:per) |id:1"); diff --git a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/RecallSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/RecallSearcherTestCase.java index 5398f828820..409d01b5c46 100755 --- a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/RecallSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/RecallSearcherTestCase.java @@ -41,7 +41,7 @@ public class RecallSearcherTestCase { public void testDenyRankItems() { RecallSearcher searcher = new RecallSearcher(); Query query = new Query("?recall=foo"); - Result result = new Execution(searcher, Execution.Context.createContextStub(new IndexFacts())).search(query); + Result result = new Execution(searcher, Execution.Context.createContextStub()).search(query); assertNotNull(result.hits().getError()); } @@ -60,7 +60,7 @@ public class RecallSearcherTestCase { private static void assertQueryTree(String query, List<String> ranked, List<String> unranked) { RecallSearcher searcher = new RecallSearcher(); Query obj = new Query(query); - Result result = new Execution(searcher, Execution.Context.createContextStub(new IndexFacts())).search(obj); + Result result = new Execution(searcher, Execution.Context.createContextStub()).search(obj); if (result.hits().getError() != null) { fail(result.hits().getError().toString()); } diff --git a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/StemmingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/StemmingSearcherTestCase.java index e36d020714d..571991d7696 100644 --- a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/StemmingSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/StemmingSearcherTestCase.java @@ -106,7 +106,7 @@ public class StemmingSearcherTestCase { Query q = new Query(QueryTestCase.httpEncode("?query=cars")); new Execution(new Chain<Searcher>(new StemmingSearcher(linguistics)), - new Execution.Context(null, indexFacts, null, null, linguistics, null)).search(q); + Execution.Context.createContextStub(indexFacts, linguistics)).search(q); assertEquals("cars", q.getModel().getQueryTree().getRoot().toString()); } @@ -145,7 +145,7 @@ public class StemmingSearcherTestCase { } private Execution.Context newExecutionContext() { - return new Execution.Context(null, indexFacts, null, null, linguistics, null); + return Execution.Context.createContextStub(indexFacts, linguistics); } private Execution newExecution() { diff --git a/container-search/src/test/java/com/yahoo/prelude/searcher/test/BlendingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/searcher/test/BlendingSearcherTestCase.java index 06bea76dc39..01380a52a33 100644 --- a/container-search/src/test/java/com/yahoo/prelude/searcher/test/BlendingSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/searcher/test/BlendingSearcherTestCase.java @@ -89,14 +89,14 @@ public class BlendingSearcherTestCase { query.setTimeout(10000); query.setOffset(query.getOffset()); query.setHits(query.getHits()); - Execution exec = new Execution(blendingChain, Execution.Context.createContextStub(chainRegistry, null)); + Execution exec = new Execution(blendingChain, Execution.Context.createContextStub(chainRegistry)); exec.context().populateFrom(execution.context()); return exec.search(query); } @Override public void fill(Result result, String summaryClass, Execution execution) { - new Execution(blendingChain, Execution.Context.createContextStub(chainRegistry, null)).fill(result, summaryClass); + new Execution(blendingChain, Execution.Context.createContextStub(chainRegistry)).fill(result, summaryClass); } public boolean initialize() { @@ -447,7 +447,7 @@ public class BlendingSearcherTestCase { BlendingSearcherWrapper searcher = setupFirstAndSecond(); Query query = new Query("/search?query=banana&search=nonesuch"); - Result result = new Execution(searcher, Execution.Context.createContextStub(new IndexFacts())).search(query); + Result result = new Execution(searcher, Execution.Context.createContextStub()).search(query); assertEquals(0, result.getConcreteHitCount()); assertNotNull(result.hits().getError()); ErrorMessage e = result.hits().getError(); @@ -462,7 +462,7 @@ public class BlendingSearcherTestCase { BlendingSearcherWrapper searcher = setupFirstAndSecond(); Query query = new Query("/search?query=banana&search=nonesuch,orsuch"); - Result result = new Execution(searcher, Execution.Context.createContextStub(new IndexFacts())).search(query); + Result result = new Execution(searcher, Execution.Context.createContextStub()).search(query); assertEquals(0, result.getConcreteHitCount()); assertNotNull(result.hits().getError()); ErrorMessage e = result.hits().getError(); @@ -477,7 +477,7 @@ public class BlendingSearcherTestCase { BlendingSearcherWrapper searcher = setupFirstAndSecond(); Query query = new Query("/search?query=banana&search=first,nonesuch,second"); - Result result = new Execution(searcher, Execution.Context.createContextStub(new IndexFacts())).search(query); + Result result = new Execution(searcher, Execution.Context.createContextStub()).search(query); assertEquals(3, result.getConcreteHitCount()); assertEquals(300.0, result.hits().get(1).getRelevance().getScore(), delta); assertEquals(200.0, result.hits().get(2).getRelevance().getScore(), delta); diff --git a/container-search/src/test/java/com/yahoo/prelude/searcher/test/FieldCollapsingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/searcher/test/FieldCollapsingSearcherTestCase.java index a1e865d78d9..79756d2eec4 100644 --- a/container-search/src/test/java/com/yahoo/prelude/searcher/test/FieldCollapsingSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/searcher/test/FieldCollapsingSearcherTestCase.java @@ -1,7 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.searcher.test; -import com.google.common.util.concurrent.MoreExecutors; import com.yahoo.component.chain.Chain; import com.yahoo.language.simple.SimpleLinguistics; import com.yahoo.prelude.fastsearch.FastHit; @@ -418,8 +417,7 @@ public class FieldCollapsingSearcherTestCase { } private Execution createExecution(Searcher searcher, Map<Searcher, Searcher> chained) { - Execution.Context context = new Execution.Context(null, null, null, new RendererRegistry(MoreExecutors.directExecutor()), new SimpleLinguistics(), null); - return new Execution(chainedAsSearchChain(searcher, chained), context); + return new Execution(chainedAsSearchChain(searcher, chained), Execution.Context.createContextStub()); } /** diff --git a/container-search/src/test/java/com/yahoo/prelude/searcher/test/PosSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/searcher/test/PosSearcherTestCase.java index b10eed7826a..43911b33161 100644 --- a/container-search/src/test/java/com/yahoo/prelude/searcher/test/PosSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/searcher/test/PosSearcherTestCase.java @@ -1,7 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.searcher.test; -import com.google.common.util.concurrent.MoreExecutors; import com.yahoo.component.chain.Chain; import com.yahoo.language.simple.SimpleLinguistics; import com.yahoo.search.Query; @@ -191,8 +190,7 @@ public class PosSearcherTestCase { } private Execution createExecution(Searcher searcher) { - Execution.Context context = new Execution.Context(null, null, null, new RendererRegistry(MoreExecutors.directExecutor()), new SimpleLinguistics()); - return new Execution(chainedAsSearchChain(searcher), context); + return new Execution(chainedAsSearchChain(searcher), Execution.Context.createContextStub()); } private Chain<Searcher> chainedAsSearchChain(Searcher topOfChain) { diff --git a/container-search/src/test/java/com/yahoo/prelude/searcher/test/QuotingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/searcher/test/QuotingSearcherTestCase.java index 0d5e5d1b3e4..2a7e9da2992 100644 --- a/container-search/src/test/java/com/yahoo/prelude/searcher/test/QuotingSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/searcher/test/QuotingSearcherTestCase.java @@ -1,7 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.searcher.test; -import com.google.common.util.concurrent.MoreExecutors; import com.yahoo.component.ComponentId; import com.yahoo.component.chain.Chain; import com.yahoo.config.subscription.ConfigGetter; @@ -137,8 +136,7 @@ public class QuotingSearcherTestCase { } private Execution createExecution(Searcher searcher, Map<Searcher, Searcher> chained) { - Execution.Context context = new Execution.Context(null, null, null, new RendererRegistry(MoreExecutors.directExecutor()), new SimpleLinguistics()); - return new Execution(chainedAsSearchChain(searcher, chained), context); + return new Execution(chainedAsSearchChain(searcher, chained), Execution.Context.createContextStub()); } } diff --git a/container-search/src/test/java/com/yahoo/prelude/searcher/test/ValidatePredicateSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/searcher/test/ValidatePredicateSearcherTestCase.java index b27bad606c1..5e3c4897d73 100644 --- a/container-search/src/test/java/com/yahoo/prelude/searcher/test/ValidatePredicateSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/searcher/test/ValidatePredicateSearcherTestCase.java @@ -62,8 +62,7 @@ public class ValidatePredicateSearcherTestCase { index.addCommand(command); searchDefinition.addIndex(index); IndexFacts indexFacts = new IndexFacts(new IndexModel(searchDefinition)); - Execution.Context context = new Execution.Context(null, indexFacts, null, new RendererRegistry(MoreExecutors.directExecutor()), new SimpleLinguistics(), null); - return new Execution(searcher, context).search(query); + return new Execution(searcher, Execution.Context.createContextStub(indexFacts)).search(query); } } diff --git a/container-search/src/test/java/com/yahoo/prelude/searcher/test/ValidateSortingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/searcher/test/ValidateSortingSearcherTestCase.java index 574d6332a3a..84b8ef32871 100644 --- a/container-search/src/test/java/com/yahoo/prelude/searcher/test/ValidateSortingSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/searcher/test/ValidateSortingSearcherTestCase.java @@ -1,9 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.searcher.test; -import com.google.common.util.concurrent.MoreExecutors; import com.yahoo.component.chain.Chain; -import com.yahoo.language.Linguistics; import com.yahoo.language.simple.SimpleLinguistics; import com.yahoo.search.Searcher; import com.yahoo.search.rendering.RendererRegistry; @@ -26,7 +24,7 @@ import static org.junit.Assert.*; /** * Check sorting validation behaves OK. * - * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> + * @author Steinar Knutsen */ public class ValidateSortingSearcherTestCase { @@ -112,8 +110,7 @@ public class ValidateSortingSearcherTestCase { } private Execution createExecution(Searcher searcher) { - Execution.Context context = new Execution.Context(null, null, null, new RendererRegistry(MoreExecutors.directExecutor()), new SimpleLinguistics(), null); - return new Execution(chainedAsSearchChain(searcher), context); + return new Execution(chainedAsSearchChain(searcher), Execution.Context.createContextStub()); } private Chain<Searcher> chainedAsSearchChain(Searcher topOfChain) { diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/BacktrackingTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/BacktrackingTestCase.java index a968daabcea..ac1791ae91a 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/BacktrackingTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/BacktrackingTestCase.java @@ -4,7 +4,6 @@ package com.yahoo.prelude.semantics.test; import java.util.ArrayList; import java.util.List; -import com.google.common.util.concurrent.MoreExecutors; import com.yahoo.component.chain.Chain; import com.yahoo.language.simple.SimpleLinguistics; import com.yahoo.search.Query; @@ -101,8 +100,7 @@ public class BacktrackingTestCase { } private Execution createExecution(Searcher searcher) { - Execution.Context context = new Execution.Context(null, null, null, new RendererRegistry(MoreExecutors.directExecutor()), new SimpleLinguistics()); - return new Execution(chainedAsSearchChain(searcher), context); + return new Execution(chainedAsSearchChain(searcher), Execution.Context.createContextStub()); } private Chain<Searcher> chainedAsSearchChain(Searcher topOfChain) { diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/ConfigurationTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/ConfigurationTestCase.java index 372924813b7..80c9e898302 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/ConfigurationTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/ConfigurationTestCase.java @@ -1,7 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.semantics.test; -import com.google.common.util.concurrent.MoreExecutors; import com.yahoo.component.chain.Chain; import com.yahoo.config.subscription.ConfigGetter; import com.yahoo.language.simple.SimpleLinguistics; @@ -129,8 +128,7 @@ public class ConfigurationTestCase { } private Execution createExecution(Searcher searcher) { - Execution.Context context = new Execution.Context(null, null, null, new RendererRegistry(MoreExecutors.directExecutor()), new SimpleLinguistics(), null); - return new Execution(chainedAsSearchChain(searcher), context); + return new Execution(chainedAsSearchChain(searcher), Execution.Context.createContextStub()); } private Chain<Searcher> chainedAsSearchChain(Searcher topOfChain) { diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/InheritanceTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/InheritanceTestCase.java index a78f1aa7d2a..d93fd218259 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/InheritanceTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/InheritanceTestCase.java @@ -5,16 +5,13 @@ import java.util.ArrayList; import java.util.List; import java.util.StringTokenizer; -import com.google.common.util.concurrent.MoreExecutors; import com.yahoo.component.chain.Chain; -import com.yahoo.language.simple.SimpleLinguistics; import com.yahoo.search.Query; import com.yahoo.prelude.semantics.RuleBase; import com.yahoo.prelude.semantics.RuleBaseException; import com.yahoo.prelude.semantics.SemanticSearcher; import com.yahoo.search.Result; import com.yahoo.search.Searcher; -import com.yahoo.search.rendering.RendererRegistry; import com.yahoo.search.searchchain.Execution; import com.yahoo.search.test.QueryTestCase; import org.junit.Test; @@ -173,9 +170,7 @@ public class InheritanceTestCase { } private Execution createExecution(Searcher searcher) { - Execution.Context context = new Execution.Context(null, null, null, - new RendererRegistry(MoreExecutors.directExecutor()), new SimpleLinguistics()); - return new Execution(chainedAsSearchChain(searcher), context); + return new Execution(chainedAsSearchChain(searcher), Execution.Context.createContextStub()); } private Chain<Searcher> chainedAsSearchChain(Searcher topOfChain) { diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/RuleBaseAbstractTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/RuleBaseAbstractTestCase.java index 5a7599e66cc..baccb73cd93 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/RuleBaseAbstractTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/RuleBaseAbstractTestCase.java @@ -1,15 +1,12 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.semantics.test; -import com.google.common.util.concurrent.MoreExecutors; import com.yahoo.component.chain.Chain; -import com.yahoo.language.simple.SimpleLinguistics; import com.yahoo.search.Query; import com.yahoo.prelude.semantics.RuleBase; import com.yahoo.prelude.semantics.RuleBaseException; import com.yahoo.prelude.semantics.SemanticSearcher; import com.yahoo.search.Searcher; -import com.yahoo.search.rendering.RendererRegistry; import com.yahoo.search.searchchain.Execution; import com.yahoo.search.test.QueryTestCase; @@ -23,7 +20,6 @@ import static org.junit.Assert.assertEquals; * * @author bratseth */ -@SuppressWarnings("deprecation") public abstract class RuleBaseAbstractTestCase { protected final String root = "src/test/java/com/yahoo/prelude/semantics/test/rulebases/"; @@ -69,8 +65,7 @@ public abstract class RuleBaseAbstractTestCase { } private Execution createExecution(Searcher searcher) { - Execution.Context context = new Execution.Context(null, null, null, new RendererRegistry(MoreExecutors.directExecutor()), new SimpleLinguistics()); - return new Execution(chainedAsSearchChain(searcher), context); + return new Execution(chainedAsSearchChain(searcher), Execution.Context.createContextStub()); } private Chain<Searcher> chainedAsSearchChain(Searcher topOfChain) { diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/SemanticSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/SemanticSearcherTestCase.java index 5c8378a0ced..29cc5c6e23a 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/SemanticSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/SemanticSearcherTestCase.java @@ -1,16 +1,12 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.semantics.test; -import com.google.common.util.concurrent.MoreExecutors; import com.yahoo.component.chain.Chain; -import com.yahoo.language.Linguistics; -import com.yahoo.language.simple.SimpleLinguistics; import com.yahoo.prelude.query.WeightedSetItem; import com.yahoo.search.Query; import com.yahoo.prelude.query.NullItem; import com.yahoo.search.Result; import com.yahoo.search.Searcher; -import com.yahoo.search.rendering.RendererRegistry; import com.yahoo.search.searchchain.Execution; import org.junit.Test; @@ -180,8 +176,7 @@ public class SemanticSearcherTestCase extends RuleBaseAbstractTestCase { } private Execution createExecution(Searcher searcher) { - Execution.Context context = new Execution.Context(null, null, null, new RendererRegistry(MoreExecutors.directExecutor()), new SimpleLinguistics(), null); - return new Execution(chainedAsSearchChain(searcher), context); + return new Execution(chainedAsSearchChain(searcher), Execution.Context.createContextStub()); } private Chain<Searcher> chainedAsSearchChain(Searcher topOfChain) { diff --git a/container-search/src/test/java/com/yahoo/prelude/test/IndexFactsTestCase.java b/container-search/src/test/java/com/yahoo/prelude/test/IndexFactsTestCase.java index 66750c38ccd..eb53ab4bf86 100644 --- a/container-search/src/test/java/com/yahoo/prelude/test/IndexFactsTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/test/IndexFactsTestCase.java @@ -246,7 +246,7 @@ public class IndexFactsTestCase { private Query newQuery(String queryString, IndexFacts indexFacts) { Query query = new Query(queryString); - query.getModel().setExecution(new Execution(new Execution.Context(null, indexFacts, null, null, null, null))); + query.getModel().setExecution(new Execution(Execution.Context.createContextStub(indexFacts))); return query; } diff --git a/container-search/src/test/java/com/yahoo/prelude/test/QueryTestCase.java b/container-search/src/test/java/com/yahoo/prelude/test/QueryTestCase.java index b21c18b6879..526f520a583 100644 --- a/container-search/src/test/java/com/yahoo/prelude/test/QueryTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/test/QueryTestCase.java @@ -359,12 +359,8 @@ public class QueryTestCase { private Query newQueryFromEncoded(String encodedQueryString, Language language, Linguistics linguistics) { Query query = new Query(encodedQueryString); - query.getModel().setExecution(new Execution(new Execution.Context(null, - createIndexFacts(), - null, - null, - linguistics, - null))); + query.getModel().setExecution(new Execution(Execution.Context.createContextStub(createIndexFacts(), + linguistics))); query.getModel().setLanguage(language); return query; } diff --git a/container-search/src/test/java/com/yahoo/search/federation/FederationSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/federation/FederationSearcherTestCase.java index d7c3217069c..8c7e5fd59c6 100644 --- a/container-search/src/test/java/com/yahoo/search/federation/FederationSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/federation/FederationSearcherTestCase.java @@ -120,7 +120,7 @@ public class FederationSearcherTestCase { defaultProfile.freeze(); Query q = new Query(QueryTestCase.httpEncode("?query=test"), defaultProfile.compile(null)); - Result result = new Execution(mainChain, Execution.Context.createContextStub(chainRegistry, null)).search(q); + Result result = new Execution(mainChain, Execution.Context.createContextStub(chainRegistry)).search(q); assertNull(result.hits().getError()); assertEquals("source:mySource1", result.hits().get(0).getId().stringValue()); assertEquals("source:mySource2", result.hits().get(1).getId().stringValue()); @@ -132,7 +132,7 @@ public class FederationSearcherTestCase { Query q = new Query(com.yahoo.search.test.QueryTestCase.httpEncode("?query=test&traceLevel=1")); - Execution execution = new Execution(mainChain, Execution.Context.createContextStub(chainRegistry, null)); + Execution execution = new Execution(mainChain, Execution.Context.createContextStub(chainRegistry)); Result result = execution.search(q); assertNull(result.hits().getError()); TwoSourceChecker lookForTraces = new TwoSourceChecker(); @@ -173,7 +173,7 @@ public class FederationSearcherTestCase { Query q = new Query(com.yahoo.search.test.QueryTestCase.httpEncode("?query=test&traceLevel=1&sources=source1")); - Execution execution = new Execution(mainChain, Execution.Context.createContextStub(chainRegistry, null)); + Execution execution = new Execution(mainChain, Execution.Context.createContextStub(chainRegistry)); Result result = execution.search(q); assertNull(result.hits().getError()); TwoSourceChecker lookForTraces = new TwoSourceChecker(); @@ -188,7 +188,7 @@ public class FederationSearcherTestCase { Query q = new Query(com.yahoo.search.test.QueryTestCase.httpEncode("?query=test&traceLevel=1&sources=source1")); - Execution execution = new Execution(mainChain, Execution.Context.createContextStub(chainRegistry, null)); + Execution execution = new Execution(mainChain, Execution.Context.createContextStub(chainRegistry)); Result result = execution.search(q); assertNull(result.hits().getError()); TwoSourceChecker lookForTraces = new TwoSourceChecker(); @@ -235,7 +235,7 @@ public class FederationSearcherTestCase { Query q = new Query(QueryTestCase.httpEncode("?query=test&source.mySource1.presentation.summary=nalle&source.mySource1.customSourceProperty=foo&source.mySource2.custom.source.property=bar&source.mySource1.hits=13&source.mySource1.offset=1")); - Result result = new Execution(mainChain, Execution.Context.createContextStub(chainRegistry, null)).search(q); + Result result = new Execution(mainChain, Execution.Context.createContextStub(chainRegistry)).search(q); assertNull(result.hits().getError()); return result; } @@ -254,19 +254,19 @@ public class FederationSearcherTestCase { addChained(new QueryCheckSearcher(query), sourceName); addChained(new MockSearcher(), "mySource1"); Chain<Searcher> mainChain = new Chain<>("default", createStrictFederationSearcher()); - Result result = new Execution(mainChain, Execution.Context.createContextStub(chainRegistry, null)).search(query); + Result result = new Execution(mainChain, Execution.Context.createContextStub(chainRegistry)).search(query); HitGroup h = (HitGroup) result.hits().get(0); assertNull(h.getErrorHit()); assertSame(QueryCheckSearcher.OK, h.get(0).getField(QueryCheckSearcher.STATUS)); mainChain = new Chain<>("default", createFederationSearcher()); - result = new Execution(mainChain, Execution.Context.createContextStub(chainRegistry, null)).search(query); + result = new Execution(mainChain, Execution.Context.createContextStub(chainRegistry)).search(query); h = (HitGroup) result.hits().get(0); assertSame(QueryCheckSearcher.FEDERATION_SEARCHER_HAS_CLONED_THE_QUERY, h.getError().getDetailedMessage()); query = new Query(QueryTestCase.httpEncode("?query=test&sources=" + sourceName + ",mySource1")); addChained(new QueryCheckSearcher(query), sourceName); - result = new Execution(mainChain, Execution.Context.createContextStub(chainRegistry, null)).search(query); + result = new Execution(mainChain, Execution.Context.createContextStub(chainRegistry)).search(query); h = (HitGroup) result.hits().get(0); assertEquals("source:" + sourceName, h.getId().stringValue()); assertSame(QueryCheckSearcher.FEDERATION_SEARCHER_HAS_CLONED_THE_QUERY, h.getError().getDetailedMessage()); @@ -281,7 +281,7 @@ public class FederationSearcherTestCase { Query q = new Query("?query=test"); - Result result = new Execution(mainChain, Execution.Context.createContextStub(chainRegistry, null)).search(q); + Result result = new Execution(mainChain, Execution.Context.createContextStub(chainRegistry)).search(q); assertNull(result.hits().getError()); assertEquals("source:mySource1", result.hits().get(0).getId().stringValue()); assertEquals("source:mySource2", result.hits().get(1).getId().stringValue()); @@ -333,7 +333,7 @@ public class FederationSearcherTestCase { QueryProfile profile = new QueryProfile("test"); profile.set("source.news.provider", providerName, null); Query query = new Query(QueryTestCase.httpEncode("?query=test&model.sources=news"), profile.compile(null)); - Result result = new Execution(registry.getComponent("default"), Execution.Context.createContextStub(registry, null)).search(query); + Result result = new Execution(registry.getComponent("default"), Execution.Context.createContextStub(registry)).search(query); assertEquals(1, result.hits().size()); assertNotNull(result.hits().get(providerName + ":1")); } diff --git a/container-search/src/test/java/com/yahoo/search/federation/FederationTester.java b/container-search/src/test/java/com/yahoo/search/federation/FederationTester.java index 7a9d5f3a4f0..15464362f41 100644 --- a/container-search/src/test/java/com/yahoo/search/federation/FederationTester.java +++ b/container-search/src/test/java/com/yahoo/search/federation/FederationTester.java @@ -68,7 +68,7 @@ class FederationTester { private Execution createExecution() { registry.freeze(); - return new Execution(new Chain<Searcher>(buildFederationSearcher()), Execution.Context.createContextStub(registry, null)); + return new Execution(new Chain<Searcher>(buildFederationSearcher()), Execution.Context.createContextStub(registry)); } public void fill(Result result) { diff --git a/container-search/src/test/java/com/yahoo/search/query/rewrite/test/SearchChainDispatcherSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/query/rewrite/test/SearchChainDispatcherSearcherTestCase.java index 0eaa87ee32f..bf204cf3d6b 100644 --- a/container-search/src/test/java/com/yahoo/search/query/rewrite/test/SearchChainDispatcherSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/query/rewrite/test/SearchChainDispatcherSearcherTestCase.java @@ -61,7 +61,7 @@ public class SearchChainDispatcherSearcherTestCase { // Create a chain containing only the dispatcher Chain<Searcher> mainSearchChain = new Chain<>(searchChainDispatcher); - Execution execution = new Execution(mainSearchChain, Execution.Context.createContextStub(registry, null)); + Execution execution = new Execution(mainSearchChain, Execution.Context.createContextStub(registry)); utils = new QueryRewriteSearcherTestUtils(execution); } @@ -152,7 +152,7 @@ public class SearchChainDispatcherSearcherTestCase { // Create a chain containing only the dispatcher Chain<Searcher> mainSearchChain = new Chain<>(searchers); - Execution execution = new Execution(mainSearchChain, Execution.Context.createContextStub(registry, null)); + Execution execution = new Execution(mainSearchChain, Execution.Context.createContextStub(registry)); new QueryRewriteSearcherTestUtils(execution); IntentModel intentModel = new IntentModel( diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/VespaAsyncSearcherTest.java b/container-search/src/test/java/com/yahoo/search/searchchain/VespaAsyncSearcherTest.java index 7ac6ded7877..341e55df777 100644 --- a/container-search/src/test/java/com/yahoo/search/searchchain/VespaAsyncSearcherTest.java +++ b/container-search/src/test/java/com/yahoo/search/searchchain/VespaAsyncSearcherTest.java @@ -71,7 +71,7 @@ public class VespaAsyncSearcherTest { @Test public void testAsyncExecution() { Chain<Searcher> chain = new Chain<>(new FirstSearcher(), new SecondSearcher()); - Execution execution = new Execution(chain, Execution.Context.createContextStub(null)); + Execution execution = new Execution(chain, Execution.Context.createContextStub()); Query query = new Query(); execution.search(query); } diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/test/ExecutionTestCase.java b/container-search/src/test/java/com/yahoo/search/searchchain/test/ExecutionTestCase.java index af4194562b0..129437a5429 100644 --- a/container-search/src/test/java/com/yahoo/search/searchchain/test/ExecutionTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/searchchain/test/ExecutionTestCase.java @@ -163,7 +163,7 @@ public class ExecutionTestCase { @Test public void testBasicFill() { Chain<Searcher> chain = new Chain<Searcher>(new FillableResultSearcher()); - Execution execution = new Execution(chain, Execution.Context.createContextStub(null)); + Execution execution = new Execution(chain, Execution.Context.createContextStub()); Result result = execution.search(new Query(com.yahoo.search.test.QueryTestCase.httpEncode("?presentation.summary=all"))); assertNotNull(result.hits().get("a")); diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/test/FutureDataTestCase.java b/container-search/src/test/java/com/yahoo/search/searchchain/test/FutureDataTestCase.java index 573c8ca9790..9c36971f688 100644 --- a/container-search/src/test/java/com/yahoo/search/searchchain/test/FutureDataTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/searchchain/test/FutureDataTestCase.java @@ -50,7 +50,7 @@ public class FutureDataTestCase { Query query = new Query(); query.setTimeout(5000); - Result result = new Execution(main, Execution.Context.createContextStub(searchChainRegistry,null)).search(query); + Result result = new Execution(main, Execution.Context.createContextStub(searchChainRegistry)).search(query); assertNotNull(result); HitGroup syncGroup = (HitGroup)result.hits().get("source:sync"); diff --git a/container-search/src/test/java/com/yahoo/search/searchers/ValidateNearestNeighborTestCase.java b/container-search/src/test/java/com/yahoo/search/searchers/ValidateNearestNeighborTestCase.java index 63a05e6e2d8..d656ed640a6 100644 --- a/container-search/src/test/java/com/yahoo/search/searchers/ValidateNearestNeighborTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/searchers/ValidateNearestNeighborTestCase.java @@ -1,11 +1,8 @@ // Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.searchers; -import com.google.common.util.concurrent.MoreExecutors; - import com.yahoo.config.subscription.ConfigGetter; import com.yahoo.config.subscription.RawSource; -import com.yahoo.language.simple.SimpleLinguistics; import com.yahoo.prelude.IndexFacts; import com.yahoo.prelude.IndexModel; import com.yahoo.prelude.SearchDefinition; @@ -13,7 +10,6 @@ import com.yahoo.search.Query; import com.yahoo.search.query.parser.Parsable; import com.yahoo.search.query.parser.ParserEnvironment; import com.yahoo.search.query.QueryTree; -import com.yahoo.search.rendering.RendererRegistry; import com.yahoo.search.Result; import com.yahoo.search.result.ErrorMessage; import com.yahoo.search.searchchain.Execution; @@ -232,8 +228,7 @@ public class ValidateNearestNeighborTestCase { query.getRanking().getFeatures().put("query(qvector)", qTensor); SearchDefinition searchDefinition = new SearchDefinition("document"); IndexFacts indexFacts = new IndexFacts(new IndexModel(searchDefinition)); - Execution.Context context = new Execution.Context(null, indexFacts, null, new RendererRegistry(MoreExecutors.directExecutor()), new SimpleLinguistics(), null); - return new Execution(searcher, context).search(query); + return new Execution(searcher, Execution.Context.createContextStub(indexFacts)).search(query); } } diff --git a/container-search/src/test/java/com/yahoo/search/searchers/test/InputCheckingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/searchers/test/InputCheckingSearcherTestCase.java index c754193ff72..91784c82800 100644 --- a/container-search/src/test/java/com/yahoo/search/searchers/test/InputCheckingSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/searchers/test/InputCheckingSearcherTestCase.java @@ -33,7 +33,7 @@ public class InputCheckingSearcherTestCase { @Before public void setUp() { execution = new Execution(new Chain<Searcher>(new InputCheckingSearcher(MetricReceiver.nullImplementation)), - Execution.Context.createContextStub(new IndexFacts())); + Execution.Context.createContextStub()); } @After diff --git a/container-search/src/test/java/com/yahoo/search/searchers/test/ValidateMatchPhaseSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/searchers/test/ValidateMatchPhaseSearcherTestCase.java index 880140aba23..86ffb1f9830 100644 --- a/container-search/src/test/java/com/yahoo/search/searchers/test/ValidateMatchPhaseSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/searchers/test/ValidateMatchPhaseSearcherTestCase.java @@ -1,14 +1,10 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.searchers.test; -import com.google.common.util.concurrent.MoreExecutors; import com.yahoo.component.chain.Chain; import com.yahoo.config.subscription.ConfigGetter; import com.yahoo.config.subscription.RawSource; -import com.yahoo.language.Linguistics; -import com.yahoo.language.simple.SimpleLinguistics; import com.yahoo.search.Searcher; -import com.yahoo.search.rendering.RendererRegistry; import com.yahoo.search.searchchain.Execution; import com.yahoo.search.searchers.ValidateMatchPhaseSearcher; import com.yahoo.search.Query; @@ -26,7 +22,7 @@ import static org.junit.Assert.*; */ public class ValidateMatchPhaseSearcherTestCase { - private ValidateMatchPhaseSearcher searcher; + private final ValidateMatchPhaseSearcher searcher; public ValidateMatchPhaseSearcherTestCase() { searcher = new ValidateMatchPhaseSearcher( @@ -108,8 +104,7 @@ public class ValidateMatchPhaseSearcherTestCase { } private Execution createExecution(Searcher searcher) { - Execution.Context context = new Execution.Context(null, null, null, new RendererRegistry(MoreExecutors.directExecutor()), new SimpleLinguistics(), null); - return new Execution(chainedAsSearchChain(searcher), context); + return new Execution(chainedAsSearchChain(searcher), Execution.Context.createContextStub()); } private Chain<Searcher> chainedAsSearchChain(Searcher topOfChain) { diff --git a/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java b/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java index e3f7786a52e..4b94df17fe0 100644 --- a/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java @@ -1094,7 +1094,7 @@ public class QueryTestCase { } IndexFacts indexFacts = new IndexFacts(new IndexModel(sd)); MockLinguistics mockLinguistics = new MockLinguistics(); - q.getModel().setExecution(new Execution(Execution.Context.createContextStub(null, indexFacts, mockLinguistics))); + q.getModel().setExecution(new Execution(Execution.Context.createContextStub(indexFacts, mockLinguistics))); q.getModel().getQueryTree(); // cause parsing assertEquals(expectedDetectionText, mockLinguistics.detector.lastDetectionText); } diff --git a/container-search/src/test/java/com/yahoo/search/yql/FieldFilterTestCase.java b/container-search/src/test/java/com/yahoo/search/yql/FieldFilterTestCase.java index 8bcd0d3ec4c..b1093e54b68 100644 --- a/container-search/src/test/java/com/yahoo/search/yql/FieldFilterTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/yql/FieldFilterTestCase.java @@ -43,7 +43,7 @@ public class FieldFilterTestCase { mockBackend.addResult(query, result); searchChain = new Chain<Searcher>(new FieldFilter(), mockBackend); - context = Execution.Context.createContextStub(null); + context = Execution.Context.createContextStub(); execution = new Execution(searchChain, context); } diff --git a/container-search/src/test/java/com/yahoo/search/yql/MinimalQueryInserterTestCase.java b/container-search/src/test/java/com/yahoo/search/yql/MinimalQueryInserterTestCase.java index 9d4b4c5735a..09d1dc71249 100644 --- a/container-search/src/test/java/com/yahoo/search/yql/MinimalQueryInserterTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/yql/MinimalQueryInserterTestCase.java @@ -42,7 +42,7 @@ public class MinimalQueryInserterTestCase { @Before public void setUp() throws Exception { searchChain = new Chain<>(new MinimalQueryInserter()); - context = Execution.Context.createContextStub(null, null, new SimpleLinguistics()); + context = Execution.Context.createContextStub(); execution = new Execution(searchChain, context); } diff --git a/container-search/src/test/java/com/yahoo/search/yql/UserInputTestCase.java b/container-search/src/test/java/com/yahoo/search/yql/UserInputTestCase.java index 6c28ff5c439..3eb6f5e7e38 100644 --- a/container-search/src/test/java/com/yahoo/search/yql/UserInputTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/yql/UserInputTestCase.java @@ -33,7 +33,7 @@ public class UserInputTestCase { @Before public void setUp() throws Exception { searchChain = new Chain<>(new MinimalQueryInserter()); - context = Execution.Context.createContextStub(null); + context = Execution.Context.createContextStub(); execution = new Execution(searchChain, context); } diff --git a/container-search/src/test/java/com/yahoo/search/yql/YqlFieldAndSourceTestCase.java b/container-search/src/test/java/com/yahoo/search/yql/YqlFieldAndSourceTestCase.java index c96175a0d92..0cf5ea75526 100644 --- a/container-search/src/test/java/com/yahoo/search/yql/YqlFieldAndSourceTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/yql/YqlFieldAndSourceTestCase.java @@ -61,7 +61,7 @@ public class YqlFieldAndSourceTestCase { .documentdb(buildDocumentdbArray())); searchChain = new Chain<>(new FieldFiller(config), mockBackend); - context = Execution.Context.createContextStub(null); + context = Execution.Context.createContextStub(); execution = new Execution(searchChain, context); } diff --git a/container-search/src/test/java/com/yahoo/search/yql/YqlParserTestCase.java b/container-search/src/test/java/com/yahoo/search/yql/YqlParserTestCase.java index 0728c5c5721..1010c43c2be 100644 --- a/container-search/src/test/java/com/yahoo/search/yql/YqlParserTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/yql/YqlParserTestCase.java @@ -1001,7 +1001,7 @@ public class YqlParserTestCase { // Cause parsing :-\ Chain<Searcher> searchChain = new Chain<>(new MinimalQueryInserter()); - Execution.Context context = Execution.Context.createContextStub(null, null, new SimpleLinguistics()); + Execution.Context context = Execution.Context.createContextStub(); Execution execution = new Execution(searchChain, context); execution.search(query); @@ -1077,9 +1077,7 @@ public class YqlParserTestCase { test.addIndex(hostField); Chain<Searcher> searchChain = new Chain<>(new MinimalQueryInserter()); - Execution.Context context = Execution.Context.createContextStub(null, - new IndexFacts(new IndexModel(test)), - new SimpleLinguistics()); + Execution.Context context = Execution.Context.createContextStub(new IndexFacts(new IndexModel(test))); Execution execution = new Execution(searchChain, context); execution.search(query); diff --git a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/MetricsSearcherTestCase.java b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/MetricsSearcherTestCase.java index 6c2ff66cd9c..c407945ee15 100644 --- a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/MetricsSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/MetricsSearcherTestCase.java @@ -23,7 +23,7 @@ public class MetricsSearcherTestCase { private MetricsSearcher metricsSearcher = new MetricsSearcher(); private MockBackend backend = new MockBackend(); private Chain<Searcher> chain = new Chain<>(metricsSearcher, backend); - private Execution.Context context = Execution.Context.createContextStub(null); + private Execution.Context context = Execution.Context.createContextStub(); private MetricsSearcher.Stats expStatsLt1 = new MetricsSearcher.Stats(); private static final String LOADTYPE1 = "lt1"; private MetricsSearcher.Stats expStatsLt2 = new MetricsSearcher.Stats(); diff --git a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcherTestCase.java index d38c60bf74a..1f074eeae78 100644 --- a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcherTestCase.java @@ -157,7 +157,7 @@ public class VdsStreamingSearcherTestCase { } private static Result executeQuery(VdsStreamingSearcher searcher, Query query) { - Execution execution = new Execution(new Execution.Context(null, null, null, null, null, null)); + Execution execution = new Execution(Execution.Context.createContextStub()); return searcher.doSearch2(query, execution); } |