FileDistributionConfigProvider has no children; simplify

3 files changed, 6 insertions, 6 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 ef26e7a395a..317c3646dde 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
@@ -293,8 +293,8 @@ public class Admin extends TreeConfigProducer<AnyConfigProducer> implements Seri
     }
 
     private void addFileDistribution(HostResource host) {
-        FileDistributionConfigProvider configProvider = new FileDistributionConfigProvider(fileDistribution, host.getHost());
-        fileDistribution.addFileDistributionConfigProducer(host.getHost(), configProvider);
+        var configProvider = new FileDistributionConfigProvider(fileDistribution, host.getHost());
+        fileDistribution.addProvider(host.getHost(), configProvider);
     }
 
     // If not configured by user: Use default setup: max 3 slobroks, 1 on the default configserver host
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 a4bc3107568..22c14c7b88f 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
@@ -13,7 +13,7 @@ import java.util.Map;
  *
  * @author hmusum
  */
-public class FileDistributionConfigProducer extends TreeConfigProducer<AnyConfigProducer> {
+public class FileDistributionConfigProducer extends TreeConfigProducer<FileDistributionConfigProvider> {
 
     private final Map<Host, FileDistributionConfigProvider> fileDistributionConfigProviders = new IdentityHashMap<>();
 
@@ -21,7 +21,7 @@ public class FileDistributionConfigProducer extends TreeConfigProducer<AnyConfig
         super(parent, "filedistribution");
     }
 
-    public void addFileDistributionConfigProducer(Host host, FileDistributionConfigProvider fileDistributionConfigProvider) {
+    public void addProvider(Host host, FileDistributionConfigProvider fileDistributionConfigProvider) {
         fileDistributionConfigProviders.put(host, fileDistributionConfigProvider);
     }
 
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 81b69d1b53b..1b30f25c926 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
@@ -7,11 +7,11 @@ import com.yahoo.config.model.producer.TreeConfigProducer;
 import com.yahoo.vespa.model.ConfigProxy;
 import com.yahoo.vespa.model.Host;
 
-public class FileDistributionConfigProvider extends TreeConfigProducer<AnyConfigProducer> implements FiledistributorrpcConfig.Producer {
+public class FileDistributionConfigProvider extends AnyConfigProducer implements FiledistributorrpcConfig.Producer {
 
     private final Host host;
 
-    public FileDistributionConfigProvider(TreeConfigProducer<AnyConfigProducer> parent, Host host) {
+    public FileDistributionConfigProvider(FileDistributionConfigProducer parent, Host host) {
         super(parent, host.getHostname());
         this.host = host;
     }