diff options
author | Arne Juul <arnej@yahooinc.com> | 2023-02-14 09:58:25 +0000 |
---|---|---|
committer | Arne Juul <arnej@yahooinc.com> | 2023-02-14 10:52:18 +0000 |
commit | 90ffec36510f64a4b6ec1abf584682e1808468cf (patch) | |
tree | e12a351580f3bfe16d69a6fbde5b4fecd12805db /config-model/src/test/java/com/yahoo | |
parent | 0289e24dc20cd38f69de2dbdb01cb09e1d436501 (diff) |
Less wildcards for some TreeConfigProducer instances
Diffstat (limited to 'config-model/src/test/java/com/yahoo')
-rw-r--r-- | config-model/src/test/java/com/yahoo/vespa/model/test/DomTestServiceBuilder.java | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/test/DomTestServiceBuilder.java b/config-model/src/test/java/com/yahoo/vespa/model/test/DomTestServiceBuilder.java index 71f54216187..ffd880e089a 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/test/DomTestServiceBuilder.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/test/DomTestServiceBuilder.java @@ -2,6 +2,7 @@ package com.yahoo.vespa.model.test; import com.yahoo.config.model.deploy.DeployState; +import com.yahoo.config.model.producer.AnyConfigProducer; import com.yahoo.config.model.producer.TreeConfigProducer; import com.yahoo.vespa.model.builder.xml.dom.VespaDomBuilder; import org.w3c.dom.Element; @@ -12,7 +13,7 @@ import org.w3c.dom.Element; public class DomTestServiceBuilder { - static class SimpleServiceBuilder extends VespaDomBuilder.DomConfigProducerBuilder<SimpleService> { + static class SimpleServiceBuilder extends VespaDomBuilder.DomConfigProducerBuilder<SimpleService, AnyConfigProducer> { int i; public SimpleServiceBuilder(int i) { @@ -20,12 +21,12 @@ public class DomTestServiceBuilder { } @Override - protected SimpleService doBuild(DeployState deployState, TreeConfigProducer parent, Element spec) { + protected SimpleService doBuild(DeployState deployState, TreeConfigProducer<AnyConfigProducer> parent, Element spec) { return new SimpleService(parent, "simpleservice." + i); } } - static class ApiServiceBuilder extends VespaDomBuilder.DomConfigProducerBuilder<ApiService> { + static class ApiServiceBuilder extends VespaDomBuilder.DomConfigProducerBuilder<ApiService, AnyConfigProducer> { int i; public ApiServiceBuilder(int i) { @@ -33,12 +34,12 @@ public class DomTestServiceBuilder { } @Override - protected ApiService doBuild(DeployState deployState, TreeConfigProducer parent, Element spec) { + protected ApiService doBuild(DeployState deployState, TreeConfigProducer<AnyConfigProducer> parent, Element spec) { return new ApiService(parent, "apiservice." + i); } } - static class ParentServiceBuilder extends VespaDomBuilder.DomConfigProducerBuilder<ParentService> { + static class ParentServiceBuilder extends VespaDomBuilder.DomConfigProducerBuilder<ParentService, AnyConfigProducer> { int i; public ParentServiceBuilder(int i) { @@ -46,7 +47,7 @@ public class DomTestServiceBuilder { } @Override - protected ParentService doBuild(DeployState deployState, TreeConfigProducer parent, Element spec) { + protected ParentService doBuild(DeployState deployState, TreeConfigProducer<AnyConfigProducer> parent, Element spec) { return new ParentService(parent, "parentservice." + i, spec); } } |