1 files changed, 42 insertions, 29 deletions
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 724ba70510f..79adfb2ea13 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
@@ -7,12 +7,15 @@ import com.yahoo.prelude.fastsearch.DocumentdbInfoConfig;
 import com.yahoo.schema.Schema;
 import com.yahoo.schema.derived.AttributeFields;
 import com.yahoo.schema.derived.DerivedConfiguration;
+import com.yahoo.search.config.IndexInfoConfig;
+import com.yahoo.search.config.SchemaInfoConfig;
 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.SummarymapConfig;
 import com.yahoo.vespa.config.search.vsm.VsmfieldsConfig;
 import com.yahoo.vespa.config.search.vsm.VsmsummaryConfig;
+import com.yahoo.vespa.configdefinition.IlscriptsConfig;
 
 /**
  * A search cluster of type streaming.
@@ -20,8 +23,8 @@ import com.yahoo.vespa.config.search.vsm.VsmsummaryConfig;
  * @author baldersheim
  * @author vegardh
  */
-public class StreamingSearchCluster extends SearchCluster implements 
-        DocumentdbInfoConfig.Producer, 
+public class StreamingSearchCluster extends SearchCluster implements
+        DocumentdbInfoConfig.Producer,
         RankProfilesConfig.Producer,
         VsmsummaryConfig.Producer,
         VsmfieldsConfig.Producer,
@@ -31,7 +34,7 @@ public class StreamingSearchCluster extends SearchCluster implements
     private final String storageRouteSpec;
     private final AttributesProducer attributesConfig;
     private final String docTypeName;
-    private DerivedConfiguration schemaConfig = null;
+    private DerivedConfiguration derivedConfig = null;
 
     public StreamingSearchCluster(AbstractConfigProducer<SearchCluster> parent,
                                   String clusterName,
@@ -51,9 +54,9 @@ public class StreamingSearchCluster extends SearchCluster implements
     protected IndexingMode getIndexingMode() { return IndexingMode.STREAMING; }
     public final String getStorageRouteSpec()       { return storageRouteSpec; }
 
-    public String getDocTypeName() {
-        return docTypeName;
-    }
+    public String getDocTypeName() { return docTypeName; }
+
+    public DerivedConfiguration derived() { return derivedConfig; }
 
     @Override
     public int getRowBits() { return 0; }
@@ -61,10 +64,10 @@ public class StreamingSearchCluster extends SearchCluster implements
     @Override
     public void getConfig(DocumentdbInfoConfig.Builder builder) {
         DocumentdbInfoConfig.Documentdb.Builder docDb = new DocumentdbInfoConfig.Documentdb.Builder();
-        docDb.name(schemaConfig.getSchema().getName());
-        SummaryConfig.Producer prod = schemaConfig.getSummaries();
+        docDb.name(derivedConfig.getSchema().getName());
+        SummaryConfig.Producer prod = derivedConfig.getSummaries();
         convertSummaryConfig(prod, null, docDb);
-        addRankProfilesConfig(schemaConfig.getSchema().getName(), docDb);
+        addRankProfilesConfig(derivedConfig.getSchema().getName(), docDb);
         builder.documentdb(docDb);
     }
 
@@ -77,46 +80,58 @@ public class StreamingSearchCluster extends SearchCluster implements
         if ( ! schema.getName().equals(docTypeName))
             throw new IllegalArgumentException("Document type name '" + docTypeName +
                                                "' must be the same as the schema name '" + schema.getName() + "'");
-        this.schemaConfig = new DerivedConfiguration(schema, deployState);
+        this.derivedConfig = new DerivedConfiguration(schema, deployState);
     }
 
     @Override
-    public DerivedConfiguration getSchemaConfig() { return schemaConfig; }
+    public void defaultDocumentsConfig() { }
 
     @Override
-    public void defaultDocumentsConfig() { }
+    public void getConfig(IndexInfoConfig.Builder builder) {
+        derivedConfig.getIndexInfo().getConfig(builder);
+    }
+
+    @Override
+    public void getConfig(SchemaInfoConfig.Builder builder) {
+        derivedConfig.getSchemaInfo().getConfig(builder);
+    }
 
     @Override
+    public void getConfig(IlscriptsConfig.Builder builder) {
+        derivedConfig.getIndexingScript().getConfig(builder);
+    }
+
     public void getConfig(AttributesConfig.Builder builder) {
-        if (getSchemaConfig() != null) getSchemaConfig().getConfig(builder);
+        derivedConfig.getConfig(builder);
     }
-    
+
+    @Override
+    public void getConfig(RankProfilesConfig.Builder builder) {
+        derivedConfig.getRankProfileList().getConfig(builder);
+    }
+
     @Override
     public void getConfig(VsmsummaryConfig.Builder builder) {
-        if (getSchemaConfig() != null)
-            if (getSchemaConfig().getVsmSummary() != null)
-                getSchemaConfig().getVsmSummary().getConfig(builder);
+        if (derivedConfig.getVsmSummary() != null)
+            derivedConfig.getVsmSummary().getConfig(builder);
     }
     
     @Override
     public void getConfig(VsmfieldsConfig.Builder builder) {
-        if (getSchemaConfig() != null)
-            if (getSchemaConfig().getVsmFields() != null)
-                getSchemaConfig().getVsmFields().getConfig(builder);
+        if (derivedConfig.getVsmFields() != null)
+            derivedConfig.getVsmFields().getConfig(builder);
     }
     
     @Override
     public void getConfig(SummarymapConfig.Builder builder) {
-        if (getSchemaConfig() != null)
-            if (getSchemaConfig().getSummaryMap() != null)
-                getSchemaConfig().getSummaryMap().getConfig(builder);
+        if (derivedConfig.getSummaryMap() != null)
+            derivedConfig.getSummaryMap().getConfig(builder);
     }
 
     @Override
     public void getConfig(SummaryConfig.Builder builder) {
-        if (getSchemaConfig() != null)
-            if (getSchemaConfig().getSummaries() != null)
-                getSchemaConfig().getSummaries().getConfig(builder);
+        if (derivedConfig.getSummaries() != null)
+            derivedConfig.getSummaries().getConfig(builder);
     }
 
     private class AttributesProducer extends AbstractConfigProducer<AttributesProducer> implements AttributesConfig.Producer {
@@ -127,9 +142,7 @@ public class StreamingSearchCluster extends SearchCluster implements
 
         @Override
         public void getConfig(AttributesConfig.Builder builder) {
-            if (getSchemaConfig() != null) {
-                getSchemaConfig().getConfig(builder, AttributeFields.FieldSet.FAST_ACCESS);
-            }
+            derivedConfig.getConfig(builder, AttributeFields.FieldSet.FAST_ACCESS);
         }
     }