Less wildcards for some TreeConfigProducer instances

4 files changed, 7 insertions, 5 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/component/ComponentGroup.java b/config-model/src/main/java/com/yahoo/vespa/model/container/component/ComponentGroup.java
index 21f5cb5d5e3..3adce73a99c 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/component/ComponentGroup.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/component/ComponentGroup.java
@@ -8,7 +8,7 @@ import com.yahoo.config.model.producer.TreeConfigProducer;
  */
 public class ComponentGroup <CHILD extends Component<?, ?>> extends ConfigProducerGroup<CHILD> {
 
-    public ComponentGroup(TreeConfigProducer parent, String subId) {
+    public ComponentGroup(TreeConfigProducer<? super ConfigProducerGroup> parent, String subId) {
         super(parent, subId);
     }
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/component/ConfigProducerGroup.java b/config-model/src/main/java/com/yahoo/vespa/model/container/component/ConfigProducerGroup.java
index bb19a5df679..edecd3ff627 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/component/ConfigProducerGroup.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/component/ConfigProducerGroup.java
@@ -20,7 +20,7 @@ public class ConfigProducerGroup<CHILD extends TreeConfigProducer<?>> extends Tr
 
     private final Map<ComponentId, CHILD> producerById = new LinkedHashMap<>();
 
-    public ConfigProducerGroup(TreeConfigProducer parent, String subId) {
+    public ConfigProducerGroup(TreeConfigProducer<? super ConfigProducerGroup> parent, String subId) {
         super(parent, subId);
     }
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/component/chain/Chain.java b/config-model/src/main/java/com/yahoo/vespa/model/container/component/chain/Chain.java
index 9fb9dc3bde8..ce019f4a5b7 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/component/chain/Chain.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/component/chain/Chain.java
@@ -4,6 +4,7 @@ package com.yahoo.vespa.model.container.component.chain;
 import com.yahoo.component.ComponentId;
 import com.yahoo.component.ComponentSpecification;
 import com.yahoo.component.chain.model.ChainSpecification;
+import com.yahoo.config.model.producer.AnyConfigProducer;
 import com.yahoo.config.model.producer.TreeConfigProducer;
 import com.yahoo.vespa.model.container.component.ComponentGroup;
 
@@ -19,7 +20,7 @@ import static com.yahoo.container.core.ChainsConfig.Chains.Type;
  * @author Tony Vaagenes
  * @author gjoranv
  */
-public class Chain<T extends ChainedComponent<?>> extends TreeConfigProducer<TreeConfigProducer<?>> {
+public class Chain<T extends ChainedComponent<?>> extends TreeConfigProducer<AnyConfigProducer> {
 
     private final ComponentId componentId;
     private final ChainSpecification specWithoutInnerComponents;
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/component/chain/Chains.java b/config-model/src/main/java/com/yahoo/vespa/model/container/component/chain/Chains.java
index e9d0d07dde1..e1fcdb31845 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/component/chain/Chains.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/component/chain/Chains.java
@@ -4,6 +4,7 @@ package com.yahoo.vespa.model.container.component.chain;
 import com.yahoo.component.chain.model.ChainsModel;
 import com.yahoo.component.provider.ComponentRegistry;
 import com.yahoo.container.core.ChainsConfig;
+import com.yahoo.config.model.producer.AnyConfigProducer;
 import com.yahoo.config.model.producer.TreeConfigProducer;
 import com.yahoo.vespa.model.container.component.ComponentGroup;
 import com.yahoo.vespa.model.container.component.ConfigProducerGroup;
@@ -18,13 +19,13 @@ import java.util.Set;
  * @author gjoranv
  */
 public class Chains<CHAIN extends Chain<?>>
-        extends TreeConfigProducer<TreeConfigProducer<?>>
+        extends TreeConfigProducer<AnyConfigProducer>
         implements ChainsConfig.Producer {
 
     private final ComponentGroup<ChainedComponent<?>> componentGroup;
     private final ConfigProducerGroup<CHAIN> chainGroup;
 
-    public Chains(TreeConfigProducer parent, String subId) {
+    public Chains(TreeConfigProducer<? super Chains> parent, String subId) {
         super(parent, subId);
         componentGroup = new ComponentGroup<>(this, "component");
         chainGroup = new ConfigProducerGroup<>(this, "chain");