Simplify by moving check for empty services higher up

3 files changed, 6 insertions, 31 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java
index 4adc6131803..b9021912244 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java
@@ -144,8 +144,10 @@ public final class ApplicationContainerCluster extends ContainerCluster<Applicat
     }
 
     private void registerUserConfiguredFiles(DeployState deployState) {
+        if (containers.isEmpty()) return;
+
         // Files referenced from user configs to all components.
-        UserConfiguredFiles files = new UserConfiguredFiles(containers, deployState.getFileRegistry(), deployState.getDeployLogger());
+        UserConfiguredFiles files = new UserConfiguredFiles(deployState.getFileRegistry(), deployState.getDeployLogger());
         for (Component<?, ?> component : getAllComponents()) {
             files.register(component);
         }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/UserConfiguredFiles.java b/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/UserConfiguredFiles.java
index bf1abdce49b..0e4ccf162ce 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/UserConfiguredFiles.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/UserConfiguredFiles.java
@@ -11,7 +11,6 @@ import com.yahoo.path.Path;
 import com.yahoo.vespa.config.ConfigDefinition;
 import com.yahoo.vespa.config.ConfigDefinitionKey;
 import com.yahoo.vespa.config.ConfigPayloadBuilder;
-import com.yahoo.vespa.model.AbstractService;
 
 import java.io.Serializable;
 import java.util.Collection;
@@ -21,19 +20,16 @@ import java.util.Optional;
 import java.util.logging.Level;
 
 /**
- * Utility methods for registering file distribution of files/paths/urls/models defined by the user
- * to a collection of nodes.
+ * Utility methods for registering file distribution of files/paths/urls/models defined by the user.
  *
  * @author gjoranv
  */
 public class UserConfiguredFiles implements Serializable {
 
-    private final Collection<? extends AbstractService> services;
     private final FileRegistry fileRegistry;
     private final DeployLogger logger;
 
-    public UserConfiguredFiles(Collection<? extends AbstractService> services, FileRegistry fileRegistry, DeployLogger logger) {
-        this.services = services;
+    public UserConfiguredFiles(FileRegistry fileRegistry, DeployLogger logger) {
         this.fileRegistry = fileRegistry;
         this.logger = logger;
     }
@@ -42,8 +38,6 @@ public class UserConfiguredFiles implements Serializable {
      * Registers user configured files for a producer for file distribution.
      */
     public <PRODUCER extends AnyConfigProducer> void register(PRODUCER producer) {
-        if (services.isEmpty()) return;
-
         UserConfigRepo userConfigs = producer.getUserConfigs();
         Map<Path, FileReference> registeredFiles = new HashMap<>();
         for (ConfigDefinitionKey key : userConfigs.configsProduced()) {
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/filedistribution/UserConfiguredFilesTest.java b/config-model/src/test/java/com/yahoo/vespa/model/filedistribution/UserConfiguredFilesTest.java
index 93e693ebc02..fbc6e43cd78 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/filedistribution/UserConfiguredFilesTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/filedistribution/UserConfiguredFilesTest.java
@@ -7,20 +7,16 @@ import com.yahoo.config.ModelReference;
 import com.yahoo.config.UrlReference;
 import com.yahoo.config.application.api.FileRegistry;
 import com.yahoo.config.model.application.provider.BaseDeployLogger;
-import com.yahoo.config.model.producer.TreeConfigProducer;
 import com.yahoo.config.model.producer.UserConfigRepo;
 import com.yahoo.config.model.test.MockRoot;
 import com.yahoo.vespa.config.ConfigDefinition;
 import com.yahoo.vespa.config.ConfigDefinitionKey;
 import com.yahoo.vespa.config.ConfigPayloadBuilder;
-import com.yahoo.vespa.model.AbstractService;
-import com.yahoo.vespa.model.PortAllocBridge;
 import com.yahoo.vespa.model.SimpleConfigProducer;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import java.nio.ByteBuffer;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -36,7 +32,6 @@ public class UserConfiguredFilesTest {
 
     private SimpleConfigProducer<?> producer;
     private ConfigPayloadBuilder builder;
-    private List<AbstractService> serviceList;
     private final MyFileRegistry fileRegistry = new MyFileRegistry();
     private ConfigDefinition def;
 
@@ -64,16 +59,13 @@ public class UserConfiguredFilesTest {
     }
 
     private UserConfiguredFiles userConfiguredFiles() {
-        return new UserConfiguredFiles(serviceList, fileRegistry, new BaseDeployLogger());
+        return new UserConfiguredFiles(fileRegistry, new BaseDeployLogger());
     }
 
     @BeforeEach
     public void setup() {
         MockRoot root = new MockRoot();
         producer = new SimpleConfigProducer<>(root, "test");
-        TestService service = new TestService(root, "service");
-        serviceList = new ArrayList<>();
-        serviceList.add(service);
         ConfigDefinitionKey key = new ConfigDefinitionKey("myname", "mynamespace");
         def = new ConfigDefinition("myname", "mynamespace");
         builder = new ConfigPayloadBuilder(def);
@@ -253,17 +245,4 @@ public class UserConfiguredFilesTest {
         userConfiguredFiles().register(producer);
     }
 
-
-    private static class TestService extends AbstractService {
-        public TestService(TreeConfigProducer<?> parent, String name) {
-            super(parent, name);
-        }
-
-        @Override
-        public int getPortCount() {
-            return 0;
-        }
-
-        @Override public void allocatePorts(int start, PortAllocBridge from) { }
-    }
 }