diff options
author | gjoranv <gv@verizonmedia.com> | 2020-05-22 20:23:26 +0200 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2020-05-22 20:30:31 +0200 |
commit | 35bf92aabba393a11bbb086efa8bbe63482bf695 (patch) | |
tree | 6ae95348447bc06706e3b1a4553465191ab3e5ad /config-model | |
parent | 4866c4fd7f7011310067a288624b355a850ff547 (diff) |
Add helper method to create a component from class and bundle.
Diffstat (limited to 'config-model')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/component/Component.java | 5 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/component/Component.java b/config-model/src/main/java/com/yahoo/vespa/model/container/component/Component.java index 08b6e321aa3..6d891c55075 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/component/Component.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/component/Component.java @@ -26,6 +26,11 @@ public class Component<CHILD extends AbstractConfigProducer<?>, MODEL extends Co this.model = model; } + /** Returns a component that uses its class name as id. */ + public static Component<?,?> fromClassAndBundle(String className, String bundle) { + return new Component<>(new ComponentModel(className, null, bundle)); + } + public ComponentId getGlobalComponentId() { return model.getComponentId(); } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java b/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java index 5b9a4775db4..58d12663c86 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java @@ -55,7 +55,7 @@ public class ContainerSearch extends ContainerSubsystem<SearchChains> this.owningCluster = cluster; this.options = options; - owningCluster.addComponent(queryProfileRegistryComponent()); + owningCluster.addComponent(Component.fromClassAndBundle(QUERY_PROFILE_REGISTRY_CLASS, searchAndDocprocBundle)); } public void connectSearchClusters(Map<String, AbstractSearchCluster> searchClusters) { @@ -64,10 +64,6 @@ public class ContainerSearch extends ContainerSubsystem<SearchChains> initializeSearchChains(searchClusters); } - private static Component<AbstractConfigProducer<?>, ComponentModel> queryProfileRegistryComponent() { - return new Component<>(new ComponentModel(QUERY_PROFILE_REGISTRY_CLASS, null, searchAndDocprocBundle)); - } - /** Adds a Dispatcher component to the owning container cluster for each search cluster */ private void initializeDispatchers(Collection<AbstractSearchCluster> searchClusters) { for (AbstractSearchCluster searchCluster : searchClusters) { |