Remove unnecessary class

3 files changed, 15 insertions, 50 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) {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java b/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java
index a13eebf0042..527fb186464 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java
@@ -11,13 +11,17 @@ import com.yahoo.config.FileReference;
 import com.yahoo.config.application.api.ApplicationFile;
 import com.yahoo.config.application.api.ApplicationPackage;
 import com.yahoo.config.application.api.DeployLogger;
+import com.yahoo.config.application.api.FileRegistry;
 import com.yahoo.config.application.api.ValidationId;
 import com.yahoo.config.application.api.ValidationOverrides;
 import com.yahoo.config.model.ApplicationConfigProducerRoot;
 import com.yahoo.config.model.ConfigModelRegistry;
 import com.yahoo.config.model.ConfigModelRepo;
 import com.yahoo.config.model.NullConfigModelRegistry;
-import com.yahoo.config.model.api.*;
+import com.yahoo.config.model.api.ApplicationClusterInfo;
+import com.yahoo.config.model.api.HostInfo;
+import com.yahoo.config.model.api.Model;
+import com.yahoo.config.model.api.Provisioned;
 import com.yahoo.config.model.deploy.DeployState;
 import com.yahoo.config.model.producer.AbstractConfigProducer;
 import com.yahoo.config.model.producer.AbstractConfigProducerRoot;
@@ -47,7 +51,6 @@ import com.yahoo.vespa.model.container.search.QueryProfiles;
 import com.yahoo.vespa.model.content.Content;
 import com.yahoo.vespa.model.content.cluster.ContentCluster;
 import com.yahoo.vespa.model.filedistribution.FileDistributionConfigProducer;
-import com.yahoo.vespa.model.filedistribution.FileReferencesRepository;
 import com.yahoo.vespa.model.ml.ConvertedModel;
 import com.yahoo.vespa.model.ml.ModelName;
 import com.yahoo.vespa.model.ml.OnnxModelInfo;
@@ -56,7 +59,6 @@ import com.yahoo.vespa.model.search.DocumentDatabase;
 import com.yahoo.vespa.model.search.SearchCluster;
 import com.yahoo.vespa.model.utils.internal.ReflectionUtil;
 import org.xml.sax.SAXException;
-
 import java.io.IOException;
 import java.lang.reflect.Constructor;
 import java.time.Instant;
@@ -114,7 +116,7 @@ public final class VespaModel extends AbstractConfigProducerRoot implements Mode
     /** The validation overrides of this. This is never null. */
     private final ValidationOverrides validationOverrides;
 
-    private final FileReferencesRepository fileReferencesRepository;
+    private final FileRegistry fileRegistry;
 
     private final Provisioned provisioned;
 
@@ -150,12 +152,11 @@ public final class VespaModel extends AbstractConfigProducerRoot implements Mode
         this(configModelRegistry, deployState, true);
     }
 
-    private VespaModel(ConfigModelRegistry configModelRegistry, DeployState deployState, boolean complete)
-            throws IOException, SAXException {
+    private VespaModel(ConfigModelRegistry configModelRegistry, DeployState deployState, boolean complete) throws IOException {
         super("vespamodel");
         version = deployState.getVespaVersion();
         wantedNodeVersion = deployState.getWantedNodeVespaVersion();
-        fileReferencesRepository = new FileReferencesRepository(deployState.getFileRegistry());
+        fileRegistry = deployState.getFileRegistry();
         validationOverrides = deployState.validationOverrides();
         applicationPackage = deployState.getApplicationPackage();
         provisioned = deployState.provisioned();
@@ -235,7 +236,7 @@ public final class VespaModel extends AbstractConfigProducerRoot implements Mode
     public ApplicationPackage applicationPackage() { return applicationPackage; }
 
     /** Creates a mutable model with no services instantiated */
-    public static VespaModel createIncomplete(DeployState deployState) throws IOException, SAXException {
+    public static VespaModel createIncomplete(DeployState deployState) throws IOException {
         return new VespaModel(new NullConfigModelRegistry(), deployState, false);
     }
 
@@ -353,7 +354,11 @@ public final class VespaModel extends AbstractConfigProducerRoot implements Mode
                            .collect(Collectors.toCollection(LinkedHashSet::new));
     }
 
-    public Set<FileReference> fileReferences() { return fileReferencesRepository.allFileReferences(); }
+    public Set<FileReference> fileReferences() {
+        return fileRegistry.export().stream()
+                           .map(e -> e.reference)
+                           .collect(Collectors.toSet());
+    }
 
     /** Returns this models Vespa instance */
     public ApplicationConfigProducerRoot getVespa() { return root; }
@@ -477,7 +482,7 @@ public final class VespaModel extends AbstractConfigProducerRoot implements Mode
      * Resolves the given config key into a correctly typed ConfigBuilder
      * and fills in the config from this model.
      *
-     * @return A new config builder with config from this model filled in,.
+     * @return A new config builder with config from this model filled in
      */
     private ConfigInstance.Builder resolveToBuilder(ConfigKey<?> key) {
         ConfigInstance.Builder builder = createBuilder(new ConfigDefinitionKey(key));
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileReferencesRepository.java b/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileReferencesRepository.java
deleted file mode 100644
index 3962aa3d612..00000000000
--- a/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileReferencesRepository.java
+++ /dev/null
@@ -1,31 +0,0 @@
-// 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.FileReference;
-import com.yahoo.config.application.api.FileRegistry;
-
-import java.util.LinkedHashSet;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-/**
- * Keeps track of what files to send with file distribution
- *
- * @author Tony Vaagenes
- * @author hmusum
- */
-public class FileReferencesRepository {
-
-    private final FileRegistry fileRegistry;
-    public FileReferencesRepository(FileRegistry fileRegistry) {
-        this.fileRegistry = fileRegistry;
-    }
-
-    public Set<FileReference> allFileReferences() {
-        return fileRegistry.export()
-                           .stream()
-                           .map(e -> e.reference)
-                           .collect(Collectors.toCollection(() -> new LinkedHashSet<>()));
-    }
-
-}