diff options
author | Arne Juul <arnej@yahooinc.com> | 2023-02-14 11:56:28 +0000 |
---|---|---|
committer | Arne Juul <arnej@yahooinc.com> | 2023-02-14 12:36:13 +0000 |
commit | 6e9bc317a622819d16d33b2062dc153892d47646 (patch) | |
tree | 971e2e21fe6d72f65e0b088b4cb9956dcf469872 /config-model | |
parent | a72a76d3a44b30f018a4119b02e9ddd11d04a47e (diff) |
slightly simpler FileDistribution classes
Diffstat (limited to 'config-model')
3 files changed, 7 insertions, 5 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java index cfc5500bea8..ef26e7a395a 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java @@ -88,7 +88,7 @@ public class Admin extends TreeConfigProducer<AnyConfigProducer> implements Seri private final FileDistributionConfigProducer fileDistribution; private final boolean multitenant; - public Admin(TreeConfigProducer<?> parent, + public Admin(TreeConfigProducer<AnyConfigProducer> parent, Monitoring monitoring, Metrics metrics, boolean multitenant, diff --git a/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributionConfigProducer.java b/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributionConfigProducer.java index 4af59bee5f0..a4bc3107568 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributionConfigProducer.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributionConfigProducer.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.filedistribution; +import com.yahoo.config.model.producer.AnyConfigProducer; import com.yahoo.config.model.producer.TreeConfigProducer; import com.yahoo.vespa.model.Host; @@ -12,11 +13,11 @@ import java.util.Map; * * @author hmusum */ -public class FileDistributionConfigProducer extends TreeConfigProducer<TreeConfigProducer<?>> { +public class FileDistributionConfigProducer extends TreeConfigProducer<AnyConfigProducer> { private final Map<Host, FileDistributionConfigProvider> fileDistributionConfigProviders = new IdentityHashMap<>(); - public FileDistributionConfigProducer(TreeConfigProducer<?> parent) { + public FileDistributionConfigProducer(TreeConfigProducer<AnyConfigProducer> parent) { super(parent, "filedistribution"); } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributionConfigProvider.java b/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributionConfigProvider.java index b6617a6aa50..81b69d1b53b 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributionConfigProvider.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributionConfigProvider.java @@ -2,15 +2,16 @@ package com.yahoo.vespa.model.filedistribution; import com.yahoo.cloud.config.filedistribution.FiledistributorrpcConfig; +import com.yahoo.config.model.producer.AnyConfigProducer; import com.yahoo.config.model.producer.TreeConfigProducer; import com.yahoo.vespa.model.ConfigProxy; import com.yahoo.vespa.model.Host; -public class FileDistributionConfigProvider extends TreeConfigProducer<TreeConfigProducer<?>> implements FiledistributorrpcConfig.Producer { +public class FileDistributionConfigProvider extends TreeConfigProducer<AnyConfigProducer> implements FiledistributorrpcConfig.Producer { private final Host host; - public FileDistributionConfigProvider(TreeConfigProducer<?> parent, Host host) { + public FileDistributionConfigProvider(TreeConfigProducer<AnyConfigProducer> parent, Host host) { super(parent, host.getHostname()); this.host = host; } |