some producers have no children

4 files changed, 10 insertions, 7 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java
index cf3084adee5..198f6b88798 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java
@@ -6,6 +6,7 @@ import com.yahoo.collections.Pair;
 import com.yahoo.config.ConfigInstance;
 import com.yahoo.config.application.api.DeployLogger;
 import com.yahoo.config.model.deploy.DeployState;
+import com.yahoo.config.model.producer.AnyConfigProducer;
 import com.yahoo.config.model.producer.TreeConfigProducer;
 import com.yahoo.io.IOUtils;
 import com.yahoo.log.InvalidLogFormatException;
@@ -108,7 +109,7 @@ public class RankSetupValidator extends Validator {
         IOUtils.recursiveDeleteDir(dir);
     }
 
-    private void writeConfigs(String dir, TreeConfigProducer<?> producer) throws IOException {
+    private void writeConfigs(String dir, AnyConfigProducer producer) throws IOException {
         RankProfilesConfig.Builder rpcb = new RankProfilesConfig.Builder();
         ((RankProfilesConfig.Producer) producer).getConfig(rpcb);
         writeConfig(dir, RankProfilesConfig.getDefName() + ".cfg", rpcb.build());
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/DocumentDatabase.java b/config-model/src/main/java/com/yahoo/vespa/model/search/DocumentDatabase.java
index 9a05f6af322..fa2f87646a5 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/search/DocumentDatabase.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/search/DocumentDatabase.java
@@ -1,6 +1,7 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.model.search;
 
+import com.yahoo.config.model.producer.AnyConfigProducer;
 import com.yahoo.config.model.producer.TreeConfigProducer;
 import com.yahoo.search.config.IndexInfoConfig;
 import com.yahoo.search.config.SchemaInfoConfig;
@@ -21,7 +22,7 @@ import com.yahoo.vespa.configdefinition.IlscriptsConfig;
  *
  * @author geirst
  */
-public class DocumentDatabase extends TreeConfigProducer<DocumentDatabase> implements
+public class DocumentDatabase extends AnyConfigProducer implements
         IndexInfoConfig.Producer,
         IlscriptsConfig.Producer,
         AttributesConfig.Producer,
@@ -38,7 +39,7 @@ public class DocumentDatabase extends TreeConfigProducer<DocumentDatabase> imple
     private final String schemaName;
     private final DerivedConfiguration derivedCfg;
 
-    public DocumentDatabase(TreeConfigProducer<?> parent, String schemaName, DerivedConfiguration derivedCfg) {
+    public DocumentDatabase(TreeConfigProducer<AnyConfigProducer> parent, String schemaName, DerivedConfiguration derivedCfg) {
         super(parent, schemaName);
         this.schemaName = schemaName;
         this.derivedCfg = derivedCfg;
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 f03e46cdcee..6293a6d6cf2 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
@@ -124,9 +124,9 @@ public class StreamingSearchCluster extends SearchCluster implements
             derivedConfig.getSummaries().getConfig(builder);
     }
 
-    private class AttributesProducer extends TreeConfigProducer<AttributesProducer> implements AttributesConfig.Producer {
+    private class AttributesProducer extends AnyConfigProducer implements AttributesConfig.Producer {
 
-        AttributesProducer(TreeConfigProducer<?> parent, String docType) {
+        AttributesProducer(TreeConfigProducer<AnyConfigProducer> parent, String docType) {
             super(parent, docType);
         }
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/Tuning.java b/config-model/src/main/java/com/yahoo/vespa/model/search/Tuning.java
index 9d990b03d56..a29b7b90b44 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/search/Tuning.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/search/Tuning.java
@@ -1,6 +1,7 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.model.search;
 
+import com.yahoo.config.model.producer.AnyConfigProducer;
 import com.yahoo.config.model.producer.TreeConfigProducer;
 import com.yahoo.vespa.config.search.core.ProtonConfig;
 import com.yahoo.vespa.model.content.DispatchTuning;
@@ -13,7 +14,7 @@ import static com.yahoo.text.Lowercase.toLowerCase;
  *
  * @author geirst
  */
-public class Tuning extends TreeConfigProducer<Tuning> implements ProtonConfig.Producer {
+public class Tuning extends AnyConfigProducer implements ProtonConfig.Producer {
 
     public static class SearchNode implements ProtonConfig.Producer {
 
@@ -396,7 +397,7 @@ public class Tuning extends TreeConfigProducer<Tuning> implements ProtonConfig.P
     public DispatchTuning dispatch = DispatchTuning.empty;
     public SearchNode searchNode;
 
-    public Tuning(TreeConfigProducer<?> parent) {
+    public Tuning(TreeConfigProducer<AnyConfigProducer> parent) {
         super(parent, "tuning");
     }