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/main/java/com/yahoo/config/model/ConfigModelContext.java | |
parent | 0289e24dc20cd38f69de2dbdb01cb09e1d436501 (diff) |
Less wildcards for some TreeConfigProducer instances
Diffstat (limited to 'config-model/src/main/java/com/yahoo/config/model/ConfigModelContext.java')
-rw-r--r-- | config-model/src/main/java/com/yahoo/config/model/ConfigModelContext.java | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/config-model/src/main/java/com/yahoo/config/model/ConfigModelContext.java b/config-model/src/main/java/com/yahoo/config/model/ConfigModelContext.java index 4692c2c1fba..d9918168266 100644 --- a/config-model/src/main/java/com/yahoo/config/model/ConfigModelContext.java +++ b/config-model/src/main/java/com/yahoo/config/model/ConfigModelContext.java @@ -5,6 +5,7 @@ import com.yahoo.config.application.api.ApplicationPackage; import com.yahoo.config.application.api.DeployLogger; import com.yahoo.config.model.api.ModelContext; 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.VespaModel; @@ -18,7 +19,7 @@ import java.util.stream.Stream; */ public final class ConfigModelContext { - private final TreeConfigProducer<?> parent; + private final TreeConfigProducer<AnyConfigProducer> parent; private final String producerId; private final DeployState deployState; private final VespaModel vespaModel; @@ -29,7 +30,7 @@ public final class ConfigModelContext { DeployState deployState, VespaModel vespaModel, ConfigModelRepoAdder configModelRepoAdder, - TreeConfigProducer<?> parent, + TreeConfigProducer<AnyConfigProducer> parent, String producerId) { this.applicationType = applicationType; this.deployState = deployState; @@ -41,7 +42,7 @@ public final class ConfigModelContext { public ApplicationPackage getApplicationPackage() { return deployState.getApplicationPackage(); } public String getProducerId() { return producerId; } - public TreeConfigProducer<?> getParentProducer() { return parent; } + public TreeConfigProducer<AnyConfigProducer> getParentProducer() { return parent; } public DeployLogger getDeployLogger() { return deployState.getDeployLogger(); } public DeployState getDeployState() { return deployState; } public ApplicationType getApplicationType() { return applicationType; } @@ -53,7 +54,7 @@ public final class ConfigModelContext { public ConfigModelRepoAdder getConfigModelRepoAdder() { return configModelRepoAdder; } /** Create a new context with a different parent */ - public ConfigModelContext withParent(TreeConfigProducer<?> newParent) { + public ConfigModelContext withParent(TreeConfigProducer<AnyConfigProducer> newParent) { return ConfigModelContext.create(deployState, vespaModel, configModelRepoAdder, newParent, producerId); } @@ -77,7 +78,7 @@ public final class ConfigModelContext { public static ConfigModelContext create(DeployState deployState, VespaModel vespaModel, ConfigModelRepoAdder configModelRepoAdder, - TreeConfigProducer<?> parent, + TreeConfigProducer<AnyConfigProducer> parent, String producerId) { return new ConfigModelContext(ApplicationType.DEFAULT, deployState, vespaModel, configModelRepoAdder, parent, producerId); } @@ -95,7 +96,7 @@ public final class ConfigModelContext { DeployState deployState, VespaModel vespaModel, ConfigModelRepoAdder configModelRepoAdder, - TreeConfigProducer<?> parent, + TreeConfigProducer<AnyConfigProducer> parent, String producerId) { return new ConfigModelContext(applicationType, deployState, vespaModel, configModelRepoAdder, parent, producerId); } |