From a6cc157a30fea6bd60274c74d2bb0c259b304ebf Mon Sep 17 00:00:00 2001
From: gjoranv <gv@verizonmedia.com>
Date: Tue, 12 Jul 2022 00:48:57 +0200
Subject: Simplify creation of BundleInstantiationSpec

---
 .../java/com/yahoo/search/searchchain/model/VespaSearchers.java   | 2 +-
 .../searchchain/model/federation/FederationSearcherModel.java     | 8 +++++---
 .../search/searchchain/model/federation/LocalProviderSpec.java    | 4 +---
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'container-search/src')

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()));
         }
 
-- 
cgit v1.2.3