summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@oath.com>2018-10-15 21:48:57 +0200
committerJon Bratseth <bratseth@oath.com>2018-10-15 21:48:57 +0200
commit3bc795f90c342de3d0be5ad5aa51897722acc3f2 (patch)
treebe74b16b6f5a4bcfe558700ccb9f0691b36261da /application
parenta4cb23e1a152e204d67f3cd5140590e9e037c885 (diff)
Avoid deprecated method
Diffstat (limited to 'application')
-rw-r--r--application/src/main/java/com/yahoo/application/container/ProcessingBase.java12
-rw-r--r--application/src/main/java/com/yahoo/application/container/Search.java4
2 files changed, 4 insertions, 12 deletions
diff --git a/application/src/main/java/com/yahoo/application/container/ProcessingBase.java b/application/src/main/java/com/yahoo/application/container/ProcessingBase.java
index f1505e4429a..aaeddfe8aef 100644
--- a/application/src/main/java/com/yahoo/application/container/ProcessingBase.java
+++ b/application/src/main/java/com/yahoo/application/container/ProcessingBase.java
@@ -21,17 +21,9 @@ import java.util.concurrent.Executors;
* @author gjoranv
*/
@Beta
-public abstract class ProcessingBase<
- REQUEST extends Request,
- RESPONSE extends Response,
- PROCESSOR extends Processor>
-{
+public abstract class ProcessingBase<REQUEST extends Request, RESPONSE extends Response, PROCESSOR extends Processor> {
- /**
- * Returns a registry of configured chains.
- *
- * @return a registry of configured chains
- */
+ /** Returns a registry of configured chains */
public abstract ChainRegistry<PROCESSOR> getChains();
/**
diff --git a/application/src/main/java/com/yahoo/application/container/Search.java b/application/src/main/java/com/yahoo/application/container/Search.java
index 9503ce4fb50..46390d53afa 100644
--- a/application/src/main/java/com/yahoo/application/container/Search.java
+++ b/application/src/main/java/com/yahoo/application/container/Search.java
@@ -32,7 +32,7 @@ public final class Search extends ProcessingBase<Query, Result, Searcher> {
@Override
public ChainRegistry<Searcher> getChains() {
- return asChainRegistry(handler.getSearchChainRegistry());
+ return asChainRegistry();
}
@Override
@@ -58,7 +58,7 @@ public final class Search extends ProcessingBase<Query, Result, Searcher> {
}
// TODO: move to SearchHandler.getChainRegistry and deprecate SH.getSCReg?
- private ChainRegistry<Searcher> asChainRegistry(SearchChainRegistry legacyRegistry) {
+ private ChainRegistry<Searcher> asChainRegistry() {
ChainRegistry<Searcher> chains = new ChainRegistry<>();
for (Chain<Searcher> chain : handler.getSearchChainRegistry().allComponents())
chains.register(chain.getId(), chain);