Merge pull request #25722 from vespa-engine/hmusum/file-registry-refactoring

Hmusum/file registry refactoring

1 files changed, 0 insertions, 9 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 74a5e92d2ba..5f346f366de 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
@@ -17,9 +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.FileReferencesRepository;
 import org.w3c.dom.Document;
-
 import java.io.StringReader;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -35,12 +33,9 @@ import java.util.Set;
 // TODO: mockRoot instances can probably be replaced by VespaModel.createIncomplete
 public class MockRoot extends AbstractConfigProducerRoot {
 
-    private static final long serialVersionUID = 1L;
-
     private final HostSystem hostSystem;
 
     private final DeployState deployState;
-    private final FileReferencesRepository fileReferencesRepository;
     private Admin admin;
 
     public MockRoot() {
@@ -63,7 +58,6 @@ public class MockRoot extends AbstractConfigProducerRoot {
         super(rootConfigId);
         hostSystem = new HostSystem(this, "hostsystem", deployState.getProvisioner(), deployState.getDeployLogger(), deployState.isHosted());
         this.deployState = deployState;
-        fileReferencesRepository = new FileReferencesRepository(deployState.getFileRegistry());
     }
 
     public FileDistributionConfigProducer getFileDistributionConfigProducer() {
@@ -89,7 +83,6 @@ public class MockRoot extends AbstractConfigProducerRoot {
         return builder;
     }
 
-    @SuppressWarnings("unchecked")
     public <T extends ConfigInstance> T getConfig(Class<T> configClass, String configId) {
         try {
             ConfigInstance.Builder builder = getConfig(getBuilder(configClass).getDeclaredConstructor().newInstance(), configId);
@@ -116,8 +109,6 @@ public class MockRoot extends AbstractConfigProducerRoot {
         return deployState;
     }
 
-    public FileReferencesRepository fileReferencesRepository() { return fileReferencesRepository; }
-
     public HostSystem hostSystem() { return hostSystem; }
 
     public void addDescendant(String configId, AbstractConfigProducer<?> descendant) {