diff options
| author | gjoranv <gv@verizonmedia.com> | 2022-07-12 00:48:57 +0200 |
|---|---|---|
| committer | gjoranv <gv@verizonmedia.com> | 2022-07-12 01:41:37 +0200 |
| commit | a6cc157a30fea6bd60274c74d2bb0c259b304ebf (patch) | |
| tree | 8fa4a5cb3bab68a60b84f518bdadbee935c1ee94 /container-search | |
| parent | b6f197461e83a02c9bdd13da0cfc932fcacabbc1 (diff) | |
Simplify creation of BundleInstantiationSpec
Diffstat (limited to 'container-search')
3 files changed, 7 insertions, 7 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/searchchain/model/VespaSearchers.java b/container-search/src/main/java/com/yahoo/search/searchchain/model/VespaSearchers.java index 85b8a563a9e..110f69c19ca 100644 --- a/container-search/src/main/java/com/yahoo/search/searchchain/model/VespaSearchers.java +++ b/container-search/src/main/java/com/yahoo/search/searchchain/model/VespaSearchers.java @@ -78,7 +78,7 @@ public class VespaSearchers { for (Class c : searchers) { searcherModels.add( new ChainedComponentModel( - BundleInstantiationSpecification.getInternalSearcherSpecificationFromStrings(c.getName(), null), + BundleInstantiationSpecification.fromSearchAndDocproc(c.getName()), Dependencies.emptyDependencies())); } return searcherModels; diff --git a/container-search/src/main/java/com/yahoo/search/searchchain/model/federation/FederationSearcherModel.java b/container-search/src/main/java/com/yahoo/search/searchchain/model/federation/FederationSearcherModel.java index ea8275760dc..8acac776ae8 100644 --- a/container-search/src/main/java/com/yahoo/search/searchchain/model/federation/FederationSearcherModel.java +++ b/container-search/src/main/java/com/yahoo/search/searchchain/model/federation/FederationSearcherModel.java @@ -24,9 +24,11 @@ public class FederationSearcherModel extends ChainedComponentModel { public final List<TargetSpec> targets; public final boolean inheritDefaultSources; - public FederationSearcherModel(ComponentSpecification componentId, Dependencies dependencies, - List<TargetSpec> targets, boolean inheritDefaultSources) { - super(BundleInstantiationSpecification.getInternalSearcherSpecification(componentId, federationSearcherComponentSpecification), + public FederationSearcherModel(ComponentSpecification componentId, + Dependencies dependencies, + List<TargetSpec> targets, + boolean inheritDefaultSources) { + super(BundleInstantiationSpecification.fromSearchAndDocproc(componentId, federationSearcherComponentSpecification), dependencies); this.inheritDefaultSources = inheritDefaultSources; this.targets = ImmutableList.copyOf(targets); diff --git a/container-search/src/main/java/com/yahoo/search/searchchain/model/federation/LocalProviderSpec.java b/container-search/src/main/java/com/yahoo/search/searchchain/model/federation/LocalProviderSpec.java index 3c2767430c7..c4e5f26a3eb 100644 --- a/container-search/src/main/java/com/yahoo/search/searchchain/model/federation/LocalProviderSpec.java +++ b/container-search/src/main/java/com/yahoo/search/searchchain/model/federation/LocalProviderSpec.java @@ -63,9 +63,7 @@ public class LocalProviderSpec { for (Class<? extends Searcher> c : searchers) { searcherModels.add( new ChainedComponentModel( - BundleInstantiationSpecification.getInternalSearcherSpecificationFromStrings( - c.getName(), - null), + BundleInstantiationSpecification.fromSearchAndDocproc(c.getName()), Dependencies.emptyDependencies())); } |