Revert "Revert "Single searchcluster take 3""

1 files changed, 4 insertions, 23 deletions

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 91622e9fe31..a71d1025ece 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
@@ -5,7 +5,6 @@ import com.yahoo.config.application.api.ApplicationPackage;
 import com.yahoo.config.model.deploy.DeployState;
 import com.yahoo.container.QrSearchersConfig;
 import com.yahoo.prelude.semantics.SemanticRulesConfig;
-import com.yahoo.schema.derived.SchemaInfo;
 import com.yahoo.search.config.IndexInfoConfig;
 import com.yahoo.search.config.SchemaInfoConfig;
 import com.yahoo.search.dispatch.Dispatcher;
@@ -35,15 +34,15 @@ import static com.yahoo.vespa.model.container.PlatformBundles.SEARCH_AND_DOCPROC
  * @author gjoranv
  * @author Tony Vaagenes
  */
-public class ContainerSearch extends ContainerSubsystem<SearchChains>
-    implements
+public class ContainerSearch extends ContainerSubsystem<SearchChains> implements
         IndexInfoConfig.Producer,
         IlscriptsConfig.Producer,
         QrSearchersConfig.Producer,
         QueryProfilesConfig.Producer,
         SemanticRulesConfig.Producer,
         PageTemplatesConfig.Producer,
-        SchemaInfoConfig.Producer {
+        SchemaInfoConfig.Producer
+{
 
     public static final String QUERY_PROFILE_REGISTRY_CLASS = CompiledQueryProfileRegistry.class.getName();
 
@@ -169,25 +168,7 @@ public class ContainerSearch extends ContainerSubsystem<SearchChains>
 
     @Override
     public void getConfig(QrSearchersConfig.Builder builder) {
-        for (int i = 0; i < searchClusters.size(); i++) {
-            SearchCluster sys = findClusterWithId(searchClusters, i);
-            var scB = new QrSearchersConfig.Searchcluster.Builder().name(sys.getClusterName());
-            for (SchemaInfo spec : sys.schemas().values()) {
-                scB.searchdef(spec.fullSchema().getName());
-            }
-            scB.rankprofiles_configid(sys.getConfigId());
-            scB.indexingmode(QrSearchersConfig.Searchcluster.Indexingmode.Enum.valueOf(sys.getIndexingModeName()));
-            scB.storagecluster(new QrSearchersConfig.Searchcluster.Storagecluster.Builder().routespec(sys.getStorageRouteSpec()));
-            builder.searchcluster(scB);
-        }
-    }
-
-    private static SearchCluster findClusterWithId(List<SearchCluster> clusters, int index) {
-        for (SearchCluster sys : clusters) {
-            if (sys.getClusterIndex() == index)
-                return sys;
-        }
-        throw new IllegalArgumentException("No search cluster with index " + index + " exists");
+        searchClusters.forEach(sc -> builder.searchcluster(sc.getQrSearcherConfig()));
     }
 
 }