Roll back temporary to providing same config via multiple paths.

2 files changed, 62 insertions, 8 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/LocalProvider.java b/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/LocalProvider.java
index 5cf3ce1d306..dfef6eac3b3 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/LocalProvider.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/LocalProvider.java
@@ -72,8 +72,7 @@ public class LocalProvider extends Provider implements
 
     @Override
     public ChainSpecification getChainSpecification() {
-        ChainSpecification spec =
-                super.getChainSpecification();
+        ChainSpecification spec = super.getChainSpecification();
         return new ChainSpecification(spec.componentId, spec.inheritance, spec.phases(),
                 disableStemmingIfStreaming(spec.componentReferences));
     }
@@ -84,10 +83,9 @@ public class LocalProvider extends Provider implements
             return searcherReferences;
         } else {
             Set<ComponentSpecification> filteredSearcherReferences = new LinkedHashSet<>(searcherReferences);
-            filteredSearcherReferences.remove(
-                    toGlobalComponentId(
-                            new ComponentId("com.yahoo.prelude.querytransform.StemmingSearcher")).
-                            toSpecification());
+            filteredSearcherReferences
+                    .remove(toGlobalComponentId(new ComponentId("com.yahoo.prelude.querytransform.StemmingSearcher"))
+                            .toSpecification());
             return filteredSearcherReferences;
         }
     }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/StreamingSearchCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/search/StreamingSearchCluster.java
index ec5b2495a56..b4e09c59079 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/search/StreamingSearchCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/search/StreamingSearchCluster.java
@@ -8,7 +8,15 @@ import com.yahoo.schema.Schema;
 import com.yahoo.schema.derived.AttributeFields;
 import com.yahoo.schema.derived.DerivedConfiguration;
 import com.yahoo.vespa.config.search.AttributesConfig;
+import com.yahoo.vespa.config.search.RankProfilesConfig;
+import com.yahoo.vespa.config.search.SummaryConfig;
+import com.yahoo.vespa.config.search.core.OnnxModelsConfig;
 import com.yahoo.vespa.config.search.core.ProtonConfig;
+import com.yahoo.vespa.config.search.core.RankingConstantsConfig;
+import com.yahoo.vespa.config.search.core.RankingExpressionsConfig;
+import com.yahoo.vespa.config.search.summary.JuniperrcConfig;
+import com.yahoo.vespa.config.search.vsm.VsmfieldsConfig;
+import com.yahoo.vespa.config.search.vsm.VsmsummaryConfig;
 
 /**
  * A search cluster of type streaming.
@@ -16,7 +24,16 @@ import com.yahoo.vespa.config.search.core.ProtonConfig;
  * @author baldersheim
  * @author vegardh
  */
-public class StreamingSearchCluster extends SearchCluster
+public class StreamingSearchCluster extends SearchCluster implements
+        AttributesConfig.Producer,
+        RankProfilesConfig.Producer,
+        RankingConstantsConfig.Producer,
+        RankingExpressionsConfig.Producer,
+        OnnxModelsConfig.Producer,
+        JuniperrcConfig.Producer,
+        SummaryConfig.Producer,
+        VsmsummaryConfig.Producer,
+        VsmfieldsConfig.Producer
 {
     private final String storageRouteSpec;
     private final AttributesProducer attributesConfig;
@@ -36,7 +53,7 @@ public class StreamingSearchCluster extends SearchCluster
 
     public String getDocTypeName() { return docTypeName; }
 
-    public DerivedConfiguration derived() { return getDocumentDbs().get(0).getDerivedConfiguration(); }
+    public DerivedConfiguration derived() { return db().getDerivedConfiguration(); }
 
     @Override
     public void deriveFromSchemas(DeployState deployState) {
@@ -55,6 +72,45 @@ public class StreamingSearchCluster extends SearchCluster
         ddbB.configid(attributesConfig.getConfigId()); // Temporary until fully cleaned up
     }
 
+    private DocumentDatabase db() {
+        return getDocumentDbs().get(0);
+    }
+
+    @Override
+    public void getConfig(SummaryConfig.Builder builder) {
+        db().getConfig(builder);
+    }
+
+    @Override
+    public void getConfig(OnnxModelsConfig.Builder builder) {
+        db().getConfig(builder);
+    }
+
+    @Override
+    public void getConfig(RankingConstantsConfig.Builder builder) {
+        db().getConfig(builder);
+    }
+
+    @Override
+    public void getConfig(RankingExpressionsConfig.Builder builder) {
+        db().getConfig(builder);
+    }
+
+    @Override
+    public void getConfig(JuniperrcConfig.Builder builder) {
+        db().getConfig(builder);
+    }
+
+    @Override
+    public void getConfig(VsmfieldsConfig.Builder builder) {
+        db().getConfig(builder);
+    }
+
+    @Override
+    public void getConfig(VsmsummaryConfig.Builder builder) {
+        db().getConfig(builder);
+    }
+
     private class AttributesProducer extends AnyConfigProducer implements AttributesConfig.Producer {
 
         AttributesProducer(TreeConfigProducer<AnyConfigProducer> parent, String docType) {