diff options
author | Harald Musum <musum@verizonmedia.com> | 2021-08-25 12:57:14 +0200 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2021-08-25 12:57:14 +0200 |
commit | 915171482815f5e06f995b03d112dcce14cb5df0 (patch) | |
tree | 27cd28e70599ba9a1c0ec97707fb5f93e2736257 /config-model/src/main/java/com/yahoo/config/model/test/MockRoot.java | |
parent | d40b478deabce7049bbf8ac96295af0acd9d679f (diff) |
Rename FileDistributor to FileReferencesRepository
Also rename some methods
Diffstat (limited to 'config-model/src/main/java/com/yahoo/config/model/test/MockRoot.java')
-rw-r--r-- | config-model/src/main/java/com/yahoo/config/model/test/MockRoot.java | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/config-model/src/main/java/com/yahoo/config/model/test/MockRoot.java b/config-model/src/main/java/com/yahoo/config/model/test/MockRoot.java index ad3e501d3f2..753db89af1b 100644 --- a/config-model/src/main/java/com/yahoo/config/model/test/MockRoot.java +++ b/config-model/src/main/java/com/yahoo/config/model/test/MockRoot.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.config.model.test; import com.yahoo.config.ConfigInstance; @@ -17,7 +17,7 @@ import com.yahoo.vespa.model.HostSystem; import com.yahoo.vespa.model.admin.Admin; import com.yahoo.vespa.model.builder.xml.dom.DomAdminV2Builder; import com.yahoo.vespa.model.filedistribution.FileDistributionConfigProducer; -import com.yahoo.vespa.model.filedistribution.FileDistributor; +import com.yahoo.vespa.model.filedistribution.FileReferencesRepository; import org.w3c.dom.Document; import org.xml.sax.InputSource; import org.xml.sax.SAXException; @@ -43,7 +43,7 @@ public class MockRoot extends AbstractConfigProducerRoot { private final HostSystem hostSystem; private final DeployState deployState; - private final FileDistributor fileDistributor; + private final FileReferencesRepository fileReferencesRepository; private Admin admin; public MockRoot() { @@ -66,7 +66,7 @@ public class MockRoot extends AbstractConfigProducerRoot { super(rootConfigId); hostSystem = new HostSystem(this, "hostsystem", deployState.getProvisioner(), deployState.getDeployLogger()); this.deployState = deployState; - fileDistributor = new FileDistributor(); + fileReferencesRepository = new FileReferencesRepository(); } public FileDistributionConfigProducer getFileDistributionConfigProducer() { @@ -119,15 +119,11 @@ public class MockRoot extends AbstractConfigProducerRoot { return deployState; } - public FileDistributor getFileDistributor() { - return fileDistributor; - } + public FileReferencesRepository fileReferencesRepository() { return fileReferencesRepository; } - public HostSystem hostSystem() { - return hostSystem; - } + public HostSystem hostSystem() { return hostSystem; } - public void addDescendant(String configId, AbstractConfigProducer descendant) { + public void addDescendant(String configId, AbstractConfigProducer<?> descendant) { if (id2producer.containsKey(configId)) { throw new RuntimeException ("Config ID '" + configId + "' cannot be reserved by an instance of class '" + @@ -138,7 +134,7 @@ public class MockRoot extends AbstractConfigProducerRoot { } @Override - public void addChild(AbstractConfigProducer abstractConfigProducer) { + public void addChild(AbstractConfigProducer<?> abstractConfigProducer) { super.addChild(abstractConfigProducer); } |